From 8d52beb589f7930283a6cfe61849353489bb6e80 Mon Sep 17 00:00:00 2001
From: antoc0der <1@DESKTOP-K1L8ND3>
Date: Wed, 1 May 2024 14:22:19 +0400
Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=BE=D1=80=D1=83=D1=87=D0=B8=D1=82?=
 =?UTF-8?q?=D0=B5=D0=BB=D1=8C=20=D0=BA=D0=B0=D0=BA=D0=BE=D0=B9=20=D1=82?=
 =?UTF-8?q?=D0=BE=20=D0=B1=D1=80=D0=B5=D0=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SearchModels/MedicationSearchModel.cs            |  3 ++-
 .../VeterinaryRestApi/Controllers/DrugController.cs  |  5 +++++
 .../Controllers/HomeController.cs                    | 12 +++---------
 .../Views/Home/CreateDrug.cshtml                     |  6 ------
 .../Views/Home/CreateService.cshtml                  |  2 +-
 .../Views/Home/UpdateDrug.cshtml                     |  2 +-
 6 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/VeterinaryView/VeterinaryContracts/SearchModels/MedicationSearchModel.cs b/VeterinaryView/VeterinaryContracts/SearchModels/MedicationSearchModel.cs
index 49bf4e4..d06a232 100644
--- a/VeterinaryView/VeterinaryContracts/SearchModels/MedicationSearchModel.cs
+++ b/VeterinaryView/VeterinaryContracts/SearchModels/MedicationSearchModel.cs
@@ -10,6 +10,7 @@ namespace VeterinaryContracts.SearchModels
 	{
 		public int? Id { get; set; }
 		public string? MedicationName { get; set; }
-		public int DoctorId { get; set; }
+		public int? DoctorId { get; set; }
+		public double? Price { get; set; }
 	}
 }
diff --git a/VeterinaryView/VeterinaryRestApi/Controllers/DrugController.cs b/VeterinaryView/VeterinaryRestApi/Controllers/DrugController.cs
index 3f24631..607425d 100644
--- a/VeterinaryView/VeterinaryRestApi/Controllers/DrugController.cs
+++ b/VeterinaryView/VeterinaryRestApi/Controllers/DrugController.cs
@@ -3,6 +3,7 @@ using VeterinaryContracts.BindingModels;
 using VeterinaryContracts.BusinessLogicContracts;
 using VeterinaryContracts.SearchModels;
 using VeterinaryContracts.ViewModels;
+using VeterinaryDatabaseImplement.Models;
 
 namespace VeterinaryRestApi.Controllers
 {
@@ -52,6 +53,10 @@ namespace VeterinaryRestApi.Controllers
 		{
 			try
 			{
+				foreach(var medication in model.DrugMedications)
+				{
+					model.Price += medication.Value.Price;
+				}
 				return _drug.Create(model);
 			}
 			catch (Exception ex)
diff --git a/VeterinaryView/VeterinaryShowDoctorApp/Controllers/HomeController.cs b/VeterinaryView/VeterinaryShowDoctorApp/Controllers/HomeController.cs
index e1903ed..748f193 100644
--- a/VeterinaryView/VeterinaryShowDoctorApp/Controllers/HomeController.cs
+++ b/VeterinaryView/VeterinaryShowDoctorApp/Controllers/HomeController.cs
@@ -203,7 +203,7 @@ namespace VeterinaryShowDoctorApp.Controllers
 			{
 				return Redirect("~/Home/Enter");
 			}
-			ViewBag.Medications = APIDoctor.GetRequest<List<MedicationViewModel>>($"api/medication/getmedications");
+			ViewBag.Medications = APIDoctor.GetRequest<List<MedicationViewModel>>($"api/medication/getmedications?doctorid={APIDoctor.Doctor.Id}");
 
 			return View();
 		}
@@ -215,7 +215,6 @@ namespace VeterinaryShowDoctorApp.Controllers
 			{
 				throw new Exception("Вы как суда попали? Суда вход только авторизованным");
 			}
-			double _price=0;
 			if (string.IsNullOrEmpty(name) || count <=0)
 			{
 				throw new Exception("Ошибка в введенных данных");
@@ -225,15 +224,10 @@ namespace VeterinaryShowDoctorApp.Controllers
 			{
 				a.Add(medication, new MedicationSearchModel { Id = medication } as IMedicationModel);
 			}
-			foreach (var elem in a)
-			{
-				_price += elem.Value.Price;
-			}
-
 			APIDoctor.PostRequest("api/drug/createdrug", new DrugBindingModel
 			{
 				DrugName = name,
-				Price = Math.Round(_price, 2),
+				Price = 0,
 				DrugMedications = a,
 				Count = count
 			});
@@ -329,7 +323,7 @@ namespace VeterinaryShowDoctorApp.Controllers
 			{
 				return Redirect("~/Home/Enter");
 			}
-			return View(APIDoctor.GetRequest<List<DrugViewModel>>($"api/service/getservices?doctorid={APIDoctor.Doctor.Id}"));
+			return View(APIDoctor.GetRequest<List<ServiceViewModel>>($"api/service/getservices?doctorid={APIDoctor.Doctor.Id}"));
 
 		}
 		public IActionResult CreateService()
diff --git a/VeterinaryView/VeterinaryShowDoctorApp/Views/Home/CreateDrug.cshtml b/VeterinaryView/VeterinaryShowDoctorApp/Views/Home/CreateDrug.cshtml
index 32ab979..2d43ab9 100644
--- a/VeterinaryView/VeterinaryShowDoctorApp/Views/Home/CreateDrug.cshtml
+++ b/VeterinaryView/VeterinaryShowDoctorApp/Views/Home/CreateDrug.cshtml
@@ -12,12 +12,6 @@
 			<input type="text" name="name" id="name" />
 		</div>
 	</div>
-	<div class="row">
-		<div class="col-4">Цена:</div>
-		<div class="col-8">
-			<input type="text" name="price" id="price" />
-		</div>
-	</div>
 	<div class="row">
 		<div class="col-4">Количество:</div>
 		<div class="col-8">
diff --git a/VeterinaryView/VeterinaryShowDoctorApp/Views/Home/CreateService.cshtml b/VeterinaryView/VeterinaryShowDoctorApp/Views/Home/CreateService.cshtml
index fe851f4..886dd80 100644
--- a/VeterinaryView/VeterinaryShowDoctorApp/Views/Home/CreateService.cshtml
+++ b/VeterinaryView/VeterinaryShowDoctorApp/Views/Home/CreateService.cshtml
@@ -15,7 +15,7 @@
 	<div class="row">
 		<div class="col-4">Визиты:</div>
 		<div class="col-8">
-			<select id="visit" name="visit" class="form-control" asp-items="@(new SelectList(@ViewBag.Visits,"Id", "VisitName"))"></select>
+			<select id="visit" name="visit" class="form-control" asp-items="@(new SelectList(@ViewBag.Visits, "Id", "VisitName"))"></select>
 		</div>
 	</div>
 	<div class="row">
diff --git a/VeterinaryView/VeterinaryShowDoctorApp/Views/Home/UpdateDrug.cshtml b/VeterinaryView/VeterinaryShowDoctorApp/Views/Home/UpdateDrug.cshtml
index be694a8..a3234da 100644
--- a/VeterinaryView/VeterinaryShowDoctorApp/Views/Home/UpdateDrug.cshtml
+++ b/VeterinaryView/VeterinaryShowDoctorApp/Views/Home/UpdateDrug.cshtml
@@ -9,7 +9,7 @@
 </div>
 <form method="post">
 	<div class="row">
-		<div class="col-4">Услуга:</div>
+		<div class="col-4">Лекарство:</div>
 		<div class="col-8">
 			<select id="drug" name="drug" class="form-control" asp-items="@(new SelectList(@ViewBag.Drugs, "Id", "DrugName"))"></select>
 		</div>