From 21b9bed09b7bb6b7393aeb6466a23bd731d0b36d 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?= <elina_kallin@mail.ru>
Date: Sun, 26 May 2024 18:16:46 +0400
Subject: [PATCH] =?UTF-8?q?=D0=BD=D1=83...=20=D0=BF=D1=80=D0=BE=D1=86?=
 =?UTF-8?q?=D0=B5=D0=B4=D1=83=D1=80=D0=B0=20=D1=81=D0=BE=D0=B7=D0=B4=D0=B0?=
 =?UTF-8?q?=D0=B5=D1=82=D1=81=D1=8F,=20=D0=BD=D0=BE=20=D0=BF=D0=BE=D0=BA?=
 =?UTF-8?q?=D0=B0=20=D0=BD=D0=B5=20=D0=BC=D0=B5=D0=BD=D1=8F=D0=B5=D1=82?=
 =?UTF-8?q?=D1=81=D1=8F=20(=D0=BD=D0=B5=20=D0=B0=D0=BF=D0=B4=D0=B5=D0=B9?=
 =?UTF-8?q?=D1=82=D0=B8=D1=82=D1=81=D1=8F)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/HomeController.cs             | 50 +++++++++-
 .../Views/Home/CreateProcedure.cshtml         | 20 ++--
 .../Views/Home/Procedures.cshtml              | 92 ++++++++-----------
 3 files changed, 94 insertions(+), 68 deletions(-)

diff --git a/Polyclinic/PolyclinicWebAppSuretor/Controllers/HomeController.cs b/Polyclinic/PolyclinicWebAppSuretor/Controllers/HomeController.cs
index 832d428..fd060dc 100644
--- a/Polyclinic/PolyclinicWebAppSuretor/Controllers/HomeController.cs
+++ b/Polyclinic/PolyclinicWebAppSuretor/Controllers/HomeController.cs
@@ -1,5 +1,8 @@
 using Microsoft.AspNetCore.Mvc;
+using PolyclinicBusinessLogic.BusinessLogics;
+using PolyclinicContracts.BindingModels;
 using PolyclinicContracts.BusinessLogicsContracts;
+using PolyclinicContracts.SearchModels;
 using PolyclinicContracts.ViewModels;
 using PolyclinicWebAppSuretor.Models;
 using System.Diagnostics;
@@ -52,9 +55,52 @@ namespace PolyclinicWebAppSuretor.Controllers
             return View();
         }
 
-        public IActionResult CreateProcedure()
+        [HttpGet]
+        [HttpPost]
+        public IActionResult CreateProcedure(string name, string? comment, DateTime dateStart, DateTime? dateStop)
         {
-            return View();
+            if (HttpContext.Request.Method == "GET")
+            {
+                ViewData["Title"] = "����� ���������";
+                return View();
+            }
+            else
+            {
+                // TODO ��������� UserId
+                ProcedureBindingModel procedure = new ProcedureBindingModel
+                {
+                    Name = name,
+                    Comment = comment ?? string.Empty,
+                    DateStartProcedure = dateStart,
+                    DateStopProcedure = dateStop
+                };
+                _procedureLogic.Create(procedure);
+                return RedirectToAction("Procedures");
+            }
+        }
+        [HttpGet]
+        [HttpPost]
+        public IActionResult Edit(int id, string name, string comment, DateTime dateStart, DateTime? dateStop)
+        {
+            if (HttpContext.Request.Method == "GET")
+            {
+                var obj = _procedureLogic.ReadElement(new ProcedureSearchModel { Id = id });
+                ViewData["Title"] = "������������� ���������";
+                return View(obj);
+            }
+            else
+            {
+                ProcedureBindingModel procedure = new ProcedureBindingModel
+                {
+                    Id = id,
+                    Name = name,
+                    Comment = comment ?? string.Empty,
+                    DateStartProcedure = dateStart,
+                    DateStopProcedure = dateStop
+                };
+                _procedureLogic.Update(procedure);
+                return RedirectToAction("Procedures");
+            }
         }
 
         public IActionResult CreateMedicament()
diff --git a/Polyclinic/PolyclinicWebAppSuretor/Views/Home/CreateProcedure.cshtml b/Polyclinic/PolyclinicWebAppSuretor/Views/Home/CreateProcedure.cshtml
index a9562a3..16c094a 100644
--- a/Polyclinic/PolyclinicWebAppSuretor/Views/Home/CreateProcedure.cshtml
+++ b/Polyclinic/PolyclinicWebAppSuretor/Views/Home/CreateProcedure.cshtml
@@ -1,5 +1,5 @@
 @using PolyclinicContracts.ViewModels
-@model List<ProcedureViewModel>
+@model ProcedureViewModel
 @{
     ViewData["Title"] = "CreateProcedure";
 }
@@ -10,40 +10,38 @@
 <form method="post" class="form-create-procedure d-flex flex-row justify-content-around align-items-center">
 
     <div class="procedure-info d-flex flex-column mb-5 mt-5">
-
+        <input type="hidden" name="id" readonly asp-for="Id" />
         <div class="d-flex flex-row mb-5 flex-row justify-content-between align-items-center">
             <h3 class="col-3 m-3">
                 Название:
             </h3>
-            <input class="col-6" type="text" style="width: 45vh" />
+            <input required type="text" id="name" name="name" asp-for="Name" />
         </div>
 
         <div class="d-flex flex-row mb-5 flex-row justify-content-between align-items-center">
             <h3 class="col-3 m-3">
                 Комментарий:
             </h3>
-            <textarea class="col-6" id="comment" name="comment" style="width: 45vh">
-
+            <textarea type="text" id="comment" name="comment" asp-for="Comment" style="width: 45vh">
             </textarea>
         </div>
-
     </div>
 
     <div class="d-flex flex-column mb-5 mt-5 justify-content-between align-content-around">
         <div class="mb-5 me-3">
-            <label for="dateFrom" class="me-3">
+            <label for="dateStart" class="me-3">
                 Дата начала
             </label>
-            <input type="date" id="dateFrom" name="dateFrom" />
+            <input type="date" id="dateStart" name="dateStart" asp-for="DateStartProcedure" />
         </div>
         <div class="mb-5 me-3">
-            <label for="dateTo" class="me-3">
+            <label for="dateStop" class="me-3">
                 Дата завершения
             </label>
-            <input type="date" id="dateTo" name="dateTo" />
+            <input type="date" id="dateStop" name="dateStop" asp-for="DateStopProcedure" />
         </div>
         <div class="col-4">
-            <input type="submit" value="Сохранить" class="button-save-procedure btn" asp-action="Procedures" />
+            <input type="submit" value="Сохранить" class="button-save-procedure btn" />
         </div>
     </div>
 </form>
\ No newline at end of file
diff --git a/Polyclinic/PolyclinicWebAppSuretor/Views/Home/Procedures.cshtml b/Polyclinic/PolyclinicWebAppSuretor/Views/Home/Procedures.cshtml
index 66cb332..2946c54 100644
--- a/Polyclinic/PolyclinicWebAppSuretor/Views/Home/Procedures.cshtml
+++ b/Polyclinic/PolyclinicWebAppSuretor/Views/Home/Procedures.cshtml
@@ -7,76 +7,58 @@
     <h1 class="display-4">Процедуры</h1>
 </div>
 
-<div class="text-center">
+<div>
     @{
         // if (Model == null)
         // {
         //     <h3 class="display-4">Авторизируйтесь</h3>
         //     return;
         // }
-        <p>
-            <a asp-action="CreateProcedure">Создать процедуру</a>
-        </p>
+        <div class="text-center">
+            <p>
+                <a asp-action="CreateProcedure">Создать процедуру</a>
+            </p>
+        </div>
         <table class="table">
             <thead>
                 <tr>
-                    <th>
-                        Номер
-                    </th>
-                    <th>
-                        Название процедуры
-                    </th>
-                    <th>
-                        Дата начала процедуры
-                    </th>
-                    <th>
-                        Дата окончания процедуры
-                    </th>
-                    <th>
-                        Комментарий
-                    </th>
-                    <th>
-                        Редактировать
-                    </th>
-                    <th>
-                        Удалить
-                    </th>
+                    <th scope="col">Номер</th>
+                    <th scope="col">Название процедуры</th>
+                    <th scope="col">Дата начала процедуры</th>
+                    <th scope="col">Дата окончания процедуры</th>
+                    <th scope="col">Комментарий</th>
+                    <th scope="col">Редактировать</th>
+                    <th scope="col">Удалить</th>
                 </tr>
             </thead>
             <tbody>
-                @foreach (var item in Model)
 
+
+                @foreach (var item in Model)
                 {
-                <td>
-                        @Html.DisplayFor(modelItem => item.Id)
-                </td>
-                <td>
-                        @Html.DisplayFor(modelItem => item.Name)
-                </td>
-                <td>
-                        @Html.DisplayFor(modelItem => item.DateStartProcedure)
-                </td>
-                <td>
-                        @Html.DisplayFor(modelItem => item.DateStopProcedure)
-                </td>
-                <td>
-                        @Html.DisplayFor(modelItem => item.Comment)
-                </td>
-                <td>
-                    <a asp-action="CreateProcedure">
-                        <svg class="bi-edit-pen" viewBox="0 0 127 127" fill="none" xmlns="http://www.w3.org/2000/svg">
-                            <path d="M105.5 26L37 114.5C34.5 117 16.3 121.7 7.5 122.5C79.1 34.1 101 5.5 102 4C104.833 4.5 119.3 14.6 122.5 21C105 44 98.5 55 111.5 58.5" stroke="#008315" stroke-width="6" stroke-linecap="round" />
-                        </svg>
-                    </a>
-                </td>
-                <td>
-                    <svg class="bi-cart-delete" viewBox="0 0 154 164" fill="none" xmlns="http://www.w3.org/2000/svg">
-                        <path d="M44.5 123C4.99995 119.5 -11.8431 56.4293 24 19.5C40.5 2.50001 72.5 -5.5 101.5 27.5L115.5 14.5" stroke="#D10000" stroke-width="8" stroke-linecap="round" />
-                        <path d="M65.2123 159.963L56 60.0001C88.0236 76.3307 119.521 77.4194 149 60.0001C141.63 142.346 140.08 160.953 140.226 159.963H65.2123Z" stroke="#D10000" stroke-width="8" />
-                        <path d="M121 36L101.582 55L75 31" stroke="#D10000" stroke-width="8" stroke-linecap="round" />
-                    </svg>
-                </td>
+                    <tr>
+                        <td scope="row">@Html.DisplayFor(modelItem => item.Id)</td>
+                        <td>@Html.DisplayFor(modelItem => item.Name)</td>
+                        <td>@Html.DisplayFor(modelItem => item.DateStartProcedure)</td>
+                        <td>@Html.DisplayFor(modelItem => item.DateStopProcedure)</td>
+                        <td>@Html.DisplayFor(modelItem => item.Comment)</td>
+                        <td>
+                            <a asp-action="CreateProcedure">
+                                <svg class="bi-edit-pen" viewBox="0 0 127 127" fill="none" xmlns="http://www.w3.org/2000/svg">
+                                    <path d="M105.5 26L37 114.5C34.5 117 16.3 121.7 7.5 122.5C79.1 34.1 101 5.5 102 4C104.833 4.5 119.3 14.6 122.5 21C105 44 98.5 55 111.5 58.5" stroke="#008315" stroke-width="6" stroke-linecap="round" />
+                                </svg>
+                            </a>
+                        </td>
+                        <td>
+                            <svg class="bi-cart-delete" viewBox="0 0 154 164" fill="none" xmlns="http://www.w3.org/2000/svg">
+                                <path d="M44.5 123C4.99995 119.5 -11.8431 56.4293 24 19.5C40.5 2.50001 72.5 -5.5 101.5 27.5L115.5 14.5" stroke="#D10000" stroke-width="8" stroke-linecap="round" />
+                                <path d="M65.2123 159.963L56 60.0001C88.0236 76.3307 119.521 77.4194 149 60.0001C141.63 142.346 140.08 160.953 140.226 159.963H65.2123Z" stroke="#D10000" stroke-width="8" />
+                                <path d="M121 36L101.582 55L75 31" stroke="#D10000" stroke-width="8" stroke-linecap="round" />
+                            </svg>
+                        </td>
+                    </tr>
                 }
+
             </tbody>
         </table>
     }