From 9d840a764e24167629421eadcac09f7901a4713c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=95=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=91=D0=B0=D0=BA=D0=B0?= =?UTF-8?q?=D0=BB=D1=8C=D1=81=D0=BA=D0=B0=D1=8F?= Date: Tue, 28 May 2024 21:53:46 +0400 Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=D0=B0=20=D0=BC=D0=B5=D0=B4=D0=B8=D0=BA=D0=B0=D0=BC=D0=B5?= =?UTF-8?q?=D0=BD=D1=82=D1=8B=20-=20=D0=BA=D1=80=D1=83=D0=B4=D1=8B=20?= =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20=D0=BD=D0=B8=D1=85=20=D1=80=D0=B0=D0=B1?= =?UTF-8?q?=D0=BE=D1=82=D0=B0=D1=8E=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusinessLogics/MedicamentLogic.cs | 4 -- .../Models/Medicament.cs | 2 + .../Controllers/HomeController.cs | 2 + .../Views/Home/Medicaments.cshtml | 49 ++++++++++--------- 4 files changed, 30 insertions(+), 27 deletions(-) diff --git a/Polyclinic/PolyclinicBusinessLogic/BusinessLogics/MedicamentLogic.cs b/Polyclinic/PolyclinicBusinessLogic/BusinessLogics/MedicamentLogic.cs index 116abc8..6b3094f 100644 --- a/Polyclinic/PolyclinicBusinessLogic/BusinessLogics/MedicamentLogic.cs +++ b/Polyclinic/PolyclinicBusinessLogic/BusinessLogics/MedicamentLogic.cs @@ -99,10 +99,6 @@ namespace PolyclinicBusinessLogic.BusinessLogics { throw new ArgumentNullException("Какой-то неправильный идентификатор процедуры...", nameof(model)); } - if (string.IsNullOrEmpty(model.Comment)) - { - throw new ArgumentNullException("Нет комментария", nameof(model.Comment)); - } if (string.IsNullOrEmpty(model.Name)) { throw new ArgumentNullException("Нет названия у препарата", nameof(model.Comment)); diff --git a/Polyclinic/PolyclinicDatabaseImplement/Models/Medicament.cs b/Polyclinic/PolyclinicDatabaseImplement/Models/Medicament.cs index a120cf4..caf7481 100644 --- a/Polyclinic/PolyclinicDatabaseImplement/Models/Medicament.cs +++ b/Polyclinic/PolyclinicDatabaseImplement/Models/Medicament.cs @@ -40,6 +40,8 @@ namespace PolyclinicDatabaseImplement.Models { Name = bindingModel.Name; Comment = bindingModel.Comment; + ProcedureId = bindingModel.ProcedureId; + SymptomId = bindingModel.SymptomId; } public MedicamentViewModel GetViewModel => new() diff --git a/Polyclinic/PolyclinicWebAppSuretor/Controllers/HomeController.cs b/Polyclinic/PolyclinicWebAppSuretor/Controllers/HomeController.cs index 838c470..680ed67 100644 --- a/Polyclinic/PolyclinicWebAppSuretor/Controllers/HomeController.cs +++ b/Polyclinic/PolyclinicWebAppSuretor/Controllers/HomeController.cs @@ -171,6 +171,8 @@ namespace PolyclinicWebAppSuretor.Controllers [HttpPost] public IActionResult EditMedicament(MedicamentViewModel model) { + ViewBag.Procedures = _procedureLogic.ReadList(null); + ViewBag.Symptomes = _symptomLogic.ReadList(null); if (HttpContext.Request.Method == "GET") { var obj = _medicamentLogic.ReadElement(new MedicamentSearchModel { Id = model.Id }); diff --git a/Polyclinic/PolyclinicWebAppSuretor/Views/Home/Medicaments.cshtml b/Polyclinic/PolyclinicWebAppSuretor/Views/Home/Medicaments.cshtml index 4df7240..e3d1457 100644 --- a/Polyclinic/PolyclinicWebAppSuretor/Views/Home/Medicaments.cshtml +++ b/Polyclinic/PolyclinicWebAppSuretor/Views/Home/Medicaments.cshtml @@ -43,33 +43,36 @@ + @foreach (var item in Model) { - @item.Id - @item.Name - @item.SymptomName - @item.ProcedureName - @item.Comment - - - - - - - - -
- + + @item.Id + @item.Name + @item.SymptomName + @item.ProcedureName + @item.Comment + + + + + + + + + + -
+ - + + }