From cb3b32509cb562c3c3bfa14169c81931f3d7efde Mon Sep 17 00:00:00 2001
From: ValAn <valovaanna04@mail.ru>
Date: Fri, 12 Apr 2024 23:54:59 +0400
Subject: [PATCH] Implement new feature

---
 .../HospitalContracts.csproj                  |  6 +++-
 .../ViewModels/DoctorViewModel.cs             | 29 +++++++++++++++++
 .../ViewModels/PatientViewModel.cs            | 31 +++++++++++++++++++
 .../Models/IMedicineModel.cs                  |  2 +-
 .../Models/IPatientModel.cs                   |  2 +-
 .../Models/IProcedureModel.cs                 |  2 +-
 .../HospitalDataModels/Models/IRecipeModel.cs |  2 +-
 7 files changed, 69 insertions(+), 5 deletions(-)
 create mode 100644 Hospital/HospitalContracts/ViewModels/DoctorViewModel.cs
 create mode 100644 Hospital/HospitalContracts/ViewModels/PatientViewModel.cs

diff --git a/Hospital/HospitalContracts/HospitalContracts.csproj b/Hospital/HospitalContracts/HospitalContracts.csproj
index 132c02c..21cb129 100644
--- a/Hospital/HospitalContracts/HospitalContracts.csproj
+++ b/Hospital/HospitalContracts/HospitalContracts.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
@@ -6,4 +6,8 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\HospitalDataModels\HospitalDataModels.csproj" />
+  </ItemGroup>
+
 </Project>
diff --git a/Hospital/HospitalContracts/ViewModels/DoctorViewModel.cs b/Hospital/HospitalContracts/ViewModels/DoctorViewModel.cs
new file mode 100644
index 0000000..d895a23
--- /dev/null
+++ b/Hospital/HospitalContracts/ViewModels/DoctorViewModel.cs
@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace HospitalContracts.ViewModels
+{
+    public class DoctorViewModel
+    {
+        public int Id { get; set; }
+
+        [DisplayName("ФИО")]
+        string FIO { get; }
+
+        [DisplayName("Логин")]
+        string Login { get; }
+
+        [DisplayName("Пароль")]
+        string Password { get; }
+
+        [DisplayName("Электронная почта")]
+        string MailAddress { get; }
+
+        [DisplayName("Номер телефона")]
+        string PhoneNumber { get; }
+    }
+}
diff --git a/Hospital/HospitalContracts/ViewModels/PatientViewModel.cs b/Hospital/HospitalContracts/ViewModels/PatientViewModel.cs
new file mode 100644
index 0000000..4e8db23
--- /dev/null
+++ b/Hospital/HospitalContracts/ViewModels/PatientViewModel.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using HospitalDataModels.Models;
+
+namespace HospitalContracts.ViewModels
+{
+    public class PatientViewModel
+    {
+        public int Id { get; set; }
+
+        [DisplayName("ФИО")]
+        string FIO { get; }
+
+        [DisplayName("Дата рождения")]
+        DateOnly BirthDate { get; }
+
+        [DisplayName("Адрес")]
+        string Adress { get; }
+
+        public int DoctorId { get; set; }
+
+        public Dictionary<int, IProcedureModel> PatientProcedures { get; set; } = new();
+
+        public Dictionary<int, IRecipeModel> PatientRecipes { get; set; } = new();
+
+    }
+}
diff --git a/Hospital/HospitalDataModels/Models/IMedicineModel.cs b/Hospital/HospitalDataModels/Models/IMedicineModel.cs
index 7378e05..4bd9786 100644
--- a/Hospital/HospitalDataModels/Models/IMedicineModel.cs
+++ b/Hospital/HospitalDataModels/Models/IMedicineModel.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace HospitalDataModels.Models
 {
-    internal interface IMedicineModel : IId
+    public interface IMedicineModel : IId
     {
     }
 }
diff --git a/Hospital/HospitalDataModels/Models/IPatientModel.cs b/Hospital/HospitalDataModels/Models/IPatientModel.cs
index db6de9f..e9fecb2 100644
--- a/Hospital/HospitalDataModels/Models/IPatientModel.cs
+++ b/Hospital/HospitalDataModels/Models/IPatientModel.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace HospitalDataModels.Models
 {
-    internal interface IPatientModel : IId
+    public interface IPatientModel : IId
     {
         string FIO {  get; }
         DateOnly BirthDate { get; }
diff --git a/Hospital/HospitalDataModels/Models/IProcedureModel.cs b/Hospital/HospitalDataModels/Models/IProcedureModel.cs
index 1fe5dcd..9df8da9 100644
--- a/Hospital/HospitalDataModels/Models/IProcedureModel.cs
+++ b/Hospital/HospitalDataModels/Models/IProcedureModel.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace HospitalDataModels.Models
 {
-    internal interface IProcedureModel : IId
+    public interface IProcedureModel : IId
     {
     }
 }
diff --git a/Hospital/HospitalDataModels/Models/IRecipeModel.cs b/Hospital/HospitalDataModels/Models/IRecipeModel.cs
index 16ac068..fbffe3b 100644
--- a/Hospital/HospitalDataModels/Models/IRecipeModel.cs
+++ b/Hospital/HospitalDataModels/Models/IRecipeModel.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace HospitalDataModels.Models
 {
-    internal interface IRecipeModel : IId
+    public interface IRecipeModel : IId
     {
         string Description { get; }
         DateTime IssueDate { get; }