olshab/PIbd-22_Shabunov_O.A._AutoWorkshop
olshab/PIbd-22_Shabunov_O.A._AutoWorkshop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PIbd-22. Shabunov O.A. Lab work 04 (Hard) #13

Closed
olshab wants to merge 16 commits from Lab4_Hard into Lab3_Hard
pull from: Lab4_Hard
merge into: olshab:Lab3_Hard
Conversation 0 Commits 16 Files Changed 54 +7 -7
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c10255f4cb - Show all commits

10
AutoWorkshopBusinessLogic/BusinessLogics/ReportLogic.cs
View File

@ -75,15 +75,15 @@ namespace AutoWorkshopBusinessLogic.BusinessLogics
});
}
public void SaveOrdersToPdfFile(ReportBindingModel model)
public void SaveOrdersToPdfFile(ReportBindingModel Model)
{
_saveToPdf.CreateDoc(new PdfInfo
{
FileName = model.FileName,
FileName = Model.FileName,
Title = "Список заказов",
DateFrom = model.DateFrom!.Value,
DateTo = model.DateTo!.Value,
Orders = GetOrders(model)
DateFrom = Model.DateFrom!.Value,
DateTo = Model.DateTo!.Value,
Orders = GetOrders(Model)
});
}
}

2
AutoWorkshopDatabaseImplement/Implements/OrderStorage.cs
View File

@ -22,7 +22,7 @@ namespace AutoWorkshopDatabaseImplement.Implements
public List<OrderViewModel> GetFilteredList(OrderSearchModel Model)
{
if (!Model.Id.HasValue || !Model.DateFrom.HasValue || !Model.DateTo.HasValue)
if (!Model.Id.HasValue && (!Model.DateFrom.HasValue || !Model.DateTo.HasValue))
return new();
using var Context = new AutoWorkshopDatabase();

2
AutoWorkshopView/Forms/FormReportOrders.cs
View File

@ -21,7 +21,7 @@ namespace AutoWorkshopView.Forms
{
Dock = DockStyle.Fill
};
_reportViewer.LocalReport.LoadReportDefinition(new FileStream("ReportOrder.rdlc", FileMode.Open));
_reportViewer.LocalReport.LoadReportDefinition(new FileStream("../../../ReportOrder.rdlc", FileMode.Open));
Controls.Clear();
Controls.Add(_reportViewer);