From 414da3ec3af21896685bf04091853914b0d73350 Mon Sep 17 00:00:00 2001 From: antoc0der <1@DESKTOP-K1L8ND3> Date: Mon, 27 May 2024 00:34:30 +0400 Subject: [PATCH 1/2] =?UTF-8?q?=D1=8B=D0=B3=D1=8B=D0=B3=D1=8B=D0=B3=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/Shared/_Layout.cshtml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/VeterinaryView/VeterinaryShowDoctorApp/Views/Shared/_Layout.cshtml b/VeterinaryView/VeterinaryShowDoctorApp/Views/Shared/_Layout.cshtml index 6372fdd..4918e2a 100644 --- a/VeterinaryView/VeterinaryShowDoctorApp/Views/Shared/_Layout.cshtml +++ b/VeterinaryView/VeterinaryShowDoctorApp/Views/Shared/_Layout.cshtml @@ -22,6 +22,12 @@
  • Медикаменты
    • +
  • + Лекарства +
    • +
  • + Услуги +
  • Личные данные
    • @@ -31,12 +37,6 @@
  • Регистрация
    • -
  • - Лекарства -
    • -
  • - Услуги -
  • Выгрузка списка
    • From 3f46e712a0bcd858e9b65ecff004cb4f5da837fa Mon Sep 17 00:00:00 2001 From: antoc0der <1@DESKTOP-K1L8ND3> Date: Mon, 27 May 2024 01:09:37 +0400 Subject: [PATCH 2/2] =?UTF-8?q?=D0=BF=D1=80=D0=B8=D0=B2=D1=8F=D0=B7=D0=BA?= =?UTF-8?q?=D0=B0=20=D0=B5=D0=BF=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../20240525190933_InitialCreate.cs | 6 ++-- .../Controllers/HomeController.cs | 5 ++- .../Views/Home/CreateService.cshtml | 6 ---- .../Views/Home/VisitServiceBundle.cshtml | 32 +++++++++++++++++++ 4 files changed, 37 insertions(+), 12 deletions(-) create mode 100644 VeterinaryView/VeterinaryShowOwnerApp/Views/Home/VisitServiceBundle.cshtml diff --git a/VeterinaryView/VeterinaryDatabaseImplement/Migrations/20240525190933_InitialCreate.cs b/VeterinaryView/VeterinaryDatabaseImplement/Migrations/20240525190933_InitialCreate.cs index 0112e16..7a5da0b 100644 --- a/VeterinaryView/VeterinaryDatabaseImplement/Migrations/20240525190933_InitialCreate.cs +++ b/VeterinaryView/VeterinaryDatabaseImplement/Migrations/20240525190933_InitialCreate.cs @@ -143,9 +143,9 @@ namespace VeterinaryDatabaseImplement.Migrations Id = table.Column(type: "int", nullable: false) .Annotation("SqlServer:Identity", "1, 1"), OwnerId = table.Column(type: "int", nullable: false), - DrugId = table.Column(type: "int", nullable: false), + DrugId = table.Column(type: "int", nullable: true), Count = table.Column(type: "int", nullable: false), - Sum = table.Column(type: "float", nullable: false), + Sum = table.Column(type: "float", nullable: true), DateCreate = table.Column(type: "datetime2", nullable: false) }, constraints: table => @@ -199,7 +199,7 @@ namespace VeterinaryDatabaseImplement.Migrations .Annotation("SqlServer:Identity", "1, 1"), ServiceName = table.Column(type: "nvarchar(max)", nullable: false), DoctorId = table.Column(type: "int", nullable: false), - VisitId = table.Column(type: "int", nullable: false) + VisitId = table.Column(type: "int", nullable: true) }, constraints: table => { diff --git a/VeterinaryView/VeterinaryShowDoctorApp/Controllers/HomeController.cs b/VeterinaryView/VeterinaryShowDoctorApp/Controllers/HomeController.cs index 261b732..22b09e9 100644 --- a/VeterinaryView/VeterinaryShowDoctorApp/Controllers/HomeController.cs +++ b/VeterinaryView/VeterinaryShowDoctorApp/Controllers/HomeController.cs @@ -345,12 +345,12 @@ namespace VeterinaryShowDoctorApp.Controllers return Redirect("~/Home/Enter"); } ViewBag.Medications = APIDoctor.GetRequest>($"api/medication/getmedications?doctorid={APIDoctor.Doctor.Id}"); - ViewBag.Visits = APIDoctor.GetRequest>($"api/visit/getallvisits"); + //ViewBag.Visits = APIDoctor.GetRequest>($"api/visit/getallvisits"); return View(); } [HttpPost] - public void CreateService(string name, List medications, int visit) + public void CreateService(string name, List medications) { if (APIDoctor.Doctor == null) { @@ -370,7 +370,6 @@ namespace VeterinaryShowDoctorApp.Controllers { ServiceName = name, ServiceMedications = a, - VisitId = visit, DoctorId = APIDoctor.Doctor.Id }); Response.Redirect("Services"); diff --git a/VeterinaryView/VeterinaryShowDoctorApp/Views/Home/CreateService.cshtml b/VeterinaryView/VeterinaryShowDoctorApp/Views/Home/CreateService.cshtml index cff4c56..d768d96 100644 --- a/VeterinaryView/VeterinaryShowDoctorApp/Views/Home/CreateService.cshtml +++ b/VeterinaryView/VeterinaryShowDoctorApp/Views/Home/CreateService.cshtml @@ -12,12 +12,6 @@ -
    -
    Визиты:
    -
    - -
    -
    Медикаменты:
    diff --git a/VeterinaryView/VeterinaryShowOwnerApp/Views/Home/VisitServiceBundle.cshtml b/VeterinaryView/VeterinaryShowOwnerApp/Views/Home/VisitServiceBundle.cshtml new file mode 100644 index 0000000..94706e7 --- /dev/null +++ b/VeterinaryView/VeterinaryShowOwnerApp/Views/Home/VisitServiceBundle.cshtml @@ -0,0 +1,32 @@ +@using VeterinaryContracts.ViewModels; + +@{ + ViewData["Title"] = "VisitServiceBundle"; +} + +
    +

    Редактирование услуги

    +
    +
    +
    +
    Посещение:
    +
    + +
    +
    +
    +
    Услуги:
    +
    + +
    +
    +
    +
    +
    +
    +