From 171ca6d819353194418a9d5e1f1088506d51239e 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: Mon, 27 May 2024 21:53:53 +0400
Subject: [PATCH] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=D0=B0=20=D0=B8=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=D0=B0=20=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4=20=D0=BD=D0=B0?=
 =?UTF-8?q?=D0=B7=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20=D1=81=D0=B8=D0=BC=D0=BF?=
 =?UTF-8?q?=D1=82=D0=BE=D0=BC=D0=B0=20=D0=B8=20=D0=BF=D1=80=D0=BE=D1=86?=
 =?UTF-8?q?=D0=B5=D0=B4=D1=83=D1=80=D1=8B=20=D0=B2=D0=BE=20=D0=B2=D1=8C?=
 =?UTF-8?q?=D1=8E=20=D0=BC=D0=BE=D0=B4=D0=B5=D0=BB=D1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ViewModels/MedicamentViewModel.cs         | 10 ++++
 .../ViewModels/RecipeViewModel.cs             |  2 +
 .../Models/Medicament.cs                      |  4 +-
 .../Views/Home/Medicaments.cshtml             | 53 +++++++++----------
 .../Views/Home/Procedures.cshtml              |  2 -
 5 files changed, 40 insertions(+), 31 deletions(-)

diff --git a/Polyclinic/PolyclinicContracts/ViewModels/MedicamentViewModel.cs b/Polyclinic/PolyclinicContracts/ViewModels/MedicamentViewModel.cs
index 516bfa1..b9b9fc6 100644
--- a/Polyclinic/PolyclinicContracts/ViewModels/MedicamentViewModel.cs
+++ b/Polyclinic/PolyclinicContracts/ViewModels/MedicamentViewModel.cs
@@ -8,9 +8,19 @@ namespace PolyclinicContracts.ViewModels
         public int Id { get; set; }
         public int ProcedureId { get; set; }
         public int? SymptomId { get; set; }
+
         [DisplayName("Название медикамента")]
         public string Name { get; set; } = string.Empty;
+
+
         [DisplayName("Комментарий")]
         public string Comment { get; set; } = string.Empty;
+
+
+        [DisplayName("Название симптома")]
+        public string SymptomName { get; set; } = string.Empty;
+
+        [DisplayName("Название процедуры")]
+        public string ProcedureName { get; set; } = string.Empty;
     }
 }
diff --git a/Polyclinic/PolyclinicContracts/ViewModels/RecipeViewModel.cs b/Polyclinic/PolyclinicContracts/ViewModels/RecipeViewModel.cs
index cd8a8b2..11d0878 100644
--- a/Polyclinic/PolyclinicContracts/ViewModels/RecipeViewModel.cs
+++ b/Polyclinic/PolyclinicContracts/ViewModels/RecipeViewModel.cs
@@ -12,6 +12,8 @@ namespace PolyclinicContracts.ViewModels
 
         [DisplayName("Комментарий")]
         public string Comment { get; set; } = string.Empty;
+
+        [DisplayName("Номер курса")]
         public int? CourseId { get; set; }
         public Dictionary<int, IProcedureModel> RecipeProcedures { get; } = new();
     }
diff --git a/Polyclinic/PolyclinicDatabaseImplement/Models/Medicament.cs b/Polyclinic/PolyclinicDatabaseImplement/Models/Medicament.cs
index a221a43..37609cf 100644
--- a/Polyclinic/PolyclinicDatabaseImplement/Models/Medicament.cs
+++ b/Polyclinic/PolyclinicDatabaseImplement/Models/Medicament.cs
@@ -48,7 +48,9 @@ namespace PolyclinicDatabaseImplement.Models
             Name = Name,
             Comment = Comment,
             ProcedureId = ProcedureId,
-            SymptomId = Symptom?.Id ?? null
+            SymptomId = Symptom?.Id ?? null,
+            SymptomName = Symptom?.Name ?? string.Empty,
+            ProcedureName = Procedure?.Name ?? string.Empty,
         };
     }
 }
diff --git a/Polyclinic/PolyclinicWebAppSuretor/Views/Home/Medicaments.cshtml b/Polyclinic/PolyclinicWebAppSuretor/Views/Home/Medicaments.cshtml
index 1217c28..bbb787d 100644
--- a/Polyclinic/PolyclinicWebAppSuretor/Views/Home/Medicaments.cshtml
+++ b/Polyclinic/PolyclinicWebAppSuretor/Views/Home/Medicaments.cshtml
@@ -45,35 +45,32 @@
                 </tr>
             </thead>
             <tbody>
-            <td>
-                1
-            </td>
-            <td>
-                Фенибут
-            </td>
-            <td>
-                Сопли до колен
-            </td>
-            <td>
-                3
-            </td>
-            <td>
-                При особом неврозе употребляйте каждый день и спина не будет болеть
-            </td>
-            <td>
-                <a asp-action="CreateMedicament">
-                    <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" />
+                @foreach (var item in Model)
+                {
+                <td>@item.Id</td>
+                <td>@item.Name</td>
+                <td>@item.SymptomId.</td>
+                <td>
+                    3
+                </td>
+                <td>
+                    При особом неврозе употребляйте каждый день и спина не будет болеть
+                </td>
+                <td>
+                    <a asp-action="CreateMedicament">
+                        <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>
-                </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>
+                </td>
+                }
             </tbody>
         </table>
     }
diff --git a/Polyclinic/PolyclinicWebAppSuretor/Views/Home/Procedures.cshtml b/Polyclinic/PolyclinicWebAppSuretor/Views/Home/Procedures.cshtml
index 7e0b10f..609bb50 100644
--- a/Polyclinic/PolyclinicWebAppSuretor/Views/Home/Procedures.cshtml
+++ b/Polyclinic/PolyclinicWebAppSuretor/Views/Home/Procedures.cshtml
@@ -32,8 +32,6 @@
                 </tr>
             </thead>
             <tbody>
-
-
                 @foreach (var item in Model)
                 {
                     <tr>