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>($"api/medication/getmedications"); + ViewBag.Medications = APIDoctor.GetRequest>($"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>($"api/service/getservices?doctorid={APIDoctor.Doctor.Id}")); + return View(APIDoctor.GetRequest>($"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 @@ -
-
Цена:
-
- -
-
Количество:
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 @@
Визиты:
- +
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 @@
-
Услуга:
+
Лекарство: