From 8bd20e8bbde994aeb8f03a018c2c33d184f67f53 Mon Sep 17 00:00:00 2001
From: ekallin <elina_kallin>
Date: Wed, 17 Apr 2024 17:43:28 +0400
Subject: [PATCH 01/11] =?UTF-8?q?=D0=9B=D0=B5=D0=BD=D0=B0.=20=D0=94=D0=BE?=
 =?UTF-8?q?=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=D0=B0=20=D0=B8=D0=BD=D1=82=D0=B5?=
 =?UTF-8?q?=D1=80=D1=84=D0=B5=D0=B9=D1=81=D1=8B=20=D0=BC=D0=BE=D0=B4=D0=B5?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=B9=20=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D1=85=20?=
 =?UTF-8?q?=D0=B4=D0=BB=D1=8F=205=20=D1=8D=D1=82=D0=B0=D0=BF=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PolyclinicDataModels/Models/IMedicament.cs   | 14 ++++++++++++++
 .../PolyclinicDataModels/Models/IProcedure.cs    | 14 ++++++++++++++
 .../PolyclinicDataModels/Models/IReciept.cs      | 15 +++++++++++++++
 .../PolyclinicDataModels/Models/ISuretor.cs      | 16 ++++++++++++++++
 .../PolyclinicDataModels.csproj                  |  4 ----
 5 files changed, 59 insertions(+), 4 deletions(-)
 create mode 100644 Polyclinic/PolyclinicDataModels/Models/IMedicament.cs
 create mode 100644 Polyclinic/PolyclinicDataModels/Models/IProcedure.cs
 create mode 100644 Polyclinic/PolyclinicDataModels/Models/IReciept.cs
 create mode 100644 Polyclinic/PolyclinicDataModels/Models/ISuretor.cs

diff --git a/Polyclinic/PolyclinicDataModels/Models/IMedicament.cs b/Polyclinic/PolyclinicDataModels/Models/IMedicament.cs
new file mode 100644
index 0000000..b981e57
--- /dev/null
+++ b/Polyclinic/PolyclinicDataModels/Models/IMedicament.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PolyclinicDataModels.Models
+{
+    public interface IMedicament : IId
+    {
+        string Name { get; }
+        string Comment { get; }
+    }
+}
\ No newline at end of file
diff --git a/Polyclinic/PolyclinicDataModels/Models/IProcedure.cs b/Polyclinic/PolyclinicDataModels/Models/IProcedure.cs
new file mode 100644
index 0000000..c014be2
--- /dev/null
+++ b/Polyclinic/PolyclinicDataModels/Models/IProcedure.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PolyclinicDataModels.Models
+{
+    public interface IProcedure : IId
+    {
+        string Name { get; }
+        string Comment { get; }
+    }
+}
\ No newline at end of file
diff --git a/Polyclinic/PolyclinicDataModels/Models/IReciept.cs b/Polyclinic/PolyclinicDataModels/Models/IReciept.cs
new file mode 100644
index 0000000..ece1967
--- /dev/null
+++ b/Polyclinic/PolyclinicDataModels/Models/IReciept.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PolyclinicDataModels.Models
+{
+    public interface IReciept : IId
+    {
+        int CountProcedures { get; set; }
+        string Comment { get; set; }
+
+    }
+}
\ No newline at end of file
diff --git a/Polyclinic/PolyclinicDataModels/Models/ISuretor.cs b/Polyclinic/PolyclinicDataModels/Models/ISuretor.cs
new file mode 100644
index 0000000..3695076
--- /dev/null
+++ b/Polyclinic/PolyclinicDataModels/Models/ISuretor.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PolyclinicDataModels.Models
+{
+    public interface ISuretor : IId
+    {
+        string FIO { get; }
+        DateTime BirthDay { get; }
+        string Password { get; }
+        string RepeatPassword { get; }
+    }
+}
diff --git a/Polyclinic/PolyclinicDataModels/PolyclinicDataModels.csproj b/Polyclinic/PolyclinicDataModels/PolyclinicDataModels.csproj
index 962b8f6..27ac386 100644
--- a/Polyclinic/PolyclinicDataModels/PolyclinicDataModels.csproj
+++ b/Polyclinic/PolyclinicDataModels/PolyclinicDataModels.csproj
@@ -6,8 +6,4 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Folder Include="Models\" />
-  </ItemGroup>
-
 </Project>
-- 
2.25.1


From 6e7d7a8dfd43f098cd40d731a0a1f004edf39662 Mon Sep 17 00:00:00 2001
From: ekallin <elina_kallin>
Date: Wed, 17 Apr 2024 18:23:27 +0400
Subject: [PATCH 02/11] =?UTF-8?q?=D0=9B=D0=B5=D0=BD=D0=B0.=20=D0=94=D0=BE?=
 =?UTF-8?q?=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=D0=B0=20BindingModels=20=D0=B2?=
 =?UTF-8?q?=20=D1=81=D0=BB=D0=BE=D0=B5=20=D0=BA=D0=BE=D0=BD=D1=82=D1=80?=
 =?UTF-8?q?=D0=B0=D0=BA=D1=82=D0=BE=D0=B2=20=D0=B4=D0=BB=D1=8F=205=20?=
 =?UTF-8?q?=D1=8D=D1=82=D0=B0=D0=BF=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BindingModels/MedicamentBindingModel.cs    | 16 ++++++++++++++++
 .../BindingModels/ProcedureBindingModel.cs     | 16 ++++++++++++++++
 .../BindingModels/RecieptBindingModel.cs       | 16 ++++++++++++++++
 .../BindingModels/SuretorBindingModel.cs       | 18 ++++++++++++++++++
 .../PolyclinicContracts.csproj                 |  5 ++++-
 5 files changed, 70 insertions(+), 1 deletion(-)
 create mode 100644 Polyclinic/PolyclinicContracts/BindingModels/MedicamentBindingModel.cs
 create mode 100644 Polyclinic/PolyclinicContracts/BindingModels/ProcedureBindingModel.cs
 create mode 100644 Polyclinic/PolyclinicContracts/BindingModels/RecieptBindingModel.cs
 create mode 100644 Polyclinic/PolyclinicContracts/BindingModels/SuretorBindingModel.cs

diff --git a/Polyclinic/PolyclinicContracts/BindingModels/MedicamentBindingModel.cs b/Polyclinic/PolyclinicContracts/BindingModels/MedicamentBindingModel.cs
new file mode 100644
index 0000000..79c9e22
--- /dev/null
+++ b/Polyclinic/PolyclinicContracts/BindingModels/MedicamentBindingModel.cs
@@ -0,0 +1,16 @@
+using PolyclinicDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PolyclinicContracts.BindingModels
+{
+    public class MedicamentBindingModel : IMedicament
+    {
+        public int Id { get; set; }
+        public string Name { get; set; } = string.Empty;
+        public string Comment { get; set; } = string.Empty;
+    }
+}
\ No newline at end of file
diff --git a/Polyclinic/PolyclinicContracts/BindingModels/ProcedureBindingModel.cs b/Polyclinic/PolyclinicContracts/BindingModels/ProcedureBindingModel.cs
new file mode 100644
index 0000000..7fb1f61
--- /dev/null
+++ b/Polyclinic/PolyclinicContracts/BindingModels/ProcedureBindingModel.cs
@@ -0,0 +1,16 @@
+using PolyclinicDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PolyclinicContracts.BindingModels
+{
+    public class ProcedureBindingModel : IProcedure 
+    {
+        public int Id { get; set; }
+        public string Name { get; set; } = string.Empty;
+        public string Comment {  get; set; } = string.Empty;
+    }
+}
\ No newline at end of file
diff --git a/Polyclinic/PolyclinicContracts/BindingModels/RecieptBindingModel.cs b/Polyclinic/PolyclinicContracts/BindingModels/RecieptBindingModel.cs
new file mode 100644
index 0000000..61c4221
--- /dev/null
+++ b/Polyclinic/PolyclinicContracts/BindingModels/RecieptBindingModel.cs
@@ -0,0 +1,16 @@
+using PolyclinicDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PolyclinicContracts.BindingModels
+{
+    public class RecieptBindingModel : IReciept
+    {
+        public int Id { get; set; }
+        public int CountProcedures { get; set; }
+        public string Comment { get; set; } = string.Empty;
+    }
+}
\ No newline at end of file
diff --git a/Polyclinic/PolyclinicContracts/BindingModels/SuretorBindingModel.cs b/Polyclinic/PolyclinicContracts/BindingModels/SuretorBindingModel.cs
new file mode 100644
index 0000000..bf021ea
--- /dev/null
+++ b/Polyclinic/PolyclinicContracts/BindingModels/SuretorBindingModel.cs
@@ -0,0 +1,18 @@
+using PolyclinicDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PolyclinicContracts.BindingModels
+{
+    public class SuretorBindingModel : ISuretor
+    {
+        public int Id { get; set; }
+        public string FIO { get; set; } = string.Empty;
+        public DateTime BirthDay { get; set; }
+        public string Password { get; set; } = "123";
+        public string RepeatPassword { get; set; } = "123";
+    }
+}
\ No newline at end of file
diff --git a/Polyclinic/PolyclinicContracts/PolyclinicContracts.csproj b/Polyclinic/PolyclinicContracts/PolyclinicContracts.csproj
index d7f6b16..8eca715 100644
--- a/Polyclinic/PolyclinicContracts/PolyclinicContracts.csproj
+++ b/Polyclinic/PolyclinicContracts/PolyclinicContracts.csproj
@@ -7,11 +7,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Folder Include="BindingModels\" />
     <Folder Include="StoragesContracts\" />
     <Folder Include="SearchModels\" />
     <Folder Include="ViewModels\" />
     <Folder Include="BusinessLogicsContracts\" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\PolyclinicDataModels\PolyclinicDataModels.csproj" />
+  </ItemGroup>
+
 </Project>
-- 
2.25.1


From 660fd6cf297be7865e6c020363905f4b3dd2361f Mon Sep 17 00:00:00 2001
From: ekallin <elina_kallin>
Date: Wed, 17 Apr 2024 18:43:37 +0400
Subject: [PATCH 03/11] =?UTF-8?q?=D0=9B=D0=B5=D0=BD=D0=B0.=20=D0=B4=D0=BE?=
 =?UTF-8?q?=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=D0=B0=20SearchModels=20=D0=B2=20?=
 =?UTF-8?q?=D1=81=D0=BB=D0=BE=D0=B9=20=D0=BA=D0=BE=D0=BD=D1=82=D1=80=D0=B0?=
 =?UTF-8?q?=D0=BA=D1=82=D0=BE=D0=B2=20=D0=B4=D0=BB=D1=8F=205=20=D1=8D?=
 =?UTF-8?q?=D1=82=D0=B0=D0=BF=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PolyclinicContracts.csproj                    |  1 -
 .../SearchModels/MedicamentSearchModel.cs         | 14 ++++++++++++++
 .../SearchModels/ProcedureSearchModel.cs          | 14 ++++++++++++++
 .../SearchModels/RecieptSearchModel.cs            | 14 ++++++++++++++
 .../SearchModels/SuretorSearchModel.cs            | 15 +++++++++++++++
 5 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 Polyclinic/PolyclinicContracts/SearchModels/MedicamentSearchModel.cs
 create mode 100644 Polyclinic/PolyclinicContracts/SearchModels/ProcedureSearchModel.cs
 create mode 100644 Polyclinic/PolyclinicContracts/SearchModels/RecieptSearchModel.cs
 create mode 100644 Polyclinic/PolyclinicContracts/SearchModels/SuretorSearchModel.cs

diff --git a/Polyclinic/PolyclinicContracts/PolyclinicContracts.csproj b/Polyclinic/PolyclinicContracts/PolyclinicContracts.csproj
index 8eca715..acf6006 100644
--- a/Polyclinic/PolyclinicContracts/PolyclinicContracts.csproj
+++ b/Polyclinic/PolyclinicContracts/PolyclinicContracts.csproj
@@ -8,7 +8,6 @@
 
   <ItemGroup>
     <Folder Include="StoragesContracts\" />
-    <Folder Include="SearchModels\" />
     <Folder Include="ViewModels\" />
     <Folder Include="BusinessLogicsContracts\" />
   </ItemGroup>
diff --git a/Polyclinic/PolyclinicContracts/SearchModels/MedicamentSearchModel.cs b/Polyclinic/PolyclinicContracts/SearchModels/MedicamentSearchModel.cs
new file mode 100644
index 0000000..0f159c0
--- /dev/null
+++ b/Polyclinic/PolyclinicContracts/SearchModels/MedicamentSearchModel.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PolyclinicContracts.SearchModels
+{
+    public class MedicamentSearchModel
+    {
+        public int? Id { get; set; }
+        public string? Name { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/Polyclinic/PolyclinicContracts/SearchModels/ProcedureSearchModel.cs b/Polyclinic/PolyclinicContracts/SearchModels/ProcedureSearchModel.cs
new file mode 100644
index 0000000..066d5d6
--- /dev/null
+++ b/Polyclinic/PolyclinicContracts/SearchModels/ProcedureSearchModel.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PolyclinicContracts.SearchModels
+{
+    public class ProcedureSearchModel
+    {
+        public int? Id { get; set; }
+        public string? Name { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/Polyclinic/PolyclinicContracts/SearchModels/RecieptSearchModel.cs b/Polyclinic/PolyclinicContracts/SearchModels/RecieptSearchModel.cs
new file mode 100644
index 0000000..6a92138
--- /dev/null
+++ b/Polyclinic/PolyclinicContracts/SearchModels/RecieptSearchModel.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PolyclinicContracts.SearchModels
+{
+    public class RecieptSearchModel
+    {
+        public int? Id { get; set; } 
+        public int? CountProcedures { get; set; } 
+    }
+}
\ No newline at end of file
diff --git a/Polyclinic/PolyclinicContracts/SearchModels/SuretorSearchModel.cs b/Polyclinic/PolyclinicContracts/SearchModels/SuretorSearchModel.cs
new file mode 100644
index 0000000..7180507
--- /dev/null
+++ b/Polyclinic/PolyclinicContracts/SearchModels/SuretorSearchModel.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PolyclinicContracts.SearchModels
+{
+    public class SuretorSearchModel
+    {
+        public int? Id { get; set; }
+        public string? FIO { get; set; }
+        public DateTime? BirthDay { get; set; }
+    }
+}
\ No newline at end of file
-- 
2.25.1


From 59f17e0eefb3e66b1364ad5d623fece9d93524bb Mon Sep 17 00:00:00 2001
From: ekallin <elina_kallin>
Date: Wed, 17 Apr 2024 21:55:50 +0400
Subject: [PATCH 04/11] =?UTF-8?q?=D0=9B=D0=B5=D0=BD=D0=B0.=20=D0=B8=D0=B7?=
 =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D0=B8=D0=BB=D0=B0=20=D0=BD=D0=B0=D0=B7=D0=B2?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81=D0=B0?=
 =?UTF-8?q?=D0=BC=20=D0=BC=D0=BE=D0=B4=D0=B5=D0=BB=D1=8F=D0=BC,=20=D0=B4?=
 =?UTF-8?q?=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=D0=B0=20=D1=81=D0=BB=D0=BE?=
 =?UTF-8?q?=D0=B2=D0=B0=D1=80=D0=B8=20=D0=B4=D0=BB=D1=8F=20=D1=81=D0=B2?=
 =?UTF-8?q?=D1=8F=D0=B7=D0=B5=D0=B9=20=D0=BC=D0=BD=D0=BE=D0=B3=D0=B8=D0=B5?=
 =?UTF-8?q?=20=D0=BA=D0=BE=20=D0=BC=D0=BD=D0=BE=D0=B3=D0=B8=D0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Models/{IProcedure.cs => IMedicamentModel.cs}             | 4 +++-
 .../Models/{IMedicament.cs => IProcedureModel.cs}             | 4 +++-
 .../Models/{IReciept.cs => IRecieptModel.cs}                  | 4 ++--
 .../Models/{ISuretor.cs => ISuretorModel.cs}                  | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)
 rename Polyclinic/PolyclinicDataModels/Models/{IProcedure.cs => IMedicamentModel.cs} (53%)
 rename Polyclinic/PolyclinicDataModels/Models/{IMedicament.cs => IProcedureModel.cs} (66%)
 rename Polyclinic/PolyclinicDataModels/Models/{IReciept.cs => IRecieptModel.cs} (69%)
 rename Polyclinic/PolyclinicDataModels/Models/{ISuretor.cs => ISuretorModel.cs} (88%)

diff --git a/Polyclinic/PolyclinicDataModels/Models/IProcedure.cs b/Polyclinic/PolyclinicDataModels/Models/IMedicamentModel.cs
similarity index 53%
rename from Polyclinic/PolyclinicDataModels/Models/IProcedure.cs
rename to Polyclinic/PolyclinicDataModels/Models/IMedicamentModel.cs
index c014be2..620c826 100644
--- a/Polyclinic/PolyclinicDataModels/Models/IProcedure.cs
+++ b/Polyclinic/PolyclinicDataModels/Models/IMedicamentModel.cs
@@ -6,9 +6,11 @@ using System.Threading.Tasks;
 
 namespace PolyclinicDataModels.Models
 {
-    public interface IProcedure : IId
+    public interface IMedicamentModel : IId
     {
         string Name { get; }
         string Comment { get; }
+        Dictionary<int, (ISymptomModel, int)> MedicamentSymptom { get; }    
+        Dictionary<int, (IProcedureModel, int)> MedicamentProcedure { get; }    
     }
 }
\ No newline at end of file
diff --git a/Polyclinic/PolyclinicDataModels/Models/IMedicament.cs b/Polyclinic/PolyclinicDataModels/Models/IProcedureModel.cs
similarity index 66%
rename from Polyclinic/PolyclinicDataModels/Models/IMedicament.cs
rename to Polyclinic/PolyclinicDataModels/Models/IProcedureModel.cs
index b981e57..6329da5 100644
--- a/Polyclinic/PolyclinicDataModels/Models/IMedicament.cs
+++ b/Polyclinic/PolyclinicDataModels/Models/IProcedureModel.cs
@@ -6,9 +6,11 @@ using System.Threading.Tasks;
 
 namespace PolyclinicDataModels.Models
 {
-    public interface IMedicament : IId
+    public interface IProcedureModel : IId
     {
         string Name { get; }
         string Comment { get; }
+        Dictionary<int, (IRecieptModel, int)> ProcedureReciept { get; }
+
     }
 }
\ No newline at end of file
diff --git a/Polyclinic/PolyclinicDataModels/Models/IReciept.cs b/Polyclinic/PolyclinicDataModels/Models/IRecieptModel.cs
similarity index 69%
rename from Polyclinic/PolyclinicDataModels/Models/IReciept.cs
rename to Polyclinic/PolyclinicDataModels/Models/IRecieptModel.cs
index ece1967..51ab730 100644
--- a/Polyclinic/PolyclinicDataModels/Models/IReciept.cs
+++ b/Polyclinic/PolyclinicDataModels/Models/IRecieptModel.cs
@@ -6,10 +6,10 @@ using System.Threading.Tasks;
 
 namespace PolyclinicDataModels.Models
 {
-    public interface IReciept : IId
+    public interface IRecieptModel : IId
     {
         int CountProcedures { get; set; }
         string Comment { get; set; }
-
+        Dictionary<int, (ICourseModel, int)> RecieptCourse { get; }
     }
 }
\ No newline at end of file
diff --git a/Polyclinic/PolyclinicDataModels/Models/ISuretor.cs b/Polyclinic/PolyclinicDataModels/Models/ISuretorModel.cs
similarity index 88%
rename from Polyclinic/PolyclinicDataModels/Models/ISuretor.cs
rename to Polyclinic/PolyclinicDataModels/Models/ISuretorModel.cs
index 3695076..66b7fc9 100644
--- a/Polyclinic/PolyclinicDataModels/Models/ISuretor.cs
+++ b/Polyclinic/PolyclinicDataModels/Models/ISuretorModel.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace PolyclinicDataModels.Models
 {
-    public interface ISuretor : IId
+    public interface ISuretorModel : IId
     {
         string FIO { get; }
         DateTime BirthDay { get; }
-- 
2.25.1


From f1834eb8c822f4aa52c1739ebbce9d884255d1f4 Mon Sep 17 00:00:00 2001
From: ekallin <elina_kallin>
Date: Wed, 17 Apr 2024 21:56:41 +0400
Subject: [PATCH 05/11] =?UTF-8?q?=D0=9B=D0=B5=D0=BD=D0=B0.=20=D0=B4=D0=BE?=
 =?UTF-8?q?=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=D0=B0=20=D1=81=D0=BB=D0=BE=D0=B2?=
 =?UTF-8?q?=D0=B0=D1=80=D0=B8=20=D0=B4=D0=BB=D1=8F=20=D1=81=D0=B2=D1=8F?=
 =?UTF-8?q?=D0=B7=D0=B5=D0=B9=20=D0=BC=D0=BD=D0=BE=D0=B3=D0=B8=D0=B5=20?=
 =?UTF-8?q?=D0=BA=D0=BE=20=D0=BC=D0=BD=D0=BE=D0=B3=D0=B8=D0=BC=20=D0=B2=20?=
 =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=B5=D0=BA=D1=82=D0=B5=20=D0=BA=D0=BE=D0=BD?=
 =?UTF-8?q?=D1=82=D1=80=D0=B0=D0=BA=D1=82=D0=BE=D0=B2=20=D0=B2=20BindingMo?=
 =?UTF-8?q?del?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BindingModels/MedicamentBindingModel.cs                   | 4 +++-
 .../BindingModels/ProcedureBindingModel.cs                    | 4 +++-
 .../PolyclinicContracts/BindingModels/RecieptBindingModel.cs  | 4 +++-
 .../PolyclinicContracts/BindingModels/SuretorBindingModel.cs  | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/Polyclinic/PolyclinicContracts/BindingModels/MedicamentBindingModel.cs b/Polyclinic/PolyclinicContracts/BindingModels/MedicamentBindingModel.cs
index 79c9e22..cd56332 100644
--- a/Polyclinic/PolyclinicContracts/BindingModels/MedicamentBindingModel.cs
+++ b/Polyclinic/PolyclinicContracts/BindingModels/MedicamentBindingModel.cs
@@ -7,10 +7,12 @@ using System.Threading.Tasks;
 
 namespace PolyclinicContracts.BindingModels
 {
-    public class MedicamentBindingModel : IMedicament
+    public class MedicamentBindingModel : IMedicamentModel
     {
         public int Id { get; set; }
         public string Name { get; set; } = string.Empty;
         public string Comment { get; set; } = string.Empty;
+        public Dictionary<int, (ISymptomModel, int)> MedicamentSymptom { get; set; } = new();
+        public Dictionary<int, (IProcedureModel, int)> MedicamentProcedure { get; set; } = new();
     }
 }
\ No newline at end of file
diff --git a/Polyclinic/PolyclinicContracts/BindingModels/ProcedureBindingModel.cs b/Polyclinic/PolyclinicContracts/BindingModels/ProcedureBindingModel.cs
index 7fb1f61..22b3b34 100644
--- a/Polyclinic/PolyclinicContracts/BindingModels/ProcedureBindingModel.cs
+++ b/Polyclinic/PolyclinicContracts/BindingModels/ProcedureBindingModel.cs
@@ -7,10 +7,12 @@ using System.Threading.Tasks;
 
 namespace PolyclinicContracts.BindingModels
 {
-    public class ProcedureBindingModel : IProcedure 
+    public class ProcedureBindingModel : IProcedureModel 
     {
         public int Id { get; set; }
         public string Name { get; set; } = string.Empty;
         public string Comment {  get; set; } = string.Empty;
+        public Dictionary<int, (IRecieptModel, int)> ProcedureReciept { get; set; } = new();
+
     }
 }
\ No newline at end of file
diff --git a/Polyclinic/PolyclinicContracts/BindingModels/RecieptBindingModel.cs b/Polyclinic/PolyclinicContracts/BindingModels/RecieptBindingModel.cs
index 61c4221..972df28 100644
--- a/Polyclinic/PolyclinicContracts/BindingModels/RecieptBindingModel.cs
+++ b/Polyclinic/PolyclinicContracts/BindingModels/RecieptBindingModel.cs
@@ -7,10 +7,12 @@ using System.Threading.Tasks;
 
 namespace PolyclinicContracts.BindingModels
 {
-    public class RecieptBindingModel : IReciept
+    public class RecieptBindingModel : IRecieptModel
     {
         public int Id { get; set; }
         public int CountProcedures { get; set; }
         public string Comment { get; set; } = string.Empty;
+        public Dictionary<int, (ICourseModel, int)> RecieptCourse { get; set; } = new();
+
     }
 }
\ No newline at end of file
diff --git a/Polyclinic/PolyclinicContracts/BindingModels/SuretorBindingModel.cs b/Polyclinic/PolyclinicContracts/BindingModels/SuretorBindingModel.cs
index bf021ea..9119677 100644
--- a/Polyclinic/PolyclinicContracts/BindingModels/SuretorBindingModel.cs
+++ b/Polyclinic/PolyclinicContracts/BindingModels/SuretorBindingModel.cs
@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace PolyclinicContracts.BindingModels
 {
-    public class SuretorBindingModel : ISuretor
+    public class SuretorBindingModel : ISuretorModel
     {
         public int Id { get; set; }
         public string FIO { get; set; } = string.Empty;
-- 
2.25.1


From 45a6e55e6316b9786404841c1a1a7e32fafd8ee8 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: Wed, 17 Apr 2024 22:18:05 +0400
Subject: [PATCH 06/11] =?UTF-8?q?=D0=9B=D0=B5=D0=BD=D0=B0.=20=D0=B8=D0=B7?=
 =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D0=B8=D0=BB=D0=B0=20=D0=B2=D1=81=D0=B5=20?=
 =?UTF-8?q?=D0=BD=D0=B0=D0=B7=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=BA=D0=BB?=
 =?UTF-8?q?=D0=B0=D1=81=D1=81=D0=BE=D0=B2=20=D1=80=D0=B5=D1=86=D0=B5=D0=BF?=
 =?UTF-8?q?=D1=82=D0=BE=D0=B2=20=D0=BD=D0=B0=20Recipe?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BindingModels/ProcedureBindingModel.cs                    | 2 +-
 .../{RecieptBindingModel.cs => RecipeBindingModel.cs}         | 4 ++--
 .../{RecieptSearchModel.cs => RecipeSearchModel.cs}           | 2 +-
 Polyclinic/PolyclinicDataModels/Models/IProcedureModel.cs     | 2 +-
 .../Models/{IRecieptModel.cs => IRecipeModel.cs}              | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)
 rename Polyclinic/PolyclinicContracts/BindingModels/{RecieptBindingModel.cs => RecipeBindingModel.cs} (71%)
 rename Polyclinic/PolyclinicContracts/SearchModels/{RecieptSearchModel.cs => RecipeSearchModel.cs} (87%)
 rename Polyclinic/PolyclinicDataModels/Models/{IRecieptModel.cs => IRecipeModel.cs} (69%)

diff --git a/Polyclinic/PolyclinicContracts/BindingModels/ProcedureBindingModel.cs b/Polyclinic/PolyclinicContracts/BindingModels/ProcedureBindingModel.cs
index 22b3b34..2ce8983 100644
--- a/Polyclinic/PolyclinicContracts/BindingModels/ProcedureBindingModel.cs
+++ b/Polyclinic/PolyclinicContracts/BindingModels/ProcedureBindingModel.cs
@@ -12,7 +12,7 @@ namespace PolyclinicContracts.BindingModels
         public int Id { get; set; }
         public string Name { get; set; } = string.Empty;
         public string Comment {  get; set; } = string.Empty;
-        public Dictionary<int, (IRecieptModel, int)> ProcedureReciept { get; set; } = new();
+        public Dictionary<int, (IRecipeModel, int)> ProcedureReciept { get; set; } = new();
 
     }
 }
\ No newline at end of file
diff --git a/Polyclinic/PolyclinicContracts/BindingModels/RecieptBindingModel.cs b/Polyclinic/PolyclinicContracts/BindingModels/RecipeBindingModel.cs
similarity index 71%
rename from Polyclinic/PolyclinicContracts/BindingModels/RecieptBindingModel.cs
rename to Polyclinic/PolyclinicContracts/BindingModels/RecipeBindingModel.cs
index 972df28..1f61791 100644
--- a/Polyclinic/PolyclinicContracts/BindingModels/RecieptBindingModel.cs
+++ b/Polyclinic/PolyclinicContracts/BindingModels/RecipeBindingModel.cs
@@ -7,12 +7,12 @@ using System.Threading.Tasks;
 
 namespace PolyclinicContracts.BindingModels
 {
-    public class RecieptBindingModel : IRecieptModel
+    public class RecipeBindingModel : IRecipeModel
     {
         public int Id { get; set; }
         public int CountProcedures { get; set; }
         public string Comment { get; set; } = string.Empty;
-        public Dictionary<int, (ICourseModel, int)> RecieptCourse { get; set; } = new();
+        public Dictionary<int, (ICourseModel, int)> RecipeCourse { get; set; } = new();
 
     }
 }
\ No newline at end of file
diff --git a/Polyclinic/PolyclinicContracts/SearchModels/RecieptSearchModel.cs b/Polyclinic/PolyclinicContracts/SearchModels/RecipeSearchModel.cs
similarity index 87%
rename from Polyclinic/PolyclinicContracts/SearchModels/RecieptSearchModel.cs
rename to Polyclinic/PolyclinicContracts/SearchModels/RecipeSearchModel.cs
index 6a92138..5751da4 100644
--- a/Polyclinic/PolyclinicContracts/SearchModels/RecieptSearchModel.cs
+++ b/Polyclinic/PolyclinicContracts/SearchModels/RecipeSearchModel.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace PolyclinicContracts.SearchModels
 {
-    public class RecieptSearchModel
+    public class RecipeSearchModel
     {
         public int? Id { get; set; } 
         public int? CountProcedures { get; set; } 
diff --git a/Polyclinic/PolyclinicDataModels/Models/IProcedureModel.cs b/Polyclinic/PolyclinicDataModels/Models/IProcedureModel.cs
index 6329da5..60eed98 100644
--- a/Polyclinic/PolyclinicDataModels/Models/IProcedureModel.cs
+++ b/Polyclinic/PolyclinicDataModels/Models/IProcedureModel.cs
@@ -10,7 +10,7 @@ namespace PolyclinicDataModels.Models
     {
         string Name { get; }
         string Comment { get; }
-        Dictionary<int, (IRecieptModel, int)> ProcedureReciept { get; }
+        Dictionary<int, (IRecipeModel, int)> ProcedureReciept { get; }
 
     }
 }
\ No newline at end of file
diff --git a/Polyclinic/PolyclinicDataModels/Models/IRecieptModel.cs b/Polyclinic/PolyclinicDataModels/Models/IRecipeModel.cs
similarity index 69%
rename from Polyclinic/PolyclinicDataModels/Models/IRecieptModel.cs
rename to Polyclinic/PolyclinicDataModels/Models/IRecipeModel.cs
index 51ab730..d5f2144 100644
--- a/Polyclinic/PolyclinicDataModels/Models/IRecieptModel.cs
+++ b/Polyclinic/PolyclinicDataModels/Models/IRecipeModel.cs
@@ -6,10 +6,10 @@ using System.Threading.Tasks;
 
 namespace PolyclinicDataModels.Models
 {
-    public interface IRecieptModel : IId
+    public interface IRecipeModel : IId
     {
         int CountProcedures { get; set; }
         string Comment { get; set; }
-        Dictionary<int, (ICourseModel, int)> RecieptCourse { get; }
+        Dictionary<int, (ICourseModel, int)> RecipeCourse { get; }
     }
 }
\ No newline at end of file
-- 
2.25.1


From c6344cbf816c2ada369b4801aa9666fa0533ac5f 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: Wed, 17 Apr 2024 23:03:34 +0400
Subject: [PATCH 07/11] =?UTF-8?q?=D0=9B=D0=B5=D0=BD=D0=B0.=20=D0=B2=D1=80?=
 =?UTF-8?q?=D0=BE=D0=B5=20=D0=BD=D0=B0=D0=BA=D0=BE=D0=BD=D0=B5=D1=86=20?=
 =?UTF-8?q?=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D1=8B=20=D0=BD=D0=BE?=
 =?UTF-8?q?=D1=80=D0=BC=D0=B0=D0=BB=D1=8C=D0=BD=D0=BE=20=D1=81=D0=B2=D1=8F?=
 =?UTF-8?q?=D0=B7=D0=B8=20=D0=BC=D0=BD=D0=BE=D0=B3=D0=B8=D0=B5=20=D0=BA?=
 =?UTF-8?q?=D0=BE=20=D0=BC=D0=BD=D0=BE=D0=B3=D0=B8=D0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BindingModels/MedicamentBindingModel.cs                   | 4 ++--
 .../BindingModels/ProcedureBindingModel.cs                    | 2 +-
 .../PolyclinicContracts/BindingModels/RecipeBindingModel.cs   | 2 +-
 Polyclinic/PolyclinicDataModels/Models/IMedicamentModel.cs    | 4 ++--
 Polyclinic/PolyclinicDataModels/Models/IProcedureModel.cs     | 3 +--
 Polyclinic/PolyclinicDataModels/Models/IRecipeModel.cs        | 3 ++-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Polyclinic/PolyclinicContracts/BindingModels/MedicamentBindingModel.cs b/Polyclinic/PolyclinicContracts/BindingModels/MedicamentBindingModel.cs
index cd56332..20af809 100644
--- a/Polyclinic/PolyclinicContracts/BindingModels/MedicamentBindingModel.cs
+++ b/Polyclinic/PolyclinicContracts/BindingModels/MedicamentBindingModel.cs
@@ -12,7 +12,7 @@ namespace PolyclinicContracts.BindingModels
         public int Id { get; set; }
         public string Name { get; set; } = string.Empty;
         public string Comment { get; set; } = string.Empty;
-        public Dictionary<int, (ISymptomModel, int)> MedicamentSymptom { get; set; } = new();
-        public Dictionary<int, (IProcedureModel, int)> MedicamentProcedure { get; set; } = new();
+        public Dictionary<int, ISymptomModel> MedicamentSymptom { get; set; } = new();
+        public Dictionary<int, IProcedureModel> MedicamentProcedure { get; set; } = new();
     }
 }
\ No newline at end of file
diff --git a/Polyclinic/PolyclinicContracts/BindingModels/ProcedureBindingModel.cs b/Polyclinic/PolyclinicContracts/BindingModels/ProcedureBindingModel.cs
index 2ce8983..c023140 100644
--- a/Polyclinic/PolyclinicContracts/BindingModels/ProcedureBindingModel.cs
+++ b/Polyclinic/PolyclinicContracts/BindingModels/ProcedureBindingModel.cs
@@ -12,7 +12,7 @@ namespace PolyclinicContracts.BindingModels
         public int Id { get; set; }
         public string Name { get; set; } = string.Empty;
         public string Comment {  get; set; } = string.Empty;
-        public Dictionary<int, (IRecipeModel, int)> ProcedureReciept { get; set; } = new();
+        public Dictionary<int, ICourseModel> ProcedureCourse { get; set; } = new();
 
     }
 }
\ No newline at end of file
diff --git a/Polyclinic/PolyclinicContracts/BindingModels/RecipeBindingModel.cs b/Polyclinic/PolyclinicContracts/BindingModels/RecipeBindingModel.cs
index 1f61791..30560d2 100644
--- a/Polyclinic/PolyclinicContracts/BindingModels/RecipeBindingModel.cs
+++ b/Polyclinic/PolyclinicContracts/BindingModels/RecipeBindingModel.cs
@@ -12,7 +12,7 @@ namespace PolyclinicContracts.BindingModels
         public int Id { get; set; }
         public int CountProcedures { get; set; }
         public string Comment { get; set; } = string.Empty;
-        public Dictionary<int, (ICourseModel, int)> RecipeCourse { get; set; } = new();
+        public Dictionary<int, IRecipeModel> ProcedureRecipe { get; set; } = new();
 
     }
 }
\ No newline at end of file
diff --git a/Polyclinic/PolyclinicDataModels/Models/IMedicamentModel.cs b/Polyclinic/PolyclinicDataModels/Models/IMedicamentModel.cs
index 620c826..d5fdfef 100644
--- a/Polyclinic/PolyclinicDataModels/Models/IMedicamentModel.cs
+++ b/Polyclinic/PolyclinicDataModels/Models/IMedicamentModel.cs
@@ -10,7 +10,7 @@ namespace PolyclinicDataModels.Models
     {
         string Name { get; }
         string Comment { get; }
-        Dictionary<int, (ISymptomModel, int)> MedicamentSymptom { get; }    
-        Dictionary<int, (IProcedureModel, int)> MedicamentProcedure { get; }    
+        Dictionary<int, ISymptomModel> MedicamentSymptom { get; }
+        Dictionary<int, IProcedureModel> MedicamentProcedure { get; }    
     }
 }
\ No newline at end of file
diff --git a/Polyclinic/PolyclinicDataModels/Models/IProcedureModel.cs b/Polyclinic/PolyclinicDataModels/Models/IProcedureModel.cs
index 60eed98..2a3345d 100644
--- a/Polyclinic/PolyclinicDataModels/Models/IProcedureModel.cs
+++ b/Polyclinic/PolyclinicDataModels/Models/IProcedureModel.cs
@@ -10,7 +10,6 @@ namespace PolyclinicDataModels.Models
     {
         string Name { get; }
         string Comment { get; }
-        Dictionary<int, (IRecipeModel, int)> ProcedureReciept { get; }
-
+        Dictionary<int, ICourseModel> ProcedureCourse { get; }
     }
 }
\ No newline at end of file
diff --git a/Polyclinic/PolyclinicDataModels/Models/IRecipeModel.cs b/Polyclinic/PolyclinicDataModels/Models/IRecipeModel.cs
index d5f2144..072945a 100644
--- a/Polyclinic/PolyclinicDataModels/Models/IRecipeModel.cs
+++ b/Polyclinic/PolyclinicDataModels/Models/IRecipeModel.cs
@@ -10,6 +10,7 @@ namespace PolyclinicDataModels.Models
     {
         int CountProcedures { get; set; }
         string Comment { get; set; }
-        Dictionary<int, (ICourseModel, int)> RecipeCourse { get; }
+        Dictionary<int, IRecipeModel> ProcedureRecipe { get; }
+
     }
 }
\ No newline at end of file
-- 
2.25.1


From 30aeebddd2b18318da3ba9ed028780ee2b51452a 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: Wed, 17 Apr 2024 23:24:23 +0400
Subject: [PATCH 08/11] =?UTF-8?q?=D0=9B=D0=B5=D0=BD=D0=B0.=20=D0=B8=D1=81?=
 =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B8=D0=BB=D0=B0=20=D0=BF=D0=BE?=
 =?UTF-8?q?=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D1=82=D0=B5=D0=BB=D1=8F=20?=
 =?UTF-8?q?=D0=BF=D0=BE=D0=B4=20=D0=BE=D0=B1=D1=89=D0=B5=D0=BF=D1=80=D0=B8?=
 =?UTF-8?q?=D0=BD=D1=8F=D1=82=D1=8B=D0=B5=20=D1=81=D1=82=D0=B0=D0=BD=D0=B4?=
 =?UTF-8?q?=D0=B0=D1=80=D1=82=D1=8B...)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PolyclinicContracts/BindingModels/SuretorBindingModel.cs   | 3 +--
 Polyclinic/PolyclinicDataModels/Models/ISuretorModel.cs        | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/Polyclinic/PolyclinicContracts/BindingModels/SuretorBindingModel.cs b/Polyclinic/PolyclinicContracts/BindingModels/SuretorBindingModel.cs
index 9119677..ed9243c 100644
--- a/Polyclinic/PolyclinicContracts/BindingModels/SuretorBindingModel.cs
+++ b/Polyclinic/PolyclinicContracts/BindingModels/SuretorBindingModel.cs
@@ -11,8 +11,7 @@ namespace PolyclinicContracts.BindingModels
     {
         public int Id { get; set; }
         public string FIO { get; set; } = string.Empty;
-        public DateTime BirthDay { get; set; }
         public string Password { get; set; } = "123";
-        public string RepeatPassword { get; set; } = "123";
+        public string Email { get; set; } = string.Empty;
     }
 }
\ No newline at end of file
diff --git a/Polyclinic/PolyclinicDataModels/Models/ISuretorModel.cs b/Polyclinic/PolyclinicDataModels/Models/ISuretorModel.cs
index 66b7fc9..e88c68f 100644
--- a/Polyclinic/PolyclinicDataModels/Models/ISuretorModel.cs
+++ b/Polyclinic/PolyclinicDataModels/Models/ISuretorModel.cs
@@ -9,8 +9,7 @@ namespace PolyclinicDataModels.Models
     public interface ISuretorModel : IId
     {
         string FIO { get; }
-        DateTime BirthDay { get; }
         string Password { get; }
-        string RepeatPassword { get; }
+        string Email { get; }
     }
 }
-- 
2.25.1


From 0ff71496ae8f73ab4faf6ec3ad355004a6db212b 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: Wed, 24 Apr 2024 18:33:11 +0400
Subject: [PATCH 09/11] =?UTF-8?q?=D1=80=D0=B5=D0=B0=D0=BB=D0=B8=D0=B7?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D1=8B=20=D0=B8=D0=BD=D1=82=D0=B5=D1=80?=
 =?UTF-8?q?=D1=84=D0=B5=D0=B9=D1=81=D1=8B=20=D0=B1=D0=B8=D0=B7=D0=BD=D0=B5?=
 =?UTF-8?q?=D1=81=20=D0=BB=D0=BE=D0=B3=D0=B8=D0=BA=D0=B8=20=D0=B2=20=D0=BA?=
 =?UTF-8?q?=D0=BE=D0=BD=D1=82=D1=80=D0=B0=D0=BA=D1=82=D0=B0=D1=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IMedicamentLogic.cs                       | 20 +++++++++++++++++++
 .../IProcedureLogic.cs                        | 20 +++++++++++++++++++
 .../BusinessLogicsContracts/IRecipeLogic.cs   | 20 +++++++++++++++++++
 .../BusinessLogicsContracts/ISuretorLogic.cs  | 20 +++++++++++++++++++
 4 files changed, 80 insertions(+)
 create mode 100644 Polyclinic/PolyclinicContracts/BusinessLogicsContracts/IMedicamentLogic.cs
 create mode 100644 Polyclinic/PolyclinicContracts/BusinessLogicsContracts/IProcedureLogic.cs
 create mode 100644 Polyclinic/PolyclinicContracts/BusinessLogicsContracts/IRecipeLogic.cs
 create mode 100644 Polyclinic/PolyclinicContracts/BusinessLogicsContracts/ISuretorLogic.cs

diff --git a/Polyclinic/PolyclinicContracts/BusinessLogicsContracts/IMedicamentLogic.cs b/Polyclinic/PolyclinicContracts/BusinessLogicsContracts/IMedicamentLogic.cs
new file mode 100644
index 0000000..60597f5
--- /dev/null
+++ b/Polyclinic/PolyclinicContracts/BusinessLogicsContracts/IMedicamentLogic.cs
@@ -0,0 +1,20 @@
+using PolyclinicContracts.BindingModels;
+using PolyclinicContracts.SearchModels;
+using PolyclinicContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PolyclinicContracts.BusinessLogicsContracts
+{
+    public interface IMedicamentLogic
+    {
+        List<MedicamentView>? ReadList(MedicamentSearchModel? model);
+        MedicamentView? ReadElement(MedicamentSearchModel model);
+        bool Create(MedicamentBindingModel model);
+        bool Update(MedicamentBindingModel model);
+        bool Delete(MedicamentBindingModel model);
+    }
+}
diff --git a/Polyclinic/PolyclinicContracts/BusinessLogicsContracts/IProcedureLogic.cs b/Polyclinic/PolyclinicContracts/BusinessLogicsContracts/IProcedureLogic.cs
new file mode 100644
index 0000000..693ed79
--- /dev/null
+++ b/Polyclinic/PolyclinicContracts/BusinessLogicsContracts/IProcedureLogic.cs
@@ -0,0 +1,20 @@
+using PolyclinicContracts.BindingModels;
+using PolyclinicContracts.SearchModels;
+using PolyclinicContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PolyclinicContracts.BusinessLogicsContracts
+{
+    public interface IProcedureLogic
+    {
+        List<ProcedureView>? ReadList(ProcedureSearchModel? model);
+        ProcedureView? ReadElement(ProcedureSearchModel model);
+        bool Create(ProcedureBindingModel model);
+        bool Update(ProcedureBindingModel model);
+        bool Delete(ProcedureBindingModel model);
+    }
+}
diff --git a/Polyclinic/PolyclinicContracts/BusinessLogicsContracts/IRecipeLogic.cs b/Polyclinic/PolyclinicContracts/BusinessLogicsContracts/IRecipeLogic.cs
new file mode 100644
index 0000000..a417ab5
--- /dev/null
+++ b/Polyclinic/PolyclinicContracts/BusinessLogicsContracts/IRecipeLogic.cs
@@ -0,0 +1,20 @@
+using PolyclinicContracts.BindingModels;
+using PolyclinicContracts.SearchModels;
+using PolyclinicContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PolyclinicContracts.BusinessLogicsContracts
+{
+    public interface IRecipeLogic
+    {
+        List<RecipeView>? ReadList(RecipeSearchModel? model);
+        RecipeView? ReadElement(RecipeSearchModel model);
+        bool Create(RecipeBindingModel model);
+        bool Update(RecipeBindingModel model);
+        bool Delete(RecipeBindingModel model);
+    }
+}
diff --git a/Polyclinic/PolyclinicContracts/BusinessLogicsContracts/ISuretorLogic.cs b/Polyclinic/PolyclinicContracts/BusinessLogicsContracts/ISuretorLogic.cs
new file mode 100644
index 0000000..50047f0
--- /dev/null
+++ b/Polyclinic/PolyclinicContracts/BusinessLogicsContracts/ISuretorLogic.cs
@@ -0,0 +1,20 @@
+using PolyclinicContracts.BindingModels;
+using PolyclinicContracts.SearchModels;
+using PolyclinicContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PolyclinicContracts.BusinessLogicsContracts
+{
+    public interface ISuretorLogic
+    {
+        List<SuretorView>? ReadList(SuretorSearchModel? model);
+        SuretorView? ReadElement(SuretorSearchModel model);
+        bool Create(SuretorBindingModel model);
+        bool Update(SuretorBindingModel model);
+        bool Delete(SuretorBindingModel model);
+    }
+}
-- 
2.25.1


From 88df65662cd1131fe3bb21f498ddb1aa5e2e0b9a 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: Wed, 24 Apr 2024 18:33:34 +0400
Subject: [PATCH 10/11] =?UTF-8?q?=D1=80=D0=B5=D0=B0=D0=BB=D0=B8=D0=B7?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D1=8B=20=D0=B8=D0=BD=D1=82=D0=B5=D1=80?=
 =?UTF-8?q?=D1=84=D0=B5=D0=B9=D1=81=D1=8B=20=D1=85=D1=80=D0=B0=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=BB=D0=B8=D1=89=D0=B0=20=D0=B2=20=D0=BA=D0=BE=D0=BD=D1=82?=
 =?UTF-8?q?=D1=80=D0=B0=D0=BA=D1=82=D0=B0=D1=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../StoragesContracts/IMedicamentStorage.cs   | 21 +++++++++++++++++++
 .../StoragesContracts/IProcedureStorage.cs    | 21 +++++++++++++++++++
 .../StoragesContracts/IRecipeStorage.cs       | 21 +++++++++++++++++++
 .../StoragesContracts/ISuretorStorage.cs      | 21 +++++++++++++++++++
 4 files changed, 84 insertions(+)
 create mode 100644 Polyclinic/PolyclinicContracts/StoragesContracts/IMedicamentStorage.cs
 create mode 100644 Polyclinic/PolyclinicContracts/StoragesContracts/IProcedureStorage.cs
 create mode 100644 Polyclinic/PolyclinicContracts/StoragesContracts/IRecipeStorage.cs
 create mode 100644 Polyclinic/PolyclinicContracts/StoragesContracts/ISuretorStorage.cs

diff --git a/Polyclinic/PolyclinicContracts/StoragesContracts/IMedicamentStorage.cs b/Polyclinic/PolyclinicContracts/StoragesContracts/IMedicamentStorage.cs
new file mode 100644
index 0000000..aa82958
--- /dev/null
+++ b/Polyclinic/PolyclinicContracts/StoragesContracts/IMedicamentStorage.cs
@@ -0,0 +1,21 @@
+using PolyclinicContracts.BindingModels;
+using PolyclinicContracts.SearchModels;
+using PolyclinicContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PolyclinicContracts.StoragesContracts
+{
+    public interface IMedicamentStorage
+    {
+        List<MedicamentView> GetFullList();
+        List<MedicamentView> GetFilteredList(MedicamentSearchModel model);
+        MedicamentView? GetElement(MedicamentSearchModel model);
+        MedicamentView? Insert(MedicamentBindingModel model);
+        MedicamentView? Update(MedicamentBindingModel model);
+        MedicamentView? Delete(MedicamentBindingModel model);
+    }
+}
diff --git a/Polyclinic/PolyclinicContracts/StoragesContracts/IProcedureStorage.cs b/Polyclinic/PolyclinicContracts/StoragesContracts/IProcedureStorage.cs
new file mode 100644
index 0000000..ed51fac
--- /dev/null
+++ b/Polyclinic/PolyclinicContracts/StoragesContracts/IProcedureStorage.cs
@@ -0,0 +1,21 @@
+using PolyclinicContracts.BindingModels;
+using PolyclinicContracts.SearchModels;
+using PolyclinicContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PolyclinicContracts.StoragesContracts
+{
+    public interface IProcedureStorage
+    {
+        List<ProcedureView> GetFullList();
+        List<ProcedureView> GetFilteredList(ProcedureSearchModel model);
+        ProcedureView? GetElement(ProcedureSearchModel model);
+        ProcedureView? Insert(ProcedureBindingModel model);
+        ProcedureView? Update(ProcedureBindingModel model);
+        ProcedureView? Delete(ProcedureBindingModel model);
+    }
+}
\ No newline at end of file
diff --git a/Polyclinic/PolyclinicContracts/StoragesContracts/IRecipeStorage.cs b/Polyclinic/PolyclinicContracts/StoragesContracts/IRecipeStorage.cs
new file mode 100644
index 0000000..e92b394
--- /dev/null
+++ b/Polyclinic/PolyclinicContracts/StoragesContracts/IRecipeStorage.cs
@@ -0,0 +1,21 @@
+using PolyclinicContracts.BindingModels;
+using PolyclinicContracts.SearchModels;
+using PolyclinicContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PolyclinicContracts.StoragesContracts
+{
+    public interface IRecipeStorage
+    {
+        List<RecipeView> GetFullList();
+        List<RecipeView> GetFilteredList(RecipeSearchModel model);
+        RecipeView? GetElement(RecipeSearchModel model);
+        RecipeView? Insert(RecipeBindingModel model);
+        RecipeView? Update(RecipeBindingModel model);
+        RecipeView? Delete(RecipeBindingModel model);
+    }
+}
diff --git a/Polyclinic/PolyclinicContracts/StoragesContracts/ISuretorStorage.cs b/Polyclinic/PolyclinicContracts/StoragesContracts/ISuretorStorage.cs
new file mode 100644
index 0000000..c7ed61c
--- /dev/null
+++ b/Polyclinic/PolyclinicContracts/StoragesContracts/ISuretorStorage.cs
@@ -0,0 +1,21 @@
+using PolyclinicContracts.BindingModels;
+using PolyclinicContracts.SearchModels;
+using PolyclinicContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PolyclinicContracts.StoragesContracts
+{
+    public interface ISuretorStorage
+    {
+        List<SuretorView> GetFullList();
+        List<SuretorView> GetFilteredList(SuretorSearchModel model);
+        SuretorView? GetElement(SuretorSearchModel model);
+        SuretorView? Insert(SuretorBindingModel model);
+        SuretorView? Update(SuretorBindingModel model);
+        SuretorView? Delete(SuretorBindingModel model);
+    }
+}
-- 
2.25.1


From 87634062888fac7b4aa5057bd3f61ffa87204aed 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: Wed, 24 Apr 2024 18:34:15 +0400
Subject: [PATCH 11/11] =?UTF-8?q?=D1=80=D0=B5=D0=B0=D0=BB=D0=B8=D0=B7?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D1=8B=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81?=
 =?UTF-8?q?=D1=8B-=D0=BF=D1=80=D0=B5=D0=B4=D1=81=D1=82=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B2=20=D0=BA=D0=BE=D0=BD=D1=82?=
 =?UTF-8?q?=D1=80=D0=B0=D0=BA=D1=82=D0=B0=D1=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PolyclinicContracts.csproj                |  6 -----
 .../ViewModels/MedicamentView.cs              | 23 ++++++++++++++++++
 .../ViewModels/ProcedureView.cs               | 24 +++++++++++++++++++
 .../ViewModels/RecipeView.cs                  | 23 ++++++++++++++++++
 .../ViewModels/SuretorView.cs                 | 24 +++++++++++++++++++
 5 files changed, 94 insertions(+), 6 deletions(-)
 create mode 100644 Polyclinic/PolyclinicContracts/ViewModels/MedicamentView.cs
 create mode 100644 Polyclinic/PolyclinicContracts/ViewModels/ProcedureView.cs
 create mode 100644 Polyclinic/PolyclinicContracts/ViewModels/RecipeView.cs
 create mode 100644 Polyclinic/PolyclinicContracts/ViewModels/SuretorView.cs

diff --git a/Polyclinic/PolyclinicContracts/PolyclinicContracts.csproj b/Polyclinic/PolyclinicContracts/PolyclinicContracts.csproj
index acf6006..5a9101d 100644
--- a/Polyclinic/PolyclinicContracts/PolyclinicContracts.csproj
+++ b/Polyclinic/PolyclinicContracts/PolyclinicContracts.csproj
@@ -6,12 +6,6 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Folder Include="StoragesContracts\" />
-    <Folder Include="ViewModels\" />
-    <Folder Include="BusinessLogicsContracts\" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\PolyclinicDataModels\PolyclinicDataModels.csproj" />
   </ItemGroup>
diff --git a/Polyclinic/PolyclinicContracts/ViewModels/MedicamentView.cs b/Polyclinic/PolyclinicContracts/ViewModels/MedicamentView.cs
new file mode 100644
index 0000000..345e93d
--- /dev/null
+++ b/Polyclinic/PolyclinicContracts/ViewModels/MedicamentView.cs
@@ -0,0 +1,23 @@
+using PolyclinicDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PolyclinicContracts.ViewModels
+{
+    public class MedicamentView : IMedicamentModel
+    {
+        public int Id { get; set; }
+
+        [DisplayName("Название медикамента")]
+        public string Name { get; set; } = string.Empty;
+
+        [DisplayName("Комментарий")]
+        public string Comment { get; set; } = string.Empty;
+        public Dictionary<int, ISymptomModel> MedicamentSymptom { get; set; } = new();
+        public Dictionary<int, IProcedureModel> MedicamentProcedure { get; set; } = new();
+    }
+}
diff --git a/Polyclinic/PolyclinicContracts/ViewModels/ProcedureView.cs b/Polyclinic/PolyclinicContracts/ViewModels/ProcedureView.cs
new file mode 100644
index 0000000..e7212c2
--- /dev/null
+++ b/Polyclinic/PolyclinicContracts/ViewModels/ProcedureView.cs
@@ -0,0 +1,24 @@
+using PolyclinicDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PolyclinicContracts.ViewModels
+{
+    public class ProcedureView : IProcedureModel
+    {
+        public int Id { get; set; }
+
+        [DisplayName("Название процедуры")]
+        public string Name { get; set; }
+
+        [DisplayName("Комментарий")]
+        public string Comment { get; set; }
+
+        public Dictionary<int, ICourseModel> ProcedureCourse { get; set; } = new();
+
+    }
+}
\ No newline at end of file
diff --git a/Polyclinic/PolyclinicContracts/ViewModels/RecipeView.cs b/Polyclinic/PolyclinicContracts/ViewModels/RecipeView.cs
new file mode 100644
index 0000000..083f25e
--- /dev/null
+++ b/Polyclinic/PolyclinicContracts/ViewModels/RecipeView.cs
@@ -0,0 +1,23 @@
+using PolyclinicDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PolyclinicContracts.ViewModels
+{
+    public class RecipeView : IRecipeModel
+    {
+        public int Id { get; set; }
+
+        [DisplayName("Количество процедур")]
+        public int CountProcedures { get; set; }
+
+        [DisplayName("Комментарий")]
+        public string Comment { get; set; } = string.Empty;
+        public Dictionary<int, IRecipeModel> ProcedureRecipe { get; set; } = new();
+    }
+}
diff --git a/Polyclinic/PolyclinicContracts/ViewModels/SuretorView.cs b/Polyclinic/PolyclinicContracts/ViewModels/SuretorView.cs
new file mode 100644
index 0000000..84bfa4d
--- /dev/null
+++ b/Polyclinic/PolyclinicContracts/ViewModels/SuretorView.cs
@@ -0,0 +1,24 @@
+using PolyclinicDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PolyclinicContracts.ViewModels
+{
+    public class SuretorView : ISuretorModel
+    {
+        public int Id { get; set; }
+
+        [DisplayName("ФИО поручителя")]
+        public string FIO { get; set; } = string.Empty;
+
+        public string Password { get; set; } = "123";
+
+        [DisplayName("Почта")]
+        public string Email { get; set; } = string.Empty;
+
+    }
+}
-- 
2.25.1