Merge branch 'storekeeper' of https://git.is.ulstu.ru/Egor2003/Salin_O.A._Kislitsa_E.D._CourseWork_Veterinary_Clinic_Aibolit into storekeeper

VetClinic/VetClinicContracts/BindingModels/ListServicesBindingModel.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace VetClinicContracts.BindingModels
+{
+	public class ListServicesBindingModel
+	{
+		public string FileName { get; set; } = string.Empty;
+		public List<int> Animals { get; set; } = new();
+	}
+}

VetClinic/VetClinicContracts/BindingModels/MedicineVaccinationsBindingModel.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace VetClinicContracts.BindingModels
+{
+	public class MedicineVaccinationsBindingModel
+	{
+		public string FileName { get; set; } = string.Empty;
+		public List<int> Visits { get; set; } = new();
+		DateTime DateFrom { get; set; } = DateTime.Now;
+		DateTime DateTo { get; set; } = DateTime.Now;
+	}
+}

VetClinic/VetClinicContracts/BusinessLogicsContracts/IReportLogicAdmin.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using VetClinicContracts.BindingModels;
+using VetClinicContracts.ViewModels;
+
+namespace VetClinicContracts.BusinessLogicsContracts
+{
+	public interface IReportLogicAdmin //Будет дорабатываться
+	{
+		List<ListAnimalsViewModel> GetServiceAnimals(List<int> animals);
+		void SaveServicesToWordFile(ListServicesBindingModel model);
+		void SaveServicesToExcelFile(ListServicesBindingModel model);
+	}
+}

VetClinic/VetClinicContracts/SearchModels/AnimalSearchModel.cs

@@ -13,6 +13,5 @@ namespace VetClinicContracts.SearchModels
 		public int? AdminId { get; set; }
 		public string? AnimalName { get; set; }
 		public string? Family { get; set; }
-		public int? MedicineId { get; set; }
 	}
 }

VetClinic/VetClinicContracts/SearchModels/ListServicesSearchModel.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace VetClinicContracts.SearchModels
+{
+	public class ListServicesSearchModel
+	{
+		public List<int>? animalsIds { get; set; }
+	}
+}

VetClinic/VetClinicContracts/SearchModels/MedicineVaccinationsSearchModel.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace VetClinicContracts.SearchModels
+{
+	public class MedicineVaccinationsSearchModel
+	{
+		public List<int>? visitsIds { get; set; }
+		public DateTime? DateFrom { get; set; }
+		public DateTime? DateTo { get; set; }
+	}
+}

VetClinic/VetClinicContracts/SearchModels/VisitSearchModel.cs

@@ -16,6 +16,5 @@ namespace VetClinicContracts.SearchModels
 		public string? DateVisit { get; set; }
 		public DateTime? DateFrom { get; set; }
 		public DateTime? DateTo { get; set; }
-		public int? ServiceId { get; set; }
 	}
 }

VetClinic/VetClinicContracts/StoragesContracts/IAnimalStorage.cs

@@ -13,6 +13,7 @@ namespace VetClinicContracts.StoragesContracts
 	{
 		List<AnimalViewModel> GetFullList();
 		List<AnimalViewModel> GetFilteredList(AnimalSearchModel model);
+		List<Tuple<AnimalViewModel, List<Tuple<MedicineViewModel, List<ServiceViewModel>>>>> GetReportInfo(ListServicesSearchModel model);
 		AnimalViewModel? GetElement(AnimalSearchModel model);
 		AnimalViewModel? Insert(AnimalBindingModel model);
 		AnimalViewModel? Update(AnimalBindingModel model);