From a31f4e994fb9cb303b17eecae84aa4d1babfa685 Mon Sep 17 00:00:00 2001 From: dimazhelovanov Date: Wed, 24 May 2023 16:42:06 +0400 Subject: [PATCH] =?UTF-8?q?=D0=A1=D0=BA=D0=B0=D1=87=D0=B8=D0=B2=D0=B0?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BE=D1=82=D1=87=D1=91=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/ReportController.cs | 30 +++++++- .../Views/Report/CreateReportClients.cshtml | 69 +++++++++++++++++-- .../Views/Shared/_LayoutIspol.cshtml | 2 +- LawFirm/LawFirmRestApi/Program.cs | 2 +- 4 files changed, 95 insertions(+), 8 deletions(-) diff --git a/LawFirm/LawFirmClientApp/Controllers/ReportController.cs b/LawFirm/LawFirmClientApp/Controllers/ReportController.cs index 0ba17c4..cb004f5 100644 --- a/LawFirm/LawFirmClientApp/Controllers/ReportController.cs +++ b/LawFirm/LawFirmClientApp/Controllers/ReportController.cs @@ -24,8 +24,36 @@ namespace LawFirmClientApp.Controllers Response.Redirect("CreateReportClients"); }*/ - [HttpGet] + [HttpPost] + public void LoadReportClients(DateTime dateFrom, DateTime dateTo) + { + if (APIClient.User == null) + { + Redirect("~/Home/Enter"); + } + + APIClient.PostRequest($"api/report/saveclientspdffile", new ReportBindingModel + { + DateFrom = dateFrom, + DateTo = dateTo, + CompanyId = APIClient.User.CompanyId + }); + } + [HttpGet] + + public IActionResult LoadReportClients(DateTime dateFrom, DateTime dateTo, string a) + { + if (APIClient.User == null) + { + return Redirect("~/Home/Enter"); + } + + return View(APIClient.GetRequest>($"api/report/getclientsreport?datefrom={dateFrom}&dateTo={dateTo}&companyId={APIClient.User.CompanyId}")); + } + + [HttpGet] + public IActionResult CreateReportClients(DateTime dateFrom, DateTime dateTo) { if (APIClient.User == null) diff --git a/LawFirm/LawFirmClientApp/Views/Report/CreateReportClients.cshtml b/LawFirm/LawFirmClientApp/Views/Report/CreateReportClients.cshtml index bb5d1e7..e256db1 100644 --- a/LawFirm/LawFirmClientApp/Views/Report/CreateReportClients.cshtml +++ b/LawFirm/LawFirmClientApp/Views/Report/CreateReportClients.cshtml @@ -5,13 +5,19 @@ ViewData["Title"] = "Отчёт по клиентам"; Layout = "~/Views/Shared/_LayoutIspol.cshtml"; } -div class="text-center"> -

Мои дела

+ + + +
+

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

@{
+ + +
От
@@ -25,9 +31,9 @@ div class="text-center">
- -
+ + @@ -74,4 +80,57 @@ div class="text-center">
} -
\ No newline at end of file + + + \ No newline at end of file diff --git a/LawFirm/LawFirmClientApp/Views/Shared/_LayoutIspol.cshtml b/LawFirm/LawFirmClientApp/Views/Shared/_LayoutIspol.cshtml index 52f9bd7..1d1310f 100644 --- a/LawFirm/LawFirmClientApp/Views/Shared/_LayoutIspol.cshtml +++ b/LawFirm/LawFirmClientApp/Views/Shared/_LayoutIspol.cshtml @@ -32,7 +32,7 @@ Личные данные
  • - Юристы + Отчёт по сотрудникам
  • Регистрация diff --git a/LawFirm/LawFirmRestApi/Program.cs b/LawFirm/LawFirmRestApi/Program.cs index d8b1530..d73f9fc 100644 --- a/LawFirm/LawFirmRestApi/Program.cs +++ b/LawFirm/LawFirmRestApi/Program.cs @@ -25,7 +25,7 @@ builder.Services.AddTransient(); builder.Services.AddTransient(); builder.Services.AddTransient(); - +builder.Services.AddTransient(); builder.Services.AddTransient(); builder.Services.AddTransient(); builder.Services.AddTransient();