diff --git a/Polyclinic/PolyclinicWebAppImplementer/Controllers/SymptomesController.cs b/Polyclinic/PolyclinicWebAppImplementer/Controllers/SymptomesController.cs index 9b10fdd..6cf3a23 100644 --- a/Polyclinic/PolyclinicWebAppImplementer/Controllers/SymptomesController.cs +++ b/Polyclinic/PolyclinicWebAppImplementer/Controllers/SymptomesController.cs @@ -3,6 +3,7 @@ using PolyclinicContracts.BindingModels; using PolyclinicContracts.BusinessLogicsContracts; using PolyclinicContracts.SearchModels; using PolyclinicContracts.ViewModels; +using PolyclinicWebAppImplementer.Models; namespace PolyclinicWebAppImplementer.Controllers { @@ -24,19 +25,21 @@ namespace PolyclinicWebAppImplementer.Controllers } [HttpGet] [HttpPost] - public IActionResult Add(SymptomViewModel model) + public IActionResult Add(SymptomFormModel model) { if (HttpContext.Request.Method == "GET") { ViewData["Title"] = "Новый симптом"; - return View("SymptomForm"); + model = new(); + model.AvailableDiagnoses = _diagnoseLogic.ReadList(); + return View("SymptomForm", model); } else { SymptomBindingModel symptom = new SymptomBindingModel { - Name = model.Name, - Comment = model.Comment, + Name = model.SymptomViewModel.Name, + Comment = model.SymptomViewModel.Comment, }; _symptomLogic.Create(symptom); return RedirectToAction("Index"); diff --git a/Polyclinic/PolyclinicWebAppImplementer/Models/SymptomFormModel.cs b/Polyclinic/PolyclinicWebAppImplementer/Models/SymptomFormModel.cs new file mode 100644 index 0000000..58de5b0 --- /dev/null +++ b/Polyclinic/PolyclinicWebAppImplementer/Models/SymptomFormModel.cs @@ -0,0 +1,11 @@ +using PolyclinicContracts.ViewModels; + +namespace PolyclinicWebAppImplementer.Models +{ + public class SymptomFormModel + { + public SymptomViewModel? SymptomViewModel { get; set; } + public List SelectecDiagnoses { get; set; } = new(); + public List AvailableDiagnoses { get; set; } = new(); + } +} diff --git a/Polyclinic/PolyclinicWebAppImplementer/SiteMenuItems.cs b/Polyclinic/PolyclinicWebAppImplementer/SiteMenuItems.cs index 1426e7c..c022948 100644 --- a/Polyclinic/PolyclinicWebAppImplementer/SiteMenuItems.cs +++ b/Polyclinic/PolyclinicWebAppImplementer/SiteMenuItems.cs @@ -5,7 +5,7 @@ public static (string Controller, string Action, string Title) Index = ("Home", "", "Главная"); public static (string Controller, string Action, string Title) Courses = ("Home", "Courses", "Курсы"); public static (string Controller, string Action, string Title) Diagnoses = ("Diagnoses", "", "Болезни"); - public static (string Controller, string Action, string Title) Symptomes = ("Home", "Symptomes", "Симптомы"); + public static (string Controller, string Action, string Title) Symptomes = ("Symptomes", "", "Симптомы"); public static (string Controller, string Action, string Title) Symptom = ("Home", "Symptom", "Симптом"); public static (string Controller, string Action, string Title) Diagnose = ("Home", "Diagnose", "Болезнь"); public static (string Controller, string Action, string Title) Course = ("Home", "Course", "Курс"); diff --git a/Polyclinic/PolyclinicWebAppImplementer/Views/Symptomes/SymptomForm.cshtml b/Polyclinic/PolyclinicWebAppImplementer/Views/Symptomes/SymptomForm.cshtml index 14c5e23..2e6b4e8 100644 --- a/Polyclinic/PolyclinicWebAppImplementer/Views/Symptomes/SymptomForm.cshtml +++ b/Polyclinic/PolyclinicWebAppImplementer/Views/Symptomes/SymptomForm.cshtml @@ -1,26 +1,23 @@ -@using PolyclinicContracts.ViewModels -@model SymptomViewModel +@model SymptomFormModel +

@ViewData["Title"]

Название:
-
+
Коментарий:
-
+
Болезни
- @Html.ActionLink("Отмена", "Courses", "Home", null, new { @class = "btn btn-danger" }) + @Html.ActionLink("Отмена", "", "Symptomes", null, new { @class = "btn btn-danger" })
\ No newline at end of file diff --git a/Polyclinic/PolyclinicWebAppImplementer/Views/Symptomes/SymptomesList.cshtml b/Polyclinic/PolyclinicWebAppImplementer/Views/Symptomes/SymptomesList.cshtml index 0c4a41c..a6614cf 100644 --- a/Polyclinic/PolyclinicWebAppImplementer/Views/Symptomes/SymptomesList.cshtml +++ b/Polyclinic/PolyclinicWebAppImplementer/Views/Symptomes/SymptomesList.cshtml @@ -1,4 +1,6 @@ -@{ +@using PolyclinicContracts.ViewModels +@model List +@{ ViewBag.SelectedSiteMenuItem = SiteMenuItems.Symptomes; }
@@ -17,28 +19,27 @@ - @{ - int count = 10; - for (int i = 0; i < count; i++) - { - - @i - вранье - пациент постоянно врёт о своих приключениях - - + @foreach (var item in Model) + { + + @item.Id + @item.Name + @item.Comment + +
+ +
+ + + + + + + }