diff --git a/LawCompany/LawCompanyContracts/BindingModels/CaseBindingModel.cs b/LawCompany/LawCompanyContracts/BindingModels/CaseBindingModel.cs index 4ad97c4..d4de75e 100644 --- a/LawCompany/LawCompanyContracts/BindingModels/CaseBindingModel.cs +++ b/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 CaseClients { get; set; } = new(); diff --git a/LawCompany/LawCompanyContracts/BindingModels/MailConfigBindingModel.cs b/LawCompany/LawCompanyContracts/BindingModels/MailConfigBindingModel.cs index 1529f7a..2033d09 100644 --- a/LawCompany/LawCompanyContracts/BindingModels/MailConfigBindingModel.cs +++ b/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; diff --git a/LawCompany/LawCompanyContracts/BindingModels/MailSendInfoBindingModel.cs b/LawCompany/LawCompanyContracts/BindingModels/MailSendInfoBindingModel.cs index 238090e..cfd73ed 100644 --- a/LawCompany/LawCompanyContracts/BindingModels/MailSendInfoBindingModel.cs +++ b/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; diff --git a/LawCompany/LawCompanyContracts/BindingModels/ReportExecutorBindingModel.cs b/LawCompany/LawCompanyContracts/BindingModels/ReportExecutorBindingModel.cs index e3c3b6e..5f9afcf 100644 --- a/LawCompany/LawCompanyContracts/BindingModels/ReportExecutorBindingModel.cs +++ b/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; } diff --git a/LawCompany/LawCompanyContracts/BindingModels/ReportGuarantorBindingModel.cs b/LawCompany/LawCompanyContracts/BindingModels/ReportGuarantorBindingModel.cs index 0a3c53c..2f357d6 100644 --- a/LawCompany/LawCompanyContracts/BindingModels/ReportGuarantorBindingModel.cs +++ b/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; diff --git a/LawCompany/LawCompanyContracts/BindingModels/VisitBindingModel.cs b/LawCompany/LawCompanyContracts/BindingModels/VisitBindingModel.cs index 45d4470..f7cdd92 100644 --- a/LawCompany/LawCompanyContracts/BindingModels/VisitBindingModel.cs +++ b/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 VisitClients { get; set; } = new(); public int ExecutorId { get; set; } } diff --git a/LawCompany/LawCompanyContracts/BusinessLogicContracts/ICaseLogic.cs b/LawCompany/LawCompanyContracts/BusinessLogicContracts/ICaseLogic.cs index 59d0a27..5abbac9 100644 --- a/LawCompany/LawCompanyContracts/BusinessLogicContracts/ICaseLogic.cs +++ b/LawCompany/LawCompanyContracts/BusinessLogicContracts/ICaseLogic.cs @@ -10,11 +10,7 @@ namespace LawCompanyContracts.BusinessLogicContracts List? 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); } } diff --git a/LawCompany/LawCompanyContracts/BusinessLogicContracts/IReportExecutorLogic.cs b/LawCompany/LawCompanyContracts/BusinessLogicContracts/IReportExecutorLogic.cs index 0dde835..bf62784 100644 --- a/LawCompany/LawCompanyContracts/BusinessLogicContracts/IReportExecutorLogic.cs +++ b/LawCompany/LawCompanyContracts/BusinessLogicContracts/IReportExecutorLogic.cs @@ -8,12 +8,12 @@ using LawCompanyContracts.ViewModels; namespace LawCompanyContracts.BusinessLogicContracts { - internal class IReportExecutorLogic + public interface IReportExecutorLogic { - List GetClientCaseBooking(List Ids); - List GetClients(ReportOrganiserBindingModel model); - void SaveClientCaseToWordFile(ReportOrganiserBindingModel model); - void SaveClientCaseToExcelFile(ReportOrganiserBindingModel model); - void SaveClientsToPdfFile(ReportOrganiserBindingModel model); + List GetClientHearing(List Ids); + List GetClients(ReportExecutorBindingModel model); + void SaveClientHearingToWordFile(ReportExecutorBindingModel model); + void SaveClientHearingToExcelFile(ReportExecutorBindingModel model); + void SaveClientsToPdfFile(ReportExecutorBindingModel model); } } diff --git a/LawCompany/LawCompanyContracts/BusinessLogicContracts/IReportGuarantorLogic.cs b/LawCompany/LawCompanyContracts/BusinessLogicContracts/IReportGuarantorLogic.cs index fd17484..5dc6859 100644 --- a/LawCompany/LawCompanyContracts/BusinessLogicContracts/IReportGuarantorLogic.cs +++ b/LawCompany/LawCompanyContracts/BusinessLogicContracts/IReportGuarantorLogic.cs @@ -8,7 +8,7 @@ using LawCompanyContracts.ViewModels; namespace LawCompanyContracts.BusinessLogicContracts { - internal class IReportGuarantorLogic + public interface IReportGuarantorLogic { List GetLawyerHearing(List Ids); List GetLawyers(ReportGuarantorBindingModel model); diff --git a/LawCompany/LawCompanyContracts/SearchModels/CaseSearchModel.cs b/LawCompany/LawCompanyContracts/SearchModels/CaseSearchModel.cs index 0a9ce15..96249fb 100644 --- a/LawCompany/LawCompanyContracts/SearchModels/CaseSearchModel.cs +++ b/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; } diff --git a/LawCompany/LawCompanyContracts/ViewModels/CaseViewModel.cs b/LawCompany/LawCompanyContracts/ViewModels/CaseViewModel.cs index 54f6884..3aaa0a8 100644 --- a/LawCompany/LawCompanyContracts/ViewModels/CaseViewModel.cs +++ b/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("Дата выполнения")] diff --git a/LawCompany/LawCompanyContracts/ViewModels/ConsultationViewModel.cs b/LawCompany/LawCompanyContracts/ViewModels/ConsultationViewModel.cs index 518d224..f2138f2 100644 --- a/LawCompany/LawCompanyContracts/ViewModels/ConsultationViewModel.cs +++ b/LawCompany/LawCompanyContracts/ViewModels/ConsultationViewModel.cs @@ -16,5 +16,6 @@ namespace LawCompanyContracts.ViewModels public int CaseId { get; set; } public int GuarantorId { get; set; } public Dictionary ConsultationLawyers { get; set; } = new(); - } + public CaseViewModel Case { get; set; } + } } \ No newline at end of file diff --git a/LawCompany/LawCompanyContracts/ViewModels/ReportClientHearingViewModel.cs b/LawCompany/LawCompanyContracts/ViewModels/ReportClientHearingViewModel.cs new file mode 100644 index 0000000..1f54add --- /dev/null +++ b/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> Hearing { get; set; } = new(); + } +} diff --git a/LawCompany/LawCompanyContracts/ViewModels/ReportClientsViewModel.cs b/LawCompany/LawCompanyContracts/ViewModels/ReportClientsViewModel.cs index cb2b26a..6a9d338 100644 --- a/LawCompany/LawCompanyContracts/ViewModels/ReportClientsViewModel.cs +++ b/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; } } } diff --git a/LawCompany/LawCompanyContracts/ViewModels/ReportLawyerHearingViewModel.cs b/LawCompany/LawCompanyContracts/ViewModels/ReportLawyerHearingViewModel.cs index 324594e..ac438d7 100644 --- a/LawCompany/LawCompanyContracts/ViewModels/ReportLawyerHearingViewModel.cs +++ b/LawCompany/LawCompanyContracts/ViewModels/ReportLawyerHearingViewModel.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace LawCompanyContracts.ViewModels { - internal class ReportLawyerHearingViewModel + public class ReportLawyerHearingViewModel { } } diff --git a/LawCompany/LawCompanyContracts/ViewModels/ReportLawyersViewModel.cs b/LawCompany/LawCompanyContracts/ViewModels/ReportLawyersViewModel.cs index 0f08ed1..2e78203 100644 --- a/LawCompany/LawCompanyContracts/ViewModels/ReportLawyersViewModel.cs +++ b/LawCompany/LawCompanyContracts/ViewModels/ReportLawyersViewModel.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace LawCompanyContracts.ViewModels { - internal class ReportLawyersViewModel + public class ReportLawyersViewModel { } } diff --git a/LawCompany/LawCompanyContracts/ViewModels/VisitViewModel.cs b/LawCompany/LawCompanyContracts/ViewModels/VisitViewModel.cs index db98b12..aa2322f 100644 --- a/LawCompany/LawCompanyContracts/ViewModels/VisitViewModel.cs +++ b/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 VisitClients { get; set; } = new(); public int ExecutorId { get; set; } }