From 7214604c6705fd48364d2fcebb70146248d5d0a8 Mon Sep 17 00:00:00 2001
From: gg12 darfren <frenkiarts@yandex.ru>
Date: Sat, 27 Apr 2024 18:51:12 +0400
Subject: [PATCH] =?UTF-8?q?=D0=A1=D0=94=D0=95=D0=9B=D0=90=D0=9B=20=D0=A1?=
 =?UTF-8?q?=D0=94=D0=95=D0=9B=D0=90=D0=9B=20=D0=A1=D0=94=D0=95=D0=9B=D0=90?=
 =?UTF-8?q?=D0=9B=20=D0=A3=D0=A0=D0=90=D0=90=D0=90=D0=90=D0=90=D0=90=D0=90?=
 =?UTF-8?q?=D0=90=D0=90=D0=90=D0=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PharmacistApp/Controllers/HomeController.cs     | 13 +++----------
 .../PharmacistApp/Views/Home/UpdateMedicine.cshtml  | 11 +++++++++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/VetClinic/PharmacistApp/Controllers/HomeController.cs b/VetClinic/PharmacistApp/Controllers/HomeController.cs
index 96b8910..68ce4cc 100644
--- a/VetClinic/PharmacistApp/Controllers/HomeController.cs
+++ b/VetClinic/PharmacistApp/Controllers/HomeController.cs
@@ -239,7 +239,7 @@ View(APIPharmacist.GetRequest<List<MedicineViewModel>>($"api/medicine/getmedicin
 		}
 
 		[HttpGet]
-		public Tuple<MedicineViewModel, string>? GetMedicine(int medicineId)
+		public Tuple<MedicineViewModel, List<string>>? GetMedicine(int medicineId)
 		{
 			if (APIPharmacist.Pharmacist == null)
 			{
@@ -250,15 +250,8 @@ View(APIPharmacist.GetRequest<List<MedicineViewModel>>($"api/medicine/getmedicin
 			{
 				return default;
 			}
-			string table = "";
-			for (int i = 0; i < result.Item2.Count; i++)
-			{
-				var animal = result.Item2[i];
-				table += "<tr>";
-				table += $"<td>{animal}</td>";
-				table += "</tr>";
-			}
-			return Tuple.Create(result.Item1, table);
+
+			return result;
 		}
 
 		[HttpGet]
diff --git a/VetClinic/PharmacistApp/Views/Home/UpdateMedicine.cshtml b/VetClinic/PharmacistApp/Views/Home/UpdateMedicine.cshtml
index eb1724a..d1ba160 100644
--- a/VetClinic/PharmacistApp/Views/Home/UpdateMedicine.cshtml
+++ b/VetClinic/PharmacistApp/Views/Home/UpdateMedicine.cshtml
@@ -25,10 +25,10 @@
 	<div class="row">
 		<div class="col-4">Животные:</div>
 		<div class="col-8">
-			<select name="animals" class="form-control" multiple size="6" id="animals">
+			<select name="animals" class="form-control" multiple size="5" id="animals">
 				@foreach (var animal in ViewBag.Animals)
 				{
-					<option value="@animal.Id">@animal.AnimalName</option>
+					<option value="@animal.Id" id="@animal.AnimalName">@animal.AnimalName</option>
 				}
 			</select>
 		</div>
@@ -44,15 +44,22 @@
 	<script>
 		function check() {
 			var medicine = $('#medicine').val();
+			$("#animals option:selected").removeAttr("selected");
 			if (medicine) {
 				$.ajax({
 					method: "GET",
 					url: "/Home/GetMedicine",
 					data: { medicineId: medicine },
 					success: function (result) {
+						console.log(result.item2);
 						$('#name').val(result.item1.medicineName);
 						$('#price').val(result.item1.price);
+						$.map(result.item2, function ( n ) {
+							console.log("#" + n);
+							$("#" + n).attr("selected", "selected")
+						});
 					}
+
 				});
 			};
 		}