From f09946ecd5416dea4a76f49dbc0aa0892734e5ef Mon Sep 17 00:00:00 2001
From: gg12 darfren <frenkiarts@yandex.ru>
Date: Mon, 29 Apr 2024 13:56:26 +0400
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=20?=
 =?UTF-8?q?=D0=B2=D0=B8=D0=B7=D1=83=D0=B0=D0=BB=20=D0=BA=D1=80=D1=83=D0=B4?=
 =?UTF-8?q?=D0=BE=D0=B2=20(=D0=BD=D0=B0=D0=B2=D0=B5=D1=80=D0=BD=D0=BE?=
 =?UTF-8?q?=D0=B5)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 VetClinic/PharmacistApp/Controllers/HomeController.cs     | 2 +-
 VetClinic/PharmacistApp/Views/Home/DeleteGuidance.cshtml  | 2 +-
 VetClinic/PharmacistApp/Views/Home/Guidances.cshtml       | 7 +++++++
 VetClinic/PharmacistApp/Views/Home/UpdateGuidance.cshtml  | 8 +++++++-
 VetClinic/PharmacistApp/Views/Shared/_Layout.cshtml       | 2 +-
 .../Implements/GuidanceStorage.cs                         | 7 ++++---
 VetClinic/VetClinicDataBaseImplement/Models/Guidance.cs   | 4 +++-
 7 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/VetClinic/PharmacistApp/Controllers/HomeController.cs b/VetClinic/PharmacistApp/Controllers/HomeController.cs
index e62fbd8..a149f3c 100644
--- a/VetClinic/PharmacistApp/Controllers/HomeController.cs
+++ b/VetClinic/PharmacistApp/Controllers/HomeController.cs
@@ -557,7 +557,7 @@ View(res);
 		}
 
 		[HttpPost]
-		public void DeleteGuidance(int guidance, int service, string text)
+		public void DeleteGuidance(int guidance)
 		{
 			if (APIPharmacist.Pharmacist == null)
 			{
diff --git a/VetClinic/PharmacistApp/Views/Home/DeleteGuidance.cshtml b/VetClinic/PharmacistApp/Views/Home/DeleteGuidance.cshtml
index 5721d3b..f0df23a 100644
--- a/VetClinic/PharmacistApp/Views/Home/DeleteGuidance.cshtml
+++ b/VetClinic/PharmacistApp/Views/Home/DeleteGuidance.cshtml
@@ -8,7 +8,7 @@
 	<div class="row">
 		<div class="col-4">Рекомендация:</div>
 		<div class="col-8">
-			<select id="guidance" name="guidance" class="form-control" asp-items="@(new SelectList(@ViewBag.Guidances, "Id", "GuidanceName"))"></select>
+			<select id="guidance" name="guidance" class="form-control" asp-items="@(new SelectList(@ViewBag.Guidances, "Id", "Text"))"></select>
 		</div>
 	</div>
 	<div class="row">
diff --git a/VetClinic/PharmacistApp/Views/Home/Guidances.cshtml b/VetClinic/PharmacistApp/Views/Home/Guidances.cshtml
index c30d534..ced9878 100644
--- a/VetClinic/PharmacistApp/Views/Home/Guidances.cshtml
+++ b/VetClinic/PharmacistApp/Views/Home/Guidances.cshtml
@@ -27,6 +27,9 @@
 					<th>
 						Дата
 					</th>
+					<th>
+						Услуга
+					</th>
 					<th>
 						Текст
 					</th>
@@ -44,6 +47,10 @@
 							@Html.DisplayFor(modelItem =>
 															item.Date)
 						</td>
+						<td>
+							@Html.DisplayFor(modelItem =>
+															item.ServiceName)
+						</td>
 						<td>
 							@Html.DisplayFor(modelItem =>
 															item.Text)
diff --git a/VetClinic/PharmacistApp/Views/Home/UpdateGuidance.cshtml b/VetClinic/PharmacistApp/Views/Home/UpdateGuidance.cshtml
index 49ff979..f11ef9a 100644
--- a/VetClinic/PharmacistApp/Views/Home/UpdateGuidance.cshtml
+++ b/VetClinic/PharmacistApp/Views/Home/UpdateGuidance.cshtml
@@ -15,7 +15,12 @@
 	<div class="row">
 		<div class="col-4">Услуга:</div>
 		<div class="col-8">
-			<select id="service" name="service" class="form-control" asp-items="@(new SelectList(@ViewBag.Services,"Id", "ServiceName"))"></select>
+			<select name="service" class="form-control" id="service">
+				@foreach (var service in ViewBag.Services)
+				{
+					<option value="@service.Id" id="@service.Id">@service.ServiceName</option>
+				}
+			</select>
 		</div>
 	</div>
 	<div class="row">
@@ -38,6 +43,7 @@ btn-primary" />
 	function check() {
 
 		var guidance = $('#guidance').val();
+		$("#service option:selected").removeAttr("selected");
 		if (guidance) {
 			$.ajax({
 				method: "GET",
diff --git a/VetClinic/PharmacistApp/Views/Shared/_Layout.cshtml b/VetClinic/PharmacistApp/Views/Shared/_Layout.cshtml
index fde4176..1e4bdbe 100644
--- a/VetClinic/PharmacistApp/Views/Shared/_Layout.cshtml
+++ b/VetClinic/PharmacistApp/Views/Shared/_Layout.cshtml
@@ -13,7 +13,7 @@
 	<header>
 		<nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bgwhite border-bottom box-shadow mb-3">
 			<div class="container">
-				<a class="navbar-brand" asp-area="" asp-controller="Home" aspaction="Index">Магазин мороженного</a>
+				<a class="navbar-brand" asp-area="" asp-controller="Home" aspaction="Index">Ветклиника</a>
 				<button class="navbar-toggler" type="button" datatoggle="collapse" data-target=".navbar-collapse" ariacontrols="navbarSupportedContent"
 						aria-expanded="false" aria-label="Toggle navigation">
 					<span class="navbar-toggler-icon"></span>
diff --git a/VetClinic/VetClinicDataBaseImplement/Implements/GuidanceStorage.cs b/VetClinic/VetClinicDataBaseImplement/Implements/GuidanceStorage.cs
index c0d6e60..a8214ed 100644
--- a/VetClinic/VetClinicDataBaseImplement/Implements/GuidanceStorage.cs
+++ b/VetClinic/VetClinicDataBaseImplement/Implements/GuidanceStorage.cs
@@ -33,7 +33,8 @@ namespace VetClinicDataBaseImplement.Implements
 		{
 			using var context = new VetClinicDatabase();
 			return context.Guidances.Include(x => x.Service).FirstOrDefault(x => (!model.Id.HasValue || model.Id == x.Id)
-				&& (!model.ServiceId.HasValue || model.ServiceId == x.ServiceId) && (!model.DateFrom.HasValue || model.DateFrom <= x.Date)
+				&& (!model.ServiceId.HasValue || model.ServiceId == x.ServiceId) && (string.IsNullOrEmpty(model.Text) || model.Text == x.Text)  
+				&& (!model.DateFrom.HasValue || model.DateFrom <= x.Date)
 				 && (!model.DateTo.HasValue || model.DateTo >= x.Date))?.GetViewModel;
 		}
 		public GuidanceViewModel? Insert(GuidanceBindingModel model)
@@ -57,14 +58,14 @@ namespace VetClinicDataBaseImplement.Implements
 			{
 				return null;
 			}
-			order.Update(model);
+			order.Update(context, model);
 			context.SaveChanges();
 			return order.GetViewModel;
 		}
 		public GuidanceViewModel? Delete(GuidanceBindingModel model)
 		{
 			using var context = new VetClinicDatabase();
-			var element = context.Guidances.FirstOrDefault(rec => rec.Id ==
+			var element = context.Guidances.Include(x => x.Service).FirstOrDefault(rec => rec.Id ==
 		   model.Id);
 			if (element != null)
 			{
diff --git a/VetClinic/VetClinicDataBaseImplement/Models/Guidance.cs b/VetClinic/VetClinicDataBaseImplement/Models/Guidance.cs
index 1b96521..f28714c 100644
--- a/VetClinic/VetClinicDataBaseImplement/Models/Guidance.cs
+++ b/VetClinic/VetClinicDataBaseImplement/Models/Guidance.cs
@@ -36,7 +36,7 @@ namespace VetClinicDataBaseImplement.Models
 			};
 		}
 
-		public void Update(GuidanceBindingModel? model)
+		public void Update(VetClinicDatabase context, GuidanceBindingModel? model)
 		{
 			if (model == null)
 			{
@@ -44,6 +44,8 @@ namespace VetClinicDataBaseImplement.Models
 			}
 			Text = model.Text;
 			Date = model.Date;
+			ServiceId = model.ServiceId;
+			Service = context.Services.FirstOrDefault(x => x.Id == model.ServiceId);
 		}
 
 		public GuidanceViewModel GetViewModel => new()