From 4b5cf5582ec64b55f5d7d9573eeb97d2a6a3767e Mon Sep 17 00:00:00 2001
From: "ns.potapov" <ns.potapov@yandex.ru>
Date: Mon, 27 May 2024 19:21:15 +0400
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BC=D0=B5=D0=BD=D1=8F=D0=BB=20?=
 =?UTF-8?q?=D1=81=D0=B8=D0=B3=D0=BD=D0=B0=D1=82=D1=86=D1=80=D1=86=20=D1=84?=
 =?UTF-8?q?=D1=83=D0=BD=D0=BA=D1=86=D0=B8=D0=B9=20=D0=B2=20=D0=BA=D0=BE?=
 =?UTF-8?q?=D0=BD=D1=82=D1=80=D0=BE=D0=BB=D0=BB=D0=B5=D1=80=D0=B5=20=D0=B4?=
 =?UTF-8?q?=D0=B8=D0=B0=D0=B3=D0=BD=D0=BE=D0=B7=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/DiagnosesController.cs        | 22 +++++++++----------
 .../Views/Diagnoses/DiagnoseForm.cshtml       | 10 ++++-----
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Polyclinic/PolyclinicWebAppImplementer/Controllers/DiagnosesController.cs b/Polyclinic/PolyclinicWebAppImplementer/Controllers/DiagnosesController.cs
index ef29ec9..c7b7c13 100644
--- a/Polyclinic/PolyclinicWebAppImplementer/Controllers/DiagnosesController.cs
+++ b/Polyclinic/PolyclinicWebAppImplementer/Controllers/DiagnosesController.cs
@@ -29,7 +29,7 @@ namespace PolyclinicWebAppImplementer.Controllers
 
         [HttpGet]
         [HttpPost]
-        public IActionResult Add(string name, string? comment, DateTime dateStart, DateTime? dateStop)
+        public IActionResult Add(DiagnoseViewModel model)
         {
             if (HttpContext.Request.Method == "GET")
             {
@@ -41,10 +41,10 @@ namespace PolyclinicWebAppImplementer.Controllers
                 // TODO прописать UserId
                 DiagnoseBindingModel diagnose = new DiagnoseBindingModel
                 {
-                    Name = name,
-                    Comment = comment,
-                    DateStartDiagnose = dateStart,
-                    DateStopDiagnose = dateStop,
+                    Name = model.Name,
+                    Comment = model.Comment,
+                    DateStartDiagnose = model.DateStartDiagnose,
+                    DateStopDiagnose = model.DateStopDiagnose,
                 };
                 _diagnoseLogic.Create(diagnose);
                 return RedirectToAction("Index");
@@ -53,7 +53,7 @@ namespace PolyclinicWebAppImplementer.Controllers
 
         [HttpGet]
         [HttpPost]
-        public IActionResult Edit(int id, string name, string? comment, DateTime dateStart, DateTime? dateStop)
+        public IActionResult Edit(int id, DiagnoseViewModel model)
         {
             if (HttpContext.Request.Method == "GET")
             {
@@ -65,11 +65,11 @@ namespace PolyclinicWebAppImplementer.Controllers
             {
                 DiagnoseBindingModel diagnose = new DiagnoseBindingModel
                 {
-                    Id = id,
-                    Name = name,
-                    Comment = comment,
-                    DateStartDiagnose = dateStart,
-                    DateStopDiagnose = dateStop,
+                    Id = model.Id,
+                    Name = model.Name,
+                    Comment = model.Comment,
+                    DateStartDiagnose = model.DateStartDiagnose,
+                    DateStopDiagnose = model.DateStopDiagnose,
                 };
                 _diagnoseLogic.Update(diagnose);
                 return RedirectToAction("Index");
diff --git a/Polyclinic/PolyclinicWebAppImplementer/Views/Diagnoses/DiagnoseForm.cshtml b/Polyclinic/PolyclinicWebAppImplementer/Views/Diagnoses/DiagnoseForm.cshtml
index 8ba7027..d730b29 100644
--- a/Polyclinic/PolyclinicWebAppImplementer/Views/Diagnoses/DiagnoseForm.cshtml
+++ b/Polyclinic/PolyclinicWebAppImplementer/Views/Diagnoses/DiagnoseForm.cshtml
@@ -2,22 +2,22 @@
 @model DiagnoseViewModel
 <h4>@ViewData["Title"]</h4>
 <form class="d-flex flex-column" method="post">
-    <input type="hidden" name="id" readonly asp-for="Id" />
+    <input type="hidden" readonly asp-for="Id" />
     <div class="row mb-5">
         <div class="col-3">Название:</div>
-        <div class="col-8"><input required type="text" id="name" name="name" asp-for="Name" /></div>
+        <div class="col-8"><input required asp-for="Name" /></div>
     </div>
     <div class="row mb-5">
         <div class="col-3">Коментарий:</div>
-        <div class="col-8"><textarea id="comment" name="comment" asp-for="Comment"></textarea></div>
+        <div class="col-8"><textarea asp-for="Comment"></textarea></div>
     </div>
     <div class="row mb-5">
         <div class="col-3">Начало:</div>
-        <div class="col-8"><input required type="date" id="dateStartInput" name="dateStart" asp-for="DateStartDiagnose" /></div>
+        <div class="col-8"><input required type="date" asp-for="DateStartDiagnose" /></div>
     </div>
     <div class="row mb-5">
         <div class="col-3">Конец:</div>
-        <div class="col-8"><input type="date" id="dateStopInput" name="dateStop" asp-for="DateStopDiagnose" value="" placeholder=""/></div>
+        <div class="col-8"><input type="date" asp-for="DateStopDiagnose" /></div>
     </div>
     <div class="row mb-5">
         <div class="col-4">