From 547bcbea64e29978027623f42090d6a4b54f079f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=93=D0=B0=D0=BB=D0=B8=D0=BD=D0=B0=20=D0=A4=D0=B5=D0=B4?= =?UTF-8?q?=D0=BE=D1=80=D0=B5=D0=BD=D0=BA=D0=BE?= Date: Thu, 30 May 2024 11:11:48 +0400 Subject: [PATCH] =?UTF-8?q?=D1=8D=D1=82=D0=BE=20=D0=BA=D0=BE=D0=BD=D0=B5?= =?UTF-8?q?=D1=86...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LawFirmBusinessLogic/BusinessLogics/ReportLogic.cs | 5 ++++- .../LawFirmBusinessLogic/MailWorker/MailKitWorker.cs | 2 +- .../AbstractSaveToPdfClientCaseHearing.cs | 5 ----- .../BusinessLogicContracts/IReportLogic.cs | 1 + .../LawFirmExecutorApp/Controllers/ClientController.cs | 1 + .../Controllers/ReportExecutorController.cs | 2 +- .../Controllers/ReportGuarantorController.cs | 10 +++++----- LawFim/LawFirmRestApi/Program.cs | 1 + 8 files changed, 14 insertions(+), 13 deletions(-) diff --git a/LawFim/LawFirmBusinessLogic/BusinessLogics/ReportLogic.cs b/LawFim/LawFirmBusinessLogic/BusinessLogics/ReportLogic.cs index ca6b105..dc1c3bb 100644 --- a/LawFim/LawFirmBusinessLogic/BusinessLogics/ReportLogic.cs +++ b/LawFim/LawFirmBusinessLogic/BusinessLogics/ReportLogic.cs @@ -39,7 +39,9 @@ namespace LawFirmBusinessLogic.BusinessLogics AbstractSaveToExcelVisitsLawyer saveToExcelVisitLawyer, AbstractSaveToWordVisitsLawyer saveToWordVisitLawyer, AbstractSaveToPdfConsultationHearing saveToPdfConsultationHearing, - AbstractSaveToPdfCaseHearing saveToPdfCaseHearing + AbstractSaveToPdfCaseHearing saveToPdfCaseHearing, + + AbstractSaveToPdfClientCaseHearing saveToPdfClientCaseHearing ) { _clientStorage = clientStorage; @@ -55,6 +57,7 @@ namespace LawFirmBusinessLogic.BusinessLogics _saveToWordVisitLawyer = saveToWordVisitLawyer; _saveToPdfConsultationHearing = saveToPdfConsultationHearing; _saveToPdfCaseHearing = saveToPdfCaseHearing; + _saveToPdfClientCaseHearing = saveToPdfClientCaseHearing; } public List GetClientsConsultation(ReportBindingModel model) { diff --git a/LawFim/LawFirmBusinessLogic/MailWorker/MailKitWorker.cs b/LawFim/LawFirmBusinessLogic/MailWorker/MailKitWorker.cs index 05e4cab..3d5372f 100644 --- a/LawFim/LawFirmBusinessLogic/MailWorker/MailKitWorker.cs +++ b/LawFim/LawFirmBusinessLogic/MailWorker/MailKitWorker.cs @@ -25,7 +25,7 @@ namespace LawFirmBusinessLogic.MailWorker objMailMessage.Body = info.Text; objMailMessage.SubjectEncoding = Encoding.UTF8; objMailMessage.BodyEncoding = Encoding.UTF8; - Attachment attachment = new Attachment("E:\\reports\\pdf\\file.pdf", new ContentType(MediaTypeNames.Application.Pdf)); + Attachment attachment = new Attachment("E:\\reports\\file.pdf", new ContentType(MediaTypeNames.Application.Pdf)); //Attachment attachment = new Attachment("D:\\CourseWork\\pdffile.pdf", new ContentType(MediaTypeNames.Application.Pdf)); objMailMessage.Attachments.Add(attachment); diff --git a/LawFim/LawFirmBusinessLogic/OfficePackages/AbstractSaveToPdfClientCaseHearing.cs b/LawFim/LawFirmBusinessLogic/OfficePackages/AbstractSaveToPdfClientCaseHearing.cs index 6d5287c..47ce5ea 100644 --- a/LawFim/LawFirmBusinessLogic/OfficePackages/AbstractSaveToPdfClientCaseHearing.cs +++ b/LawFim/LawFirmBusinessLogic/OfficePackages/AbstractSaveToPdfClientCaseHearing.cs @@ -1,10 +1,5 @@ using LawFirmBusinessLogic.OfficePackages.HelperEnums; using LawFirmBusinessLogic.OfficePackages.HelperModels; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace LawFirmBusinessLogic.OfficePackages { diff --git a/LawFim/LawFirmContracts/BusinessLogicContracts/IReportLogic.cs b/LawFim/LawFirmContracts/BusinessLogicContracts/IReportLogic.cs index 037db90..d1f04c7 100644 --- a/LawFim/LawFirmContracts/BusinessLogicContracts/IReportLogic.cs +++ b/LawFim/LawFirmContracts/BusinessLogicContracts/IReportLogic.cs @@ -10,6 +10,7 @@ namespace LawFirmContracts.BusinessLogicContracts List GetVisitLawyer(ReportVisitLawyerBindingModel model); List GetConsultationHearing(ReportConsultationHearingBindingModel model); List GetCaseHearing(ReportCaseHearingBindingModel model); + List GetClientCaseHearing(ReportClientCaseHearingBindingModel model); void SaveClientsConsultationToWordFile(ReportBindingModel model); void SaveClientsConsultationToExcelFile(ReportBindingModel model); diff --git a/LawFim/LawFirmExecutorApp/Controllers/ClientController.cs b/LawFim/LawFirmExecutorApp/Controllers/ClientController.cs index 17e40b0..5807959 100644 --- a/LawFim/LawFirmExecutorApp/Controllers/ClientController.cs +++ b/LawFim/LawFirmExecutorApp/Controllers/ClientController.cs @@ -156,6 +156,7 @@ namespace LawFirmExecutorApp.Controllers DateTo = dateTo, Email = APIClient.Executor.Email, ClientId = clientId + }); Response.Redirect("SendMail"); diff --git a/LawFim/LawFirmRestApi/Controllers/ReportExecutorController.cs b/LawFim/LawFirmRestApi/Controllers/ReportExecutorController.cs index b47f0b1..3157f04 100644 --- a/LawFim/LawFirmRestApi/Controllers/ReportExecutorController.cs +++ b/LawFim/LawFirmRestApi/Controllers/ReportExecutorController.cs @@ -42,7 +42,7 @@ namespace LawFirmRestApi.Controllers } } [HttpPost] - public void SaveCaseHearingToPdfFile(ReportClientCaseHearingBindingModel report) + public void SaveClientCaseHearingToPdfFile(ReportClientCaseHearingBindingModel report) { try { diff --git a/LawFim/LawFirmRestApi/Controllers/ReportGuarantorController.cs b/LawFim/LawFirmRestApi/Controllers/ReportGuarantorController.cs index 81e40a8..c3b25b6 100644 --- a/LawFim/LawFirmRestApi/Controllers/ReportGuarantorController.cs +++ b/LawFim/LawFirmRestApi/Controllers/ReportGuarantorController.cs @@ -32,7 +32,7 @@ namespace LawFirmRestApi.Controllers { DateFrom = report.DateFrom, DateTo = report.DateTo, - FileName = "D:\\CourseWork\\pdfConsultationHearingsReport.pdf", + FileName = "E:\\reports\\pdfConsultationHearingsReport.pdf", GuarantorId = report.GuarantorId, }); } @@ -51,7 +51,7 @@ namespace LawFirmRestApi.Controllers { DateFrom = report.DateFrom, DateTo = report.DateTo, - FileName = "D:\\CourseWork\\pdfCaseHearingsReport.pdf", + FileName = "E:\\reports\\pdfCaseHearingsReport.pdf", GuarantorId = report.GuarantorId, LawyerId =report.LawyerId, }); @@ -70,7 +70,7 @@ namespace LawFirmRestApi.Controllers _reportLogic.SaveVisitLawyerToWordFile(new ReportVisitLawyerBindingModel { GuarantorId = report.GuarantorId, - FileName = "D:\\CourseWork\\wordVisitLawyerReport.docx", + FileName = "E:\\reports\\wordVisitLawyerReport.docx", LawyerId = report.LawyerId }); } @@ -88,7 +88,7 @@ namespace LawFirmRestApi.Controllers _reportLogic.SaveVisitLawyerToExcelFile(new ReportVisitLawyerBindingModel { GuarantorId = report.GuarantorId, - FileName = "D:\\CourseWork\\excelVisitLawyerReport.xlsx", + FileName = "E:\\reports\\excelVisitLawyerReport.xlsx", LawyerId = report.LawyerId }); } @@ -108,7 +108,7 @@ namespace LawFirmRestApi.Controllers { DateFrom = report.DateFrom, DateTo = report.DateTo, - FileName = "D:\\CourseWork\\pdffile.pdf", + FileName = "E:\\reports\\pdffile.pdf", GuarantorId = report.GuarantorId, LawyerId = report.LawyerId, Email = report.Email, diff --git a/LawFim/LawFirmRestApi/Program.cs b/LawFim/LawFirmRestApi/Program.cs index aef144f..ca573eb 100644 --- a/LawFim/LawFirmRestApi/Program.cs +++ b/LawFim/LawFirmRestApi/Program.cs @@ -46,6 +46,7 @@ builder.Services.AddTransient(); builder.Services.AddTransient(); builder.Services.AddTransient(); +builder.Services.AddTransient(); builder.Services.AddSingleton(); builder.Services.AddControllers();