diff --git a/SoftwareInstallation/AbstractSoftwareInstallationContracts/BindingModels/PackageBindingModel.cs b/SoftwareInstallation/AbstractSoftwareInstallationContracts/BindingModels/PackageBindingModel.cs index 3b2f746..eb4df65 100644 --- a/SoftwareInstallation/AbstractSoftwareInstallationContracts/BindingModels/PackageBindingModel.cs +++ b/SoftwareInstallation/AbstractSoftwareInstallationContracts/BindingModels/PackageBindingModel.cs @@ -13,6 +13,5 @@ namespace AbstractSoftwareInstallationContracts.BindingModels public string PackageName { get; set; } = string.Empty; public double Price { get; set; } public Dictionary PackageSoftware{get;set;} = new(); - public object PackageSoftwares { get; set; } } } diff --git a/SoftwareInstallation/SoftwareInstallation/FormPackage.cs b/SoftwareInstallation/SoftwareInstallation/FormPackage.cs index 367872b..64ed87d 100644 --- a/SoftwareInstallation/SoftwareInstallation/FormPackage.cs +++ b/SoftwareInstallation/SoftwareInstallation/FormPackage.cs @@ -189,6 +189,7 @@ namespace SoftwareInstallationView Id = _id ?? 0, PackageName = textBoxName.Text, Price = Convert.ToDouble(textBoxPrice.Text), + PackageSoftware = _packageSoftwares }; var operationResult = _id.HasValue ? _logic.Update(model) : _logic.Create(model); diff --git a/SoftwareInstallation/SoftwareInstallation/FormReportOrders.Designer.cs b/SoftwareInstallation/SoftwareInstallation/FormReportOrders.Designer.cs index b22211d..418e2a0 100644 --- a/SoftwareInstallation/SoftwareInstallation/FormReportOrders.Designer.cs +++ b/SoftwareInstallation/SoftwareInstallation/FormReportOrders.Designer.cs @@ -54,7 +54,7 @@ // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(217, 18); + this.label2.Location = new System.Drawing.Point(178, 16); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(23, 15); this.label2.TabIndex = 5; @@ -93,14 +93,14 @@ // this.dateTimePicker2.Location = new System.Drawing.Point(256, 12); this.dateTimePicker2.Name = "dateTimePicker2"; - this.dateTimePicker2.Size = new System.Drawing.Size(147, 23); + this.dateTimePicker2.Size = new System.Drawing.Size(92, 23); this.dateTimePicker2.TabIndex = 1; // // dateTimePicker1 // - this.dateTimePicker1.Location = new System.Drawing.Point(53, 12); + this.dateTimePicker1.Location = new System.Drawing.Point(77, 12); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(147, 23); + this.dateTimePicker1.Size = new System.Drawing.Size(43, 23); this.dateTimePicker1.TabIndex = 0; // // FormReportOrders @@ -110,7 +110,7 @@ this.ClientSize = new System.Drawing.Size(800, 450); this.Controls.Add(this.panel); this.Name = "FormReportOrders"; - this.Text = "FormReportOrders"; + this.Text = "Отчеты по заказам"; this.panel.ResumeLayout(false); this.panel.PerformLayout(); this.ResumeLayout(false); diff --git a/SoftwareInstallation/SoftwareInstallation/FormReportOrders.cs b/SoftwareInstallation/SoftwareInstallation/FormReportOrders.cs index 3ba1199..324f2d9 100644 --- a/SoftwareInstallation/SoftwareInstallation/FormReportOrders.cs +++ b/SoftwareInstallation/SoftwareInstallation/FormReportOrders.cs @@ -28,7 +28,7 @@ namespace SoftwareInstallationView { Dock = DockStyle.Fill }; - reportViewer.LocalReport.LoadReportDefinition(new FileStream("ReportOrders.rdlc", FileMode.Open)); + reportViewer.LocalReport.LoadReportDefinition(new FileStream("C:/Users/Дьявол Смерти/source/repos/PIbd-23_Dolgov_D.A._SoftwareInstallation/SoftwareInstallation/SoftwareInstallation/ReportOrders.rdlc", FileMode.Open)); Controls.Clear(); Controls.Add(reportViewer); Controls.Add(panel); diff --git a/SoftwareInstallation/SoftwareInstallation/Program.cs b/SoftwareInstallation/SoftwareInstallation/Program.cs index f8c88a3..d7433f6 100644 --- a/SoftwareInstallation/SoftwareInstallation/Program.cs +++ b/SoftwareInstallation/SoftwareInstallation/Program.cs @@ -1,4 +1,4 @@ -using AbstractSoftwareInstallationFileImplement.Implements; +using AbstractSoftwareInstallationDatabaseImplement.Implements; using AbstractSoftwareInstallationBusinessLogic; using AbstractSoftwareInstallationBusinessLogic.BusinessLogic; using AbstractSoftwareInstallationContracts.BusinessLogicsContracts; diff --git a/SoftwareInstallation/SoftwareInstallation/SoftwareInstallationView.csproj b/SoftwareInstallation/SoftwareInstallation/SoftwareInstallationView.csproj index 102c99c..cf45fac 100644 --- a/SoftwareInstallation/SoftwareInstallation/SoftwareInstallationView.csproj +++ b/SoftwareInstallation/SoftwareInstallation/SoftwareInstallationView.csproj @@ -23,7 +23,6 @@ -