Контракты для Исполнителя

LawCompany/LawCompanyContracts/BindingModels/CaseBindingModel.cs

@@ -8,7 +8,6 @@ namespace LawCompanyContracts.BindingModels
 		public int Id { get; set; }
 		public string Name { get; set; } = string.Empty;
 		public CaseStatus Status { get; set; } = CaseStatus.Неизвестен;
-		public string CaseType { get; set; } = string.Empty;
 		public DateTime DateCreate { get; set; }
 		public DateTime? DateImplement { get; set; }
 		public Dictionary<int, IClientModel> CaseClients { get; set; } = new();

LawCompany/LawCompanyContracts/BindingModels/MailConfigBindingModel.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace LawCompanyContracts.BindingModels
 {
-	internal class MailConfigBindingModel
+	public class MailConfigBindingModel
 	{
 		public string MailLogin { get; set; } = string.Empty;
 		public string MailPassword { get; set; } = string.Empty;

LawCompany/LawCompanyContracts/BindingModels/MailSendInfoBindingModel.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace LawCompanyContracts.BindingModels
 {
-	internal class MailSendInfoBindingModel
+	public class MailSendInfoBindingModel
 	{
 		public string MailAddress { get; set; } = string.Empty;
 		public string Subject { get; set; } = string.Empty;

LawCompany/LawCompanyContracts/BindingModels/ReportExecutorBindingModel.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace LawCompanyContracts.BindingModels
 {
-	internal class ReportExecutorBindingModel
+	public class ReportExecutorBindingModel
 	{
 		public string FileName { get; set; } = string.Empty;
 		public DateTime? DateFrom { get; set; }

LawCompany/LawCompanyContracts/BindingModels/ReportGuarantorBindingModel.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace LawCompanyContracts.BindingModels
 {
-	internal class ReportGuarantorBindingModel
+	public class ReportGuarantorBindingModel
 	{
 		public string FileName { get; set; } = string.Empty;
 		public string HearingName { get; set; } = string.Empty;

LawCompany/LawCompanyContracts/BindingModels/VisitBindingModel.cs

@@ -6,7 +6,7 @@ namespace LawCompanyContracts.BindingModels
 	{
 		public int Id { get; set; }
 		public DateTime VisitDate { get; set; }
-		public int HearingId { get; set; }
+		public int? HearingId { get; set; }
 		public Dictionary<int, IClientModel> VisitClients { get; set; } = new();
 		public int ExecutorId { get; set; }
 	}

LawCompany/LawCompanyContracts/BusinessLogicContracts/ICaseLogic.cs

@@ -10,11 +10,7 @@ namespace LawCompanyContracts.BusinessLogicContracts
 		List<CaseViewModel>? ReadList(CaseSearchModel? model);
 		CaseViewModel? ReadElement(CaseSearchModel model);
 		bool CreateCase(CaseBindingModel model);
-		bool CaseAnalysis(CaseBindingModel model);
-		bool CaseHearing(CaseBindingModel model);
-		bool CloseCase(CaseBindingModel model);
 		bool DeleteCase(CaseBindingModel model);
-		bool AddClientToCase(CaseSearchModel model, IClientModel client);
 		bool Update(CaseBindingModel model);
 	}
 }

LawCompany/LawCompanyContracts/BusinessLogicContracts/IReportExecutorLogic.cs

@@ -8,12 +8,12 @@ using LawCompanyContracts.ViewModels;
 
 namespace LawCompanyContracts.BusinessLogicContracts
 {
-	internal class IReportExecutorLogic
+	public interface IReportExecutorLogic
 	{
-		List<ReportClientCaseViewModel> GetClientCaseBooking(List<int> Ids);
+		List<ReportClientHearingViewModel> GetClientHearing(List<int> Ids);
-		List<ReportClientsViewModel> GetClients(ReportOrganiserBindingModel model);
+		List<ReportClientsViewModel> GetClients(ReportExecutorBindingModel model);
-		void SaveClientCaseToWordFile(ReportOrganiserBindingModel model);
+		void SaveClientHearingToWordFile(ReportExecutorBindingModel model);
-		void SaveClientCaseToExcelFile(ReportOrganiserBindingModel model);
+		void SaveClientHearingToExcelFile(ReportExecutorBindingModel model);
-		void SaveClientsToPdfFile(ReportOrganiserBindingModel model);
+		void SaveClientsToPdfFile(ReportExecutorBindingModel model);
 	}
 }

LawCompany/LawCompanyContracts/BusinessLogicContracts/IReportGuarantorLogic.cs

@@ -8,7 +8,7 @@ using LawCompanyContracts.ViewModels;
 
 namespace LawCompanyContracts.BusinessLogicContracts
 {
-	internal class IReportGuarantorLogic
+	public interface IReportGuarantorLogic
 	{
 		List<ReportLawyerHearingViewModel> GetLawyerHearing(List<int> Ids);
 		List<ReportLawyersViewModel> GetLawyers(ReportGuarantorBindingModel model);

LawCompany/LawCompanyContracts/SearchModels/CaseSearchModel.cs

@@ -4,7 +4,6 @@
 	{
 		public int? Id { get; set; }
 		public string? Name { get; set; }
-		public string? CaseType { get; set; }
 		public DateTime? DateFrom { get; set; }
 		public DateTime? DateTo { get; set; }
 		public int? ExecutorId { get; set; }

LawCompany/LawCompanyContracts/ViewModels/CaseViewModel.cs

@@ -11,8 +11,6 @@ namespace LawCompanyContracts.ViewModels
 		public string Name { get; set; } = string.Empty;
 		[DisplayName("Статус")]
 		public CaseStatus Status { get; set; } = CaseStatus.Неизвестен;
-		[DisplayName("Вид производства")]
-		public string CaseType { get; set; } = string.Empty;
 		[DisplayName("Дата создания")]
 		public DateTime DateCreate { get; set; }
 		[DisplayName("Дата выполнения")]

LawCompany/LawCompanyContracts/ViewModels/ConsultationViewModel.cs

@@ -16,5 +16,6 @@ namespace LawCompanyContracts.ViewModels
 		public int CaseId { get; set; }
 		public int GuarantorId { get; set; }
 		public Dictionary<int, ILawyerModel> ConsultationLawyers { get; set; } = new();
-	}
+        public CaseViewModel Case { get; set; }
+    }
 }

LawCompany/LawCompanyContracts/ViewModels/ReportClientHearingViewModel.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace LawCompanyContracts.ViewModels
+{
+	public class ReportClientHearingViewModel
+	{
+		public string FIO { get; set; } = string.Empty;
+		public List<Tuple<string, DateTime>> Hearing { get; set; } = new();
+	}
+}

LawCompany/LawCompanyContracts/ViewModels/ReportClientsViewModel.cs

@@ -1,4 +1,5 @@
-using System;
+using LawCompanyDataModels.Enums;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -6,7 +7,15 @@ using System.Threading.Tasks;
 
 namespace LawCompanyContracts.ViewModels
 {
-	internal class ReportClientsViewModel
+	public class ReportClientsViewModel
 	{
+		// клиент
+		public string FIO { get; set; } = string.Empty;
+		// дело
+		public string Name { get; set; } = string.Empty;
+		public CaseStatus Status { get; set; } = CaseStatus.Неизвестен;
+		// консультация
+		public DateTime ConsultationDate { get; set; }
+		public double Cost { get; set; }
 	}
 }

LawCompany/LawCompanyContracts/ViewModels/ReportLawyerHearingViewModel.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace LawCompanyContracts.ViewModels
 {
-	internal class ReportLawyerHearingViewModel
+	public class ReportLawyerHearingViewModel
 	{
 	}
 }

LawCompany/LawCompanyContracts/ViewModels/ReportLawyersViewModel.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace LawCompanyContracts.ViewModels
 {
-	internal class ReportLawyersViewModel
+	public class ReportLawyersViewModel
 	{
 	}
 }

LawCompany/LawCompanyContracts/ViewModels/VisitViewModel.cs

@@ -8,7 +8,7 @@ namespace LawCompanyContracts.ViewModels
 		public int Id { get; set; }
 		[DisplayName("Дата визита")]
 		public DateTime VisitDate { get; set; }
-		public int HearingId { get; set; }
+		public int? HearingId { get; set; }
 		public Dictionary<int, IClientModel> VisitClients { get; set; } = new();
 		public int ExecutorId { get; set; }
 	}