diff --git a/RenovationWork/RenovationWork/FormReportOrders.Designer.cs b/RenovationWork/RenovationWork/FormReportOrders.Designer.cs index 7a82a6f..d1935c4 100644 --- a/RenovationWork/RenovationWork/FormReportOrders.Designer.cs +++ b/RenovationWork/RenovationWork/FormReportOrders.Designer.cs @@ -107,7 +107,7 @@ // AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(800, 450); + ClientSize = new Size(807, 450); Controls.Add(panel); Name = "FormReportOrders"; Text = "Заказы"; diff --git a/RenovationWork/RenovationWork/FormReportOrders.cs b/RenovationWork/RenovationWork/FormReportOrders.cs index 3d9947b..906caca 100644 --- a/RenovationWork/RenovationWork/FormReportOrders.cs +++ b/RenovationWork/RenovationWork/FormReportOrders.cs @@ -29,7 +29,7 @@ namespace RenovationWorkView { Dock = DockStyle.Fill }; - reportViewer.LocalReport.LoadReportDefinition(new FileStream("ReportOrder.rdlc", FileMode.Open)); + reportViewer.LocalReport.LoadReportDefinition(new FileStream("..\\..\\..\\ReportOrders.rdlc", FileMode.Open)); Controls.Clear(); Controls.Add(reportViewer); Controls.Add(panel); @@ -96,3 +96,4 @@ namespace RenovationWorkView } } } + diff --git a/RenovationWork/RenovationWork/Program.cs b/RenovationWork/RenovationWork/Program.cs index 6bfba32..8111b9a 100644 --- a/RenovationWork/RenovationWork/Program.cs +++ b/RenovationWork/RenovationWork/Program.cs @@ -1,4 +1,6 @@ using RenovationWorkBusinessLogic.BusinessLogics; +using RenovationWorkBusinessLogic.OfficePackage.Implements; +using RenovationWorkBusinessLogic.OfficePackage; using RenovationWorkContracts.BusinessLogicsContracts; using RenovationWorkContracts.StoragesContracts; using RenovationWorkDatabaseImplement.Implements; @@ -40,6 +42,10 @@ namespace RenovationWorkView services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -47,6 +53,8 @@ namespace RenovationWorkView services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); + services.AddTransient(); } } } \ No newline at end of file diff --git a/RenovationWork/RenovationWork/RenovationWorkView.csproj b/RenovationWork/RenovationWork/RenovationWorkView.csproj index dd586ea..531c93a 100644 --- a/RenovationWork/RenovationWork/RenovationWorkView.csproj +++ b/RenovationWork/RenovationWork/RenovationWorkView.csproj @@ -16,8 +16,10 @@ + + @@ -44,4 +46,10 @@ + + + Always + + + \ No newline at end of file diff --git a/RenovationWork/RenovationWork/ReportOrder.rdlc b/RenovationWork/RenovationWork/ReportOrders.rdlc similarity index 92% rename from RenovationWork/RenovationWork/ReportOrder.rdlc rename to RenovationWork/RenovationWork/ReportOrders.rdlc index a6c16cc..ee1283b 100644 --- a/RenovationWork/RenovationWork/ReportOrder.rdlc +++ b/RenovationWork/RenovationWork/ReportOrders.rdlc @@ -1,13 +1,13 @@ - 0 + 0 System.Data.DataSet /* Local Connection */ - 10791c83-cee8-4a38-bbd0-245fc17cefb3 + 47cb53f0-7dde-4717-ba03-866a0bc4f4dd @@ -25,27 +25,23 @@ DateCreate System.DateTime - - Status - System.String - - - RepairName - System.String - - - OrderStatus + + ManufactureName System.String Sum System.Decimal + + OrderStatus + RenovationWorkDataModels.OrderStatus + RenovationWorkContracts.ViewModels - ReportOrdersViewModel - RenovationWorkContracts.ViewModels.ReportOrdersViewModel, RenovationWorkContracts, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + ReportOrderViewModel + RenovationWorkContracts.ViewModels.ReportOrderViewModel, RenovationWorkContracts, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null @@ -75,7 +71,7 @@ ReportParameterPeriod 1cm 1cm - 17.4445cm + 21cm @@ -94,7 +90,7 @@ - Заказы + Список заказов @@ -216,7 +212,7 @@ - Ремонт + Изделие @@ -248,7 +244,7 @@ - Status + Сумма @@ -280,7 +276,7 @@ - Сумма + Статус @@ -402,21 +398,21 @@ - + true true - =Fields!Status.Value + =Fields!Sum.Value - 6.27908cm + 5.72875cm