khehelk/PIbd-21_Markov_D.P._LawFirm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'LabWork07' into LabWork08

Browse Source
This commit is contained in:
Danil Markov 2023-05-05 22:46:22 +04:00
commit b89f06ce42
2 changed files with 91 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
LawFirm/LawFirmBusinessLogic/BusinessLogics/ReportLogic.cs
View File

@ -34,7 +34,6 @@ namespace LawFirmBusinessLogic.BusinessLogics
/// <returns></returns> /// <returns></returns>
public List<ReportDocumentBlankViewModel> GetDocumentBlank() public List<ReportDocumentBlankViewModel> GetDocumentBlank()
{ {
var blanks = _blankStorage.GetFullList();
var documents = _documentStorage.GetFullList(); var documents = _documentStorage.GetFullList();
var list = new List<ReportDocumentBlankViewModel>(); var list = new List<ReportDocumentBlankViewModel>();
foreach (var document in documents) foreach (var document in documents)
@ -45,14 +44,11 @@ namespace LawFirmBusinessLogic.BusinessLogics
Blanks = new List<Tuple<string, int>>(), Blanks = new List<Tuple<string, int>>(),
TotalCount = 0 TotalCount = 0
}; };
foreach (var blank in blanks) foreach (var blank in document.DocumentBlanks)
{ {
if (document.DocumentBlanks.ContainsKey(blank.Id)) record.Blanks.Add(new(blank.Value.Item1.BlankName,
{ blank.Value.Item2));
record.Blanks.Add(new Tuple<string, int>(blank.BlankName, document.DocumentBlanks[blank.Id].Item2)); record.TotalCount += blank.Value.Item2;
record.TotalCount +=
document.DocumentBlanks[blank.Id].Item2;
}
} }
list.Add(record); list.Add(record);
} }

2
LawFirm/LawFirmView/FormReportOrders.Designer.cs generated
View File

@ -110,7 +110,7 @@
this.ClientSize = new System.Drawing.Size(892, 325); this.ClientSize = new System.Drawing.Size(892, 325);
this.Controls.Add(this.panel); this.Controls.Add(this.panel);
this.Name = "FormReportOrders"; this.Name = "FormReportOrders";
this.Text = "FormReportOrders"; this.Text = "Отчет по заказам";
this.Load += new System.EventHandler(this.FormReportOrders_Load); this.Load += new System.EventHandler(this.FormReportOrders_Load);
this.panel.ResumeLayout(false); this.panel.ResumeLayout(false);
this.panel.PerformLayout(); this.panel.PerformLayout();