Egor_Petrushin/PIbd-22_Petrushin_E.A._LawFirm
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Петрушин Егор ПИбд-22 Лабораторная №4 Юридическая фирма #4

Closed
Egor_Petrushin wants to merge 8 commits from Lab4_ into Lab3
pull from: Lab4_
merge into: Egor_Petrushin:Lab3
Conversation 1 Commits 8 Files Changed 52 +8 -10
5 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b93eee2856 - Show all commits

2
LawFirm/AbstractLawFirmBusinessLogic/AbstractLawFirmBusinessLogic.csproj
View File

@ -8,7 +8,7 @@
<ItemGroup>
<PackageReference Include="DocumentFormat.OpenXml" Version="3.0.2" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
<PackageReference Include="PDFsharp-MigraDoc" Version="6.0.0" />
</ItemGroup>

3
LawFirm/AbstractLawFirmBusinessLogic/BusinessLogic/ReportLogic.cs
View File

@ -67,8 +67,7 @@ namespace AbstractLawFirmBusinessLogic.BusinessLogic
{
return _orderStorage.GetFilteredList(new OrderSearchModel
{
DateFrom
= model.DateFrom,
DateFrom = model.DateFrom,
DateTo = model.DateTo
})
.Select(x => new ReportOrdersViewModel

4
LawFirm/AbstractLawFirmDatabaseImplement/Implements/OrderStorage.cs
View File

@ -28,13 +28,13 @@ namespace AbstractLawFirmDatabaseImplement.Implements
public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
{
if (!model.Id.HasValue)
if (!model.Id.HasValue && !model.DateFrom.HasValue && !model.DateTo.HasValue)
{
return new();
}
using var context = new AbstractLawFirmDatabase();
return context.Orders
.Where(x => x.Id == model.Id)
.Where(x => x.Id == model.Id || model.DateFrom <= x.DateCreate && x.DateCreate <= model.DateTo)
.Include(x => x.Document)
.Select(x => x.GetViewModel)
.ToList();

7
LawFirm/LawFirmView/FormReportOrders.cs
View File

@ -54,12 +54,11 @@ namespace LawFirmView
var source = new ReportDataSource("DataSetOrders", dataSource);
reportViewer.LocalReport.DataSources.Clear();
reportViewer.LocalReport.DataSources.Add(source);
var parameters = new[] { new ReportParameter("ReportParameterPeriod",
$"c {dateTimePickerFrom.Value.ToShortDateString()} по {dateTimePickerTo.Value.ToShortDateString()}") };
_logger.LogInformation(dataSource.Count.ToString());
var parameters = new[] { new ReportParameter("ReportParameterPeriod", $"c {dateTimePickerFrom.Value.ToShortDateString()} по {dateTimePickerTo.Value.ToShortDateString()}") };
reportViewer.LocalReport.SetParameters(parameters);
reportViewer.RefreshReport();
_logger.LogInformation("Загрузка списка заказов на период {From}- { To} ", dateTimePickerFrom.Value.ToShortDateString(),
dateTimePickerTo.Value.ToShortDateString());
_logger.LogInformation("Загрузка списка заказов на период {From}- { To} ", dateTimePickerFrom.Value.ToShortDateString(), dateTimePickerTo.Value.ToShortDateString());
}
catch (Exception ex)
{

2
LawFirm/LawFirmView/ReportOrders.rdlc
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Report xmlns="http://schemas.microsoft.com/sqlserver/reporting/2008/01/reportdefinition" xmlns:rd="http://schemas.microsoft.com/SQLServer/reporting/reportdesigner">
<Report xmlns="http://schemas.microsoft.com/sqlserver/reporting/2016/01/reportdefinition" xmlns:rd="http://schemas.microsoft.com/SQLServer/reporting/reportdesigner">
<AutoRefresh>0</AutoRefresh>
<DataSources>
<DataSource Name="AbstractLawFirmContractsViewModels">