diff --git a/LawFirm/LawFirmBusinessLogic/BusinessLogics/ReportLogic.cs b/LawFirm/LawFirmBusinessLogic/BusinessLogics/ReportLogic.cs index 7493913..aaa3db7 100644 --- a/LawFirm/LawFirmBusinessLogic/BusinessLogics/ReportLogic.cs +++ b/LawFirm/LawFirmBusinessLogic/BusinessLogics/ReportLogic.cs @@ -50,9 +50,9 @@ namespace LawFirmBusinessLogic.BusinessLogics } public List GetClientsHearing(ReportBindingModel model) { - var clients = _clientStorage.GetFilteredList(new ClientSearchModel {Id = model.ClientId}); + var clients = _clientStorage.GetFilteredList(new ClientSearchModel {Id = model.ClientId, CompanyId = model.CompanyId}); var hearings = _hearingStorage.GetFullList(); - var cases = _caseStorage.GetFullList(); + var cases = _caseStorage.GetFilteredList(new CaseSearchModel { CompanyId = model.CompanyId}); var list = new List(); foreach (var client in clients) @@ -73,6 +73,8 @@ namespace LawFirmBusinessLogic.BusinessLogics { record.Hearings.Add(new(hear.Court, hear.HearingDate)); record.CaseName = cas.Name; + record.Court = hear.Court; + record.HearingDate = hear.HearingDate; } } @@ -127,7 +129,7 @@ namespace LawFirmBusinessLogic.BusinessLogics list.Add(new ReportClientsViewModel { Id = casId, - FIO = clients.FirstOrDefault(x => x.Id == 4).FIO , + FIO = clients.FirstOrDefault(x => x.Id == casId).FIO , CaseName = cas.Name, VisitDate = visit.VisitDate @@ -153,6 +155,7 @@ namespace LawFirmBusinessLogic.BusinessLogics { Id = model.LawyerId }); + //getfilteredlist var consultations = _consultationStorage.GetFullList(); var visits = _visitStorage.GetFullList(); foreach(var lawyer in lawyers) @@ -173,6 +176,8 @@ namespace LawFirmBusinessLogic.BusinessLogics if (visit.ConsultationId.Equals(consultation.Id)) { record.Visits.Add(visit.VisitDate); + //record.VisitDate= visit.VisitDate; + } } @@ -188,11 +193,12 @@ namespace LawFirmBusinessLogic.BusinessLogics public List GetConsultationHearing(ReportBindingModel model) { var list = new List(); + //getfiltered var lawyers = _lawyerStorage.GetFullList(); var consultations = _consultationStorage.GetFullList(); var visits = _visitStorage.GetFilteredList(new VisitSearchModel { - + DateFrom = model.DateFrom, DateTo = model.DateTo diff --git a/LawFirm/LawFirmBusinessLogic/BusinessLogics/UserLogic.cs b/LawFirm/LawFirmBusinessLogic/BusinessLogics/UserLogic.cs index d08e31d..6d661f0 100644 --- a/LawFirm/LawFirmBusinessLogic/BusinessLogics/UserLogic.cs +++ b/LawFirm/LawFirmBusinessLogic/BusinessLogics/UserLogic.cs @@ -8,6 +8,7 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; +using System.Text.RegularExpressions; using System.Threading.Tasks; namespace LawFirmBusinessLogic.BusinessLogics @@ -108,7 +109,11 @@ namespace LawFirmBusinessLogic.BusinessLogics throw new ArgumentNullException("Нет e-mail пользователя", nameof(model.Email)); } - if (string.IsNullOrEmpty(model.Password)) + if (!Regex.IsMatch(model.Email, @"\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*")) + { + throw new ArgumentException("Некорректно введен email ", nameof(model.Email)); + } + if (string.IsNullOrEmpty(model.Password)) { throw new ArgumentNullException("У пользователя не указан пароль", nameof(model.Password)); diff --git a/LawFirm/LawFirmBusinessLogic/MailWorker/AbstractMailWorker.cs b/LawFirm/LawFirmBusinessLogic/MailWorker/AbstractMailWorker.cs index 1572984..8dbfa07 100644 --- a/LawFirm/LawFirmBusinessLogic/MailWorker/AbstractMailWorker.cs +++ b/LawFirm/LawFirmBusinessLogic/MailWorker/AbstractMailWorker.cs @@ -1,4 +1,5 @@ using LawFirmContracts.BindingModels.Mails; +using LawFirmContracts.BusinessLogicContracts; using Microsoft.Extensions.Logging; using System; using System.Collections.Generic; @@ -10,16 +11,18 @@ namespace LawFirmBusinessLogic.MailWorker { public abstract class AbstractMailWorker { - protected string _mailLogin = string.Empty; - protected string _mailPassword = string.Empty; - protected string _smtpClientHost = string.Empty; - protected int _smtpClientPort; - protected string _popHost = string.Empty; - protected int _popPort; + protected string _mailLogin = "lab7rpp@gmail.com"; + protected string _mailPassword = "bzoh xhcm oecc glud"; + protected string _smtpClientHost = "smtp.gmail.com"; + protected int _smtpClientPort = 587; + protected string _popHost = "pop.gmail.com"; + protected int _popPort = 995; private readonly ILogger _logger; - public AbstractMailWorker(ILogger logger) + private readonly IUserLogic _userLogic; + public AbstractMailWorker(ILogger logger, IUserLogic userLogic) { _logger = logger; + _userLogic = userLogic; } public void MailConfig(MailConfigBindingModel config) @@ -56,6 +59,6 @@ namespace LawFirmBusinessLogic.MailWorker protected abstract Task SendMailAsync(MailSendInfoBindingModel info); - //ReceiveMailAsync(); + } } diff --git a/LawFirm/LawFirmBusinessLogic/MailWorker/MailKitWorker.cs b/LawFirm/LawFirmBusinessLogic/MailWorker/MailKitWorker.cs index 4eceedc..d08b5ad 100644 --- a/LawFirm/LawFirmBusinessLogic/MailWorker/MailKitWorker.cs +++ b/LawFirm/LawFirmBusinessLogic/MailWorker/MailKitWorker.cs @@ -7,12 +7,14 @@ using System.Net; using System.Text; using System.Threading.Tasks; using LawFirmContracts.BindingModels.Mails; +using System.Net.Mime; +using LawFirmContracts.BusinessLogicContracts; namespace LawFirmBusinessLogic.MailWorker { public class MailKitWorker: AbstractMailWorker { - public MailKitWorker(ILogger logger) : base(logger) { } + public MailKitWorker(ILogger logger, IUserLogic userLogic) : base(logger, userLogic) { } protected override async Task SendMailAsync(MailSendInfoBindingModel info) { @@ -26,7 +28,9 @@ namespace LawFirmBusinessLogic.MailWorker objMailMessage.Body = info.Text; objMailMessage.SubjectEncoding = Encoding.UTF8; objMailMessage.BodyEncoding = Encoding.UTF8; - + Attachment attachment = new Attachment("C:\\Users\\User\\Desktop\\универ\\2курс\\рпп\\второйсеместр\\Курсовая\\pdfclientsreport.pdf", new ContentType(MediaTypeNames.Application.Pdf)); + objMailMessage.Attachments.Add(attachment); + objSmtpClient.UseDefaultCredentials = false; objSmtpClient.EnableSsl = true; objSmtpClient.DeliveryMethod = SmtpDeliveryMethod.Network; diff --git a/LawFirm/LawFirmBusinessLogic/OfficePackages/AbstractSaveToExcelClientsHearing.cs b/LawFirm/LawFirmBusinessLogic/OfficePackages/AbstractSaveToExcelClientsHearing.cs index c3d0788..a15c7d7 100644 --- a/LawFirm/LawFirmBusinessLogic/OfficePackages/AbstractSaveToExcelClientsHearing.cs +++ b/LawFirm/LawFirmBusinessLogic/OfficePackages/AbstractSaveToExcelClientsHearing.cs @@ -46,7 +46,7 @@ namespace LawFirmBusinessLogic.OfficePackages { ColumnName = "B", RowIndex = rowIndex, - Text = hearing.Item1, + Text = hearing.Court, StyleInfo = ExcelStyleInfoType.TextWithBroder }); @@ -54,7 +54,7 @@ namespace LawFirmBusinessLogic.OfficePackages { ColumnName = "C", RowIndex = rowIndex, - Text = hearing.Item2.ToString(), + Text = hearing.HearingDate.ToString(), StyleInfo = ExcelStyleInfoType.TextWithBroder }); diff --git a/LawFirm/LawFirmClientApp/Controllers/ReportController.cs b/LawFirm/LawFirmClientApp/Controllers/ReportController.cs index cb004f5..5c41155 100644 --- a/LawFirm/LawFirmClientApp/Controllers/ReportController.cs +++ b/LawFirm/LawFirmClientApp/Controllers/ReportController.cs @@ -1,4 +1,5 @@ using LawFirmContracts.BindingModels; +using LawFirmContracts.BindingModels.Mails; using LawFirmContracts.ViewModels; using Microsoft.AspNetCore.Mvc; @@ -40,6 +41,34 @@ namespace LawFirmClientApp.Controllers CompanyId = APIClient.User.CompanyId }); } + [HttpPost] + + public void LoadReportClientsHearingWord(int clientId) + { + if (APIClient.User == null) + { + Redirect("~/Home/Enter"); + } + + APIClient.PostRequest($"api/report/saveclientswordfile", new ReportBindingModel + { + + CompanyId = APIClient.User.CompanyId, + ClientId = clientId + }); + } + [HttpGet] + + public IActionResult GetReportClientsHearing(int clientId) + { + ViewBag.Clients = APIClient.GetRequest>($"api/client/getclientlist?companyId={APIClient.User.CompanyId}"); + if (APIClient.User == null) + { + return Redirect("~/Home/Enter"); + } + + return View(APIClient.GetRequest>($"api/report/getclientsreporthearing?clientid={clientId}&companyId={APIClient.User.CompanyId}")); + } [HttpGet] public IActionResult LoadReportClients(DateTime dateFrom, DateTime dateTo, string a) @@ -63,7 +92,39 @@ namespace LawFirmClientApp.Controllers return View(APIClient.GetRequest>($"api/report/getclientsreport?datefrom={dateFrom}&dateTo={dateTo}&companyId={APIClient.User.CompanyId}")); } + + [HttpPost] + public void LoadReportClientsHearingExcel(int clientId) + { + if (APIClient.User == null) + { + Redirect("~/Home/Enter"); + } + APIClient.PostRequest($"api/report/saveclientsexcelfile", new ReportBindingModel + { + + CompanyId = APIClient.User.CompanyId, + ClientId = clientId + }); + } + [HttpPost] + public void SendClientsPdf(DateTime dateFrom, DateTime dateTo, string organiserEmail) + { + APIClient.PostRequest($"api/report/saveclientspdffile", new ReportBindingModel + { + DateFrom = dateFrom, + DateTo = dateTo, + CompanyId = APIClient.User.CompanyId + }); + APIClient.PostRequest("api/report/mailsend", new MailSendInfoBindingModel + { + MailAddress = "dimazhelovanov@gmail.com", + Subject = "Отчет по клиентам", + Text = "Отчет по клиентам с " + dateFrom.ToShortDateString() + " до " + dateTo.ToShortDateString() + }); + + } } } diff --git a/LawFirm/LawFirmClientApp/Views/Report/CreateReportClients.cshtml b/LawFirm/LawFirmClientApp/Views/Report/CreateReportClients.cshtml index e256db1..2ae608a 100644 --- a/LawFirm/LawFirmClientApp/Views/Report/CreateReportClients.cshtml +++ b/LawFirm/LawFirmClientApp/Views/Report/CreateReportClients.cshtml @@ -16,7 +16,8 @@
- + +
От
@@ -82,6 +83,7 @@ }
+ \ No newline at end of file diff --git a/LawFirm/LawFirmClientApp/Views/Report/GetReportClientsHearing.cshtml b/LawFirm/LawFirmClientApp/Views/Report/GetReportClientsHearing.cshtml new file mode 100644 index 0000000..3da4160 --- /dev/null +++ b/LawFirm/LawFirmClientApp/Views/Report/GetReportClientsHearing.cshtml @@ -0,0 +1,101 @@ +@using LawFirmContracts.ViewModels; + +@model List +@{ + ViewData["Title"] = "Отчёт по клиентам"; + Layout = "~/Views/Shared/_LayoutIspol.cshtml"; +} + + + +
+

Отчёт по клиентам

+
+
+ @{ + + + + + +
+ +
+ + + + + + + + + + + + + + + + + + @foreach (var item in Model) + { + + + + + + + + + } + +
+ Имя клиента + + Дело + + Суд + + Дата слушания +
+ @Html.DisplayFor(modelItem => + item.ClientFIO) + + @Html.DisplayFor(modelItem => + item.CaseName) + + @Html.DisplayFor(modelItem => + item.Court) + + @Html.DisplayFor(modelItem => + item.HearingDate) +
+ } +
+ + \ No newline at end of file diff --git a/LawFirm/LawFirmClientApp/Views/Shared/_LayoutIspol.cshtml b/LawFirm/LawFirmClientApp/Views/Shared/_LayoutIspol.cshtml index b41d86b..09c18db 100644 --- a/LawFirm/LawFirmClientApp/Views/Shared/_LayoutIspol.cshtml +++ b/LawFirm/LawFirmClientApp/Views/Shared/_LayoutIspol.cshtml @@ -32,7 +32,10 @@ Личные данные
  • - Отчёт по сотрудникам + Отчёт по клиентам +
    • +
  • + Отчёт по слушаниям
  • Регистрация diff --git a/LawFirm/LawFirmContracts/ViewModels/ReportClientsHearingViewModel.cs b/LawFirm/LawFirmContracts/ViewModels/ReportClientsHearingViewModel.cs index 6274899..3abb145 100644 --- a/LawFirm/LawFirmContracts/ViewModels/ReportClientsHearingViewModel.cs +++ b/LawFirm/LawFirmContracts/ViewModels/ReportClientsHearingViewModel.cs @@ -11,6 +11,8 @@ namespace LawFirmContracts.ViewModels public string ClientFIO { get; set; } = string.Empty; //Это нужно? public string CaseName { get; set; } = string.Empty; + public string? Court { get; set; } = string.Empty; + public DateTime? HearingDate { get; set; } public List<(string Court, DateTime HearingDate)> Hearings { get; set; } = new(); public List Cases { get; set; } = new(); diff --git a/LawFirm/LawFirmDatabaseImplement/Implements/ClientStorage.cs b/LawFirm/LawFirmDatabaseImplement/Implements/ClientStorage.cs index f5dbe9e..e6b7e25 100644 --- a/LawFirm/LawFirmDatabaseImplement/Implements/ClientStorage.cs +++ b/LawFirm/LawFirmDatabaseImplement/Implements/ClientStorage.cs @@ -39,6 +39,14 @@ namespace LawFirmDatabaseImplement.Implements .Select(x => x.GetViewModel) .ToList(); } + else if (model.CompanyId.HasValue && model.Id.HasValue) + { + using var context = new LawFirmDatabase(); + return context.Clients + .Where(x => x.Id == model.Id) + .Select(x => x.GetViewModel) + .ToList(); + } else if (model.CompanyId.HasValue) { using var context = new LawFirmDatabase(); diff --git a/LawFirm/LawFirmDatabaseImplement/Models/Visit.cs b/LawFirm/LawFirmDatabaseImplement/Models/Visit.cs index 5eeb63a..452bb14 100644 --- a/LawFirm/LawFirmDatabaseImplement/Models/Visit.cs +++ b/LawFirm/LawFirmDatabaseImplement/Models/Visit.cs @@ -31,11 +31,14 @@ namespace LawFirmDatabaseImplement.Models { get { - if (_visitClients == null) + + if (_visitClients == null) { - _visitClients = Clients - .ToDictionary(recPC => recPC.ClientId, recPC => recPC.Client as IClientModel); - } + using var context = new LawFirmDatabase(); + _visitClients = Clients + .ToDictionary(x => x.ClientId, x => (context.Clients + .FirstOrDefault(y => y.Id == x.ClientId) as IClientModel)); + } return _visitClients; } } @@ -48,6 +51,11 @@ namespace LawFirmDatabaseImplement.Models { return null; } + var visits = context.Visits.Where(x => x.ConsultationId == model.ConsultationId).ToList(); + if(visits.Count > 0) + { + return null; + } return new Visit() { Id = model.Id, @@ -65,17 +73,18 @@ namespace LawFirmDatabaseImplement.Models public void Update(VisitBindingModel? model) { using var context = new LawFirmDatabase(); + + + if (model == null) { return; } - VisitDate = model.VisitDate; + + VisitDate = model.VisitDate; ConsultationId = model.ConsultationId; - Clients = model.VisitClients.Select(x => new - VisitClient - { - Client = context.Clients.First(y => y.Id == x.Key) - }).ToList(); + + if (!model.CompanyId.HasValue) CompanyId = model.CompanyId; } public VisitViewModel GetViewModel => new() diff --git a/LawFirm/LawFirmRestApi/Controllers/ReportController.cs b/LawFirm/LawFirmRestApi/Controllers/ReportController.cs index 42a931f..3bfd54b 100644 --- a/LawFirm/LawFirmRestApi/Controllers/ReportController.cs +++ b/LawFirm/LawFirmRestApi/Controllers/ReportController.cs @@ -1,6 +1,7 @@ using DocumentFormat.OpenXml.Bibliography; using LawFirmBusinessLogic.MailWorker; using LawFirmContracts.BindingModels; +using LawFirmContracts.BindingModels.Mails; using LawFirmContracts.BusinessLogicContracts; using LawFirmContracts.ViewModels; using Microsoft.AspNetCore.Mvc; @@ -14,12 +15,12 @@ namespace LawFirmRestApi.Controllers private readonly ILogger _logger; private readonly IReportLogic _reportLogic; - //private readonly AbstractMailWorker _mailWorker; - public ReportController(ILogger logger, IReportLogic reportLogic) + private readonly AbstractMailWorker _mailWorker; + public ReportController(ILogger logger, IReportLogic reportLogic, AbstractMailWorker abstractMailWorker) { _logger = logger; _reportLogic = reportLogic; - //_mailWorker = mailWorker; + _mailWorker = abstractMailWorker; } [HttpPost] public void SaveClientsPdfFile(ReportBindingModel report) @@ -41,6 +42,50 @@ namespace LawFirmRestApi.Controllers throw; } } + [HttpPost] + public void SaveClientsWordFile(ReportBindingModel report) + { + try + { + _reportLogic.SaveClientsHearingToWordFile(new ReportBindingModel { CompanyId = report.CompanyId, FileName = "C:\\Users\\User\\Desktop\\универ\\2курс\\рпп\\второйсеместр\\Курсовая\\wordclientsreport.docx", ClientId = report.ClientId }); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка создания отчета"); + throw; + } + } + [HttpPost] + public void SaveClientsExcelFile(ReportBindingModel report) + { + try + { + _reportLogic.SaveClientsHearingToExcelFile(new ReportBindingModel { CompanyId = report.CompanyId, FileName = "C:\\Users\\User\\Desktop\\универ\\2курс\\рпп\\второйсеместр\\Курсовая\\excelclientsreport.xlsx", ClientId = report.ClientId }); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка создания отчета"); + throw; + } + } + [HttpPost] + public void MailSend(MailSendInfoBindingModel report) + { + try + { + _mailWorker.MailSendAsync(new MailSendInfoBindingModel + { + MailAddress = report.MailAddress, + Subject = report.Subject, + Text = report.Text + }); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка отправки письма"); + throw; + } + } [HttpGet] public List GetClientsReport(DateTime dateFrom, DateTime dateTo, int companyId) { @@ -54,6 +99,19 @@ namespace LawFirmRestApi.Controllers throw; } } + [HttpGet] + public List GetClientsReportHearing(int clientId, int companyId) + { + try + { + return _reportLogic.GetClientsHearing(new ReportBindingModel { ClientId = clientId,CompanyId = companyId }); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка создания отчета"); + throw; + } + } } } diff --git a/LawFirm/LawFirmRestApi/Program.cs b/LawFirm/LawFirmRestApi/Program.cs index 51e54b2..6afe4d3 100644 --- a/LawFirm/LawFirmRestApi/Program.cs +++ b/LawFirm/LawFirmRestApi/Program.cs @@ -1,7 +1,9 @@ using LawFirmBusinessLogic.BusinessLogics; +using LawFirmBusinessLogic.MailWorker; using LawFirmBusinessLogic.OfficePackages; using LawFirmBusinessLogic.OfficePackages.Implements; using LawFirmContracts.BindingModels; +using LawFirmContracts.BindingModels.Mails; using LawFirmContracts.BusinessLogicContracts; using LawFirmContracts.StoragesContracts; using LawFirmContracts.ViewModels; @@ -44,6 +46,7 @@ builder.Services.AddTransient(); builder.Services.AddTransient(); builder.Services.AddTransient(); +builder.Services.AddTransient(); builder.Services.AddControllers(); @@ -57,6 +60,17 @@ builder.Services.AddSwaggerGen(c => c.SwaggerDoc("v1", new OpenApiInfo })); var app = builder.Build(); +var mailSender = app.Services.GetService(); + +mailSender?.MailConfig(new MailConfigBindingModel +{ + MailLogin = builder.Configuration?.GetSection("MailLogin")?.Value?.ToString() ?? string.Empty, + MailPassword = builder.Configuration?.GetSection("MailPassword")?.Value?.ToString() ?? string.Empty, + SmtpClientHost = builder.Configuration?.GetSection("SmtpClientHost")?.Value?.ToString() ?? string.Empty, + SmtpClientPort = Convert.ToInt32(builder.Configuration?.GetSection("SmtpClientPort")?.Value?.ToString()), + PopHost = builder.Configuration?.GetSection("PopHost")?.Value?.ToString() ?? string.Empty, + PopPort = Convert.ToInt32(builder.Configuration?.GetSection("PopPort")?.Value?.ToString()) +}); // Configure the HTTP request pipeline. if (app.Environment.IsDevelopment()) diff --git a/LawFirm/LawFirmRestApi/appsettings.json b/LawFirm/LawFirmRestApi/appsettings.json index 535bd68..5d6b0f1 100644 --- a/LawFirm/LawFirmRestApi/appsettings.json +++ b/LawFirm/LawFirmRestApi/appsettings.json @@ -11,5 +11,5 @@ "PopHost": "pop.gmail.com", "PopPort": "995", "MailLogin": "lab7rpp@gmail.com", - "MailPassword": "bvac xppu dkze ppcr" + "MailPassword": "bzoh xhcm oecc glud" }