diff --git a/Bank/BankClientApp/APIClient.cs b/Bank/BankClientApp/APIClient.cs index 3b0fcde..86b03de 100644 --- a/Bank/BankClientApp/APIClient.cs +++ b/Bank/BankClientApp/APIClient.cs @@ -23,10 +23,7 @@ namespace BankClientApp var result = response.Result.Content.ReadAsStringAsync().Result; if (response.Result.IsSuccessStatusCode) { - return JsonConvert.DeserializeObject(result, new JsonSerializerSettings { - TypeNameHandling = Newtonsoft.Json.TypeNameHandling.All, - NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore, - }); + return JsonConvert.DeserializeObject(result); } else { diff --git a/Bank/BankClientApp/Controllers/HomeController.cs b/Bank/BankClientApp/Controllers/HomeController.cs index 9872473..95b5951 100644 --- a/Bank/BankClientApp/Controllers/HomeController.cs +++ b/Bank/BankClientApp/Controllers/HomeController.cs @@ -353,7 +353,7 @@ namespace BankClientApp.Controllers return Redirect("~/Home/Enter"); } ViewBag.Operations = APIClient.GetRequest>($"api/operation/getoperationlist?clientid={APIClient.Client.Id}"); - ViewBag.Transfers = APIClient.GetRequest>($"api/transfer/gettransferlist"); + ViewBag.Transfers = APIClient.GetRequest>($"api/transfer/getfulltransferlist"); return View(); } @@ -480,7 +480,6 @@ namespace BankClientApp.Controllers throw new Exception("Вы как суда попали? Суда вход только авторизованным"); } var result = APIClient.GetRequest($"api/request/getrequest?requestid={requestId}"); - result.CardRequests = null; if (result == null) { return default; diff --git a/Bank/BankClientApp/Views/Home/OperationUpdate.cshtml b/Bank/BankClientApp/Views/Home/OperationUpdate.cshtml index c87241c..e7d452d 100644 --- a/Bank/BankClientApp/Views/Home/OperationUpdate.cshtml +++ b/Bank/BankClientApp/Views/Home/OperationUpdate.cshtml @@ -55,7 +55,7 @@ }; } check(); - $('#card').on('change', function () { + $('#operation').on('change', function () { check(); }); diff --git a/Bank/BankClientApp/Views/Home/RequestUpdate.cshtml b/Bank/BankClientApp/Views/Home/RequestUpdate.cshtml index 40ed86a..680da57 100644 --- a/Bank/BankClientApp/Views/Home/RequestUpdate.cshtml +++ b/Bank/BankClientApp/Views/Home/RequestUpdate.cshtml @@ -49,7 +49,7 @@ data: { requestId: request }, success: function (result) { $.map(result, function (n) { - $(`option[value=${n}]`).attr("selected", "selected") + $(`#cards option[value=${n}]`).attr("selected", "selected") }); } });