From 3a0491b54dbd2bd66d3f009e7db501b1a58336ed Mon Sep 17 00:00:00 2001
From: Artyom_Yashin <yashinartyom73@gmail.com>
Date: Sun, 26 May 2024 12:10:15 +0400
Subject: [PATCH 1/2] =?UTF-8?q?=D0=A4=D0=BE=D1=80=D0=BC=D0=B0=20=D0=BE?=
 =?UTF-8?q?=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B7?=
 =?UTF-8?q?=D0=B0=D1=8F=D0=B2=D0=BE=D0=BA=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82?=
 =?UTF-8?q?=D0=B0=D0=B5=D1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Bank/BankClientApp/APIClient.cs               |  5 ++++-
 .../Controllers/HomeController.cs             | 19 ++++++++++++++++++-
 .../Views/Home/RequestUpdate.cshtml           | 13 ++++++++-----
 .../Implements/RequestStorage.cs              |  2 +-
 .../Controllers/RequestController.cs          |  4 +++-
 5 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/Bank/BankClientApp/APIClient.cs b/Bank/BankClientApp/APIClient.cs
index 86b03de..3b0fcde 100644
--- a/Bank/BankClientApp/APIClient.cs
+++ b/Bank/BankClientApp/APIClient.cs
@@ -23,7 +23,10 @@ namespace BankClientApp
 			var result = response.Result.Content.ReadAsStringAsync().Result;
 			if (response.Result.IsSuccessStatusCode)
 			{
-				return JsonConvert.DeserializeObject<T>(result);
+				return JsonConvert.DeserializeObject<T>(result, new JsonSerializerSettings {
+					TypeNameHandling = Newtonsoft.Json.TypeNameHandling.All,
+					NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore,
+				});
 			}
 			else
 			{
diff --git a/Bank/BankClientApp/Controllers/HomeController.cs b/Bank/BankClientApp/Controllers/HomeController.cs
index e6fb211..9872473 100644
--- a/Bank/BankClientApp/Controllers/HomeController.cs
+++ b/Bank/BankClientApp/Controllers/HomeController.cs
@@ -427,7 +427,7 @@ namespace BankClientApp.Controllers
 		}
 
 		[HttpPost]
-		public void RequestUpdate(int sum, List<int> cards)
+		public void RequestUpdate(int request, int sum, List<int> cards)
 		{
 			if (APIClient.Client == null)
 				throw new Exception("Вы как суда попали? Суда вход только авторизованным");
@@ -438,6 +438,7 @@ namespace BankClientApp.Controllers
 			}
 			APIClient.PostRequest("/api/request/updaterequest", new RequestBindingModel
 			{
+				Id = request,
 				Sum = sum,
 				CardRequests = a,
 				Status = RequestStatus.Неизвестен
@@ -471,6 +472,22 @@ namespace BankClientApp.Controllers
 			Response.Redirect("Request");
 		}
 
+		[HttpGet]
+		public RequestViewModel? GetRequest(int requestId)
+		{
+			if (APIClient.Client == null)
+			{
+				throw new Exception("Вы как суда попали? Суда вход только авторизованным");
+			}
+			var result = APIClient.GetRequest<RequestViewModel>($"api/request/getrequest?requestid={requestId}");
+			result.CardRequests = null;
+			if (result == null)
+			{
+				return default;
+			}
+			return result;
+		}
+
 			#endregion
 
 		#region//работа с отчетами
diff --git a/Bank/BankClientApp/Views/Home/RequestUpdate.cshtml b/Bank/BankClientApp/Views/Home/RequestUpdate.cshtml
index 500c533..40ed86a 100644
--- a/Bank/BankClientApp/Views/Home/RequestUpdate.cshtml
+++ b/Bank/BankClientApp/Views/Home/RequestUpdate.cshtml
@@ -40,23 +40,26 @@
 	{
 	<script>
 		function check() {
-			var cards = $('#cards').val();
 			var request = $('#request').val();
 			$("#cards option:selected").removeAttr("selected");
-			if (cards && request) {
+			if (request) {
 				$.ajax({
 					method: "GET",
 					url: "/Home/GetCards",
 					data: { requestId: request },
 					success: function (result) {
 						$.map(result, function (n) {
-							$(`option[data-name=${n}]`).attr("selected", "selected")
+							$(`option[value=${n}]`).attr("selected", "selected")
 						});
 					}
-
 				});
 				$.ajax({
-
+					method: "GET",
+					url: "/Home/GetRequest",
+					data: {requestId: request},
+					success: function (result) {
+						$('#sum').val(result.sum)
+					}
 				});
 			};
 		}
diff --git a/Bank/BankDatabaseImplement/Implements/RequestStorage.cs b/Bank/BankDatabaseImplement/Implements/RequestStorage.cs
index f7f2746..8f51611 100644
--- a/Bank/BankDatabaseImplement/Implements/RequestStorage.cs
+++ b/Bank/BankDatabaseImplement/Implements/RequestStorage.cs
@@ -48,7 +48,7 @@ namespace BankDatabaseImplement.Implements
 		{
 			if (!model.Id.HasValue) return null;
 			using var context = new BankDatabase();
-			return context.Requests.Include(x => x.Cards).ThenInclude(x => x.Card)
+			return context.Requests.Include(x => x.Cards).ThenInclude(x => x.Card).ToList()
 				.FirstOrDefault(x => x.Id == model.Id)?.GetViewModel;
 		}
 		public RequestViewModel? Insert(RequestBindingModel model)
diff --git a/Bank/BankRestApi/Controllers/RequestController.cs b/Bank/BankRestApi/Controllers/RequestController.cs
index e93e0f2..41c4c6f 100644
--- a/Bank/BankRestApi/Controllers/RequestController.cs
+++ b/Bank/BankRestApi/Controllers/RequestController.cs
@@ -37,10 +37,12 @@ namespace BankRestApi.Controllers
 		{
 			try
 			{
-				return _logic.ReadElement(new RequestSearchModel
+				var tmp = _logic.ReadElement(new RequestSearchModel
 				{
 					Id = RequestId
 				});
+				tmp.CardRequests = null;
+				return tmp;
 			}
 			catch (Exception ex)
 			{

From de87360d250e6d921f7e17aeb2a6612a2b752428 Mon Sep 17 00:00:00 2001
From: Artyom_Yashin <yashinartyom73@gmail.com>
Date: Sun, 26 May 2024 12:41:35 +0400
Subject: [PATCH 2/2] =?UTF-8?q?=D0=A4=D0=BE=D1=80=D0=BC=D1=8B=20=D0=B4?=
 =?UTF-8?q?=D0=BE=D0=B1=D0=B8=D0=BB,=20=D0=BE=D1=81=D1=82=D0=B0=D0=BB?=
 =?UTF-8?q?=D0=B8=D1=81=D1=8C=20=D0=BE=D1=82=D1=87=D0=B5=D1=82=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Bank/BankClientApp/APIClient.cs                      | 5 +----
 Bank/BankClientApp/Controllers/HomeController.cs     | 3 +--
 Bank/BankClientApp/Views/Home/OperationUpdate.cshtml | 2 +-
 Bank/BankClientApp/Views/Home/RequestUpdate.cshtml   | 2 +-
 4 files changed, 4 insertions(+), 8 deletions(-)

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<T>(result, new JsonSerializerSettings {
-					TypeNameHandling = Newtonsoft.Json.TypeNameHandling.All,
-					NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore,
-				});
+				return JsonConvert.DeserializeObject<T>(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<List<OperationViewModel>>($"api/operation/getoperationlist?clientid={APIClient.Client.Id}");
-			ViewBag.Transfers = APIClient.GetRequest<List<TransferViewModel>>($"api/transfer/gettransferlist");
+			ViewBag.Transfers = APIClient.GetRequest<List<TransferViewModel>>($"api/transfer/getfulltransferlist");
 			return View();
 		}
 
@@ -480,7 +480,6 @@ namespace BankClientApp.Controllers
 				throw new Exception("Вы как суда попали? Суда вход только авторизованным");
 			}
 			var result = APIClient.GetRequest<RequestViewModel>($"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();
 		});
 	</script>
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")
 						});
 					}
 				});