From 3bfc9cf130f26a79bc7336d758ce6703cad2093f 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: Wed, 29 May 2024 02:59:50 +0400 Subject: [PATCH] =?UTF-8?q?=D1=83=D1=80=D0=B0=20=D1=8F=20=D0=BF=D0=BE?= =?UTF-8?q?=D1=87=D0=B8=D0=BD=D0=B8=D0=BB=D0=B0=20=D1=8D=D1=82=D0=B8..=20?= =?UTF-8?q?=D1=80=D0=B5=D1=86=D0=B5=D0=BF=D1=82=D1=8B=20=D0=BE=D0=BA=D0=BE?= =?UTF-8?q?=D0=BD=D1=87=D0=B0=D1=82=D0=B5=D0=BB=D1=8C=D0=BD=D0=BE!=20(?= =?UTF-8?q?=D0=BD=D0=B0=D0=B4=D0=B5=D1=8E=D1=81=D1=8C=20:=5F)=20)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PolyclinicDatabaseImplement/Models/Recipe.cs | 4 ++-- .../Controllers/HomeController.cs | 12 +++++++++++- .../Views/Home/CreateRecipe.cshtml | 2 +- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/Polyclinic/PolyclinicDatabaseImplement/Models/Recipe.cs b/Polyclinic/PolyclinicDatabaseImplement/Models/Recipe.cs index 1deb276..a81b80b 100644 --- a/Polyclinic/PolyclinicDatabaseImplement/Models/Recipe.cs +++ b/Polyclinic/PolyclinicDatabaseImplement/Models/Recipe.cs @@ -16,7 +16,7 @@ namespace PolyclinicDatabaseImplement.Models public string? Comment { get; set; } = string.Empty; public int? CourseId { get; set; } - public virtual Course Course { get; set; } = new(); + public virtual Course? Course { get; set; } private Dictionary? _recipeProcedures = null; @@ -63,7 +63,7 @@ namespace PolyclinicDatabaseImplement.Models Id = Id, ProceduresCount = ProceduresCount, Comment = Comment, - CourseId = Course?.Id ?? null, + CourseId = CourseId ?? null, }; public void UpdateProcedures(PolyclinicDatabase database, RecipeBindingModel bindingModel) diff --git a/Polyclinic/PolyclinicWebAppSuretor/Controllers/HomeController.cs b/Polyclinic/PolyclinicWebAppSuretor/Controllers/HomeController.cs index c700dcb..a2185f1 100644 --- a/Polyclinic/PolyclinicWebAppSuretor/Controllers/HomeController.cs +++ b/Polyclinic/PolyclinicWebAppSuretor/Controllers/HomeController.cs @@ -48,6 +48,11 @@ namespace PolyclinicWebAppSuretor.Controllers return View(); } + /// + /// RECIPES + /// + /// + public IActionResult Recipes() { List recipes = _recipeLogic.ReadList(null); @@ -62,7 +67,7 @@ namespace PolyclinicWebAppSuretor.Controllers [HttpPost] public IActionResult CreateRecipe(RecipeModel model, int[] selectedProcedures) { - ViewBag.Courses = _courseLogic.ReadList(null); + ViewBag.Courses = _courseLogic.ReadList(); if (HttpContext.Request.Method == "GET") { ViewData["Title"] = " "; @@ -138,6 +143,11 @@ namespace PolyclinicWebAppSuretor.Controllers return RedirectToAction("Recipes"); } + /// + /// MEDICAMENTS + /// + /// + public IActionResult Medicaments() { List medicaments = _medicamentLogic.ReadList(null); diff --git a/Polyclinic/PolyclinicWebAppSuretor/Views/Home/CreateRecipe.cshtml b/Polyclinic/PolyclinicWebAppSuretor/Views/Home/CreateRecipe.cshtml index a514401..8155796 100644 --- a/Polyclinic/PolyclinicWebAppSuretor/Views/Home/CreateRecipe.cshtml +++ b/Polyclinic/PolyclinicWebAppSuretor/Views/Home/CreateRecipe.cshtml @@ -29,7 +29,7 @@

Курс (номер):

- @foreach (var course in ViewBag.Courses) {