From 6cee54fb4a3887e81a7692ea9c5639812a3da2ab Mon Sep 17 00:00:00 2001
From: antoc0der <1@DESKTOP-K1L8ND3>
Date: Tue, 30 Apr 2024 11:28:41 +0400
Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=BE=D1=80=D1=83=D1=87=D0=B8=D1=82?=
 =?UTF-8?q?=D0=B5=D0=BB=D1=8C=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../VeterinaryDataModels/IDrugModel.cs          | 16 ----------------
 .../VeterinaryDataModels/IServiceModel.cs       | 17 -----------------
 .../VeterinaryDataModels/Models/IDrugModel.cs   |  2 +-
 .../Models/IServiceModel.cs                     |  2 +-
 .../Controllers/HomeController.cs               |  2 +-
 .../Controllers/HomeController.cs               |  2 ++
 6 files changed, 5 insertions(+), 36 deletions(-)
 delete mode 100644 VeterinaryView/VeterinaryDataModels/IDrugModel.cs
 delete mode 100644 VeterinaryView/VeterinaryDataModels/IServiceModel.cs

diff --git a/VeterinaryView/VeterinaryDataModels/IDrugModel.cs b/VeterinaryView/VeterinaryDataModels/IDrugModel.cs
deleted file mode 100644
index f41989d..0000000
--- a/VeterinaryView/VeterinaryDataModels/IDrugModel.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace VeterinaryDataModels
-{
-	public interface IDrugModel :IId
-	{
-		string DrugName { get; }
-		int Count { get; }
-		double Price { get; }
-		Dictionary<int, IMedicationModel> DrugMedications { get; }
-	}
-}
diff --git a/VeterinaryView/VeterinaryDataModels/IServiceModel.cs b/VeterinaryView/VeterinaryDataModels/IServiceModel.cs
deleted file mode 100644
index 743cb2e..0000000
--- a/VeterinaryView/VeterinaryDataModels/IServiceModel.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace VeterinaryDataModels
-{
-	public interface IServiceModel : IId
-	{
-		String ServiceName { get;}
-		int VisitId { get; }
-		int DoctorId { get; }
-		Dictionary<int, IMedicationModel> ServiceMedications { get; }
-
-	}
-}
diff --git a/VeterinaryView/VeterinaryDataModels/Models/IDrugModel.cs b/VeterinaryView/VeterinaryDataModels/Models/IDrugModel.cs
index 5ba6bd0..6579c66 100644
--- a/VeterinaryView/VeterinaryDataModels/Models/IDrugModel.cs
+++ b/VeterinaryView/VeterinaryDataModels/Models/IDrugModel.cs
@@ -11,6 +11,6 @@ namespace VeterinaryDataModels.Models
         string DrugName { get; }
         int Count { get; }
         double Price { get; }
-        Dictionary<int, (IMedicationModel, int)> DrugMedications { get; }
+        Dictionary<int, IMedicationModel> DrugMedications { get; }
     }
 }
diff --git a/VeterinaryView/VeterinaryDataModels/Models/IServiceModel.cs b/VeterinaryView/VeterinaryDataModels/Models/IServiceModel.cs
index 75903a2..ac199cf 100644
--- a/VeterinaryView/VeterinaryDataModels/Models/IServiceModel.cs
+++ b/VeterinaryView/VeterinaryDataModels/Models/IServiceModel.cs
@@ -11,7 +11,7 @@ namespace VeterinaryDataModels.Models
         string ServiceName { get; }
         int VisitId { get; }
         int DoctorId { get; }
-        Dictionary<int, (IMedicationModel, int)> ServiceMedications { get; }
+        Dictionary<int, IMedicationModel> ServiceMedications { get; }
 
     }
 }
diff --git a/VeterinaryView/VeterinaryShowDoctorApp/Controllers/HomeController.cs b/VeterinaryView/VeterinaryShowDoctorApp/Controllers/HomeController.cs
index 4eb35bc..caec887 100644
--- a/VeterinaryView/VeterinaryShowDoctorApp/Controllers/HomeController.cs
+++ b/VeterinaryView/VeterinaryShowDoctorApp/Controllers/HomeController.cs
@@ -4,7 +4,7 @@ using VeterinaryShowDoctorApp.Models;
 using VeterinaryContracts.ViewModels;
 using VeterinaryContracts.BindingModels;
 using System.Text;
-using VeterinaryDataModels;
+using VeterinaryDataModels.Models;
 using VeterinaryContracts.SearchModels;
 using VeterinaryContracts.StorageContracts;
 
diff --git a/VeterinaryView/VeterinaryShowOwnerApp/Controllers/HomeController.cs b/VeterinaryView/VeterinaryShowOwnerApp/Controllers/HomeController.cs
index c994250..85489f8 100644
--- a/VeterinaryView/VeterinaryShowOwnerApp/Controllers/HomeController.cs
+++ b/VeterinaryView/VeterinaryShowOwnerApp/Controllers/HomeController.cs
@@ -3,6 +3,8 @@ using System.Diagnostics;
 using VeterinaryContracts.BindingModels;
 using VeterinaryContracts.ViewModels;
 using VeterinaryShowOwnerApp.Models;
+using VeterinaryShowOwnerApp;
+
 
 namespace VeterinaryShowOwnerApp.Controllers
 {