From 53137e33d331c1ab001edc5d447eaf507e2cc16e Mon Sep 17 00:00:00 2001 From: Sergey Kozyrev Date: Fri, 19 Apr 2024 00:38:08 +0400 Subject: [PATCH] =?UTF-8?q?ITS=20WORK=20=D0=A5=D0=B0=D0=BB=D0=B8=20=D0=93?= =?UTF-8?q?=D0=B0=D0=BB=D0=B8=20=D0=9A=D1=80=D0=B8=D1=88=D0=BD=D0=B0=20?= =?UTF-8?q?=D0=A5=D0=B0=D0=BB=D0=B8=20=D0=93=D0=B0=D0=BB=D0=B8=20=D0=A0?= =?UTF-8?q?=D0=B0=D0=BC=D0=B0=20=D0=A2=D1=80=D0=B0=D0=BB=D0=B8-=D0=B2?= =?UTF-8?q?=D0=B0=D0=BB=D0=B8,=20=D0=BA=D1=80=D1=8B=D1=88=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SewingDressesDatabaseImplement/Models/Dress.cs | 2 -- SewingDresses/SewingDressesView/MainForm.cs | 2 +- .../SewingDressesView/ReportShopsDressesForm.Designer.cs | 1 + .../SewingDressesView/ReportShopsDressesForm.resx | 9 --------- 4 files changed, 2 insertions(+), 12 deletions(-) diff --git a/SewingDresses/SewingDressesDatabaseImplement/Models/Dress.cs b/SewingDresses/SewingDressesDatabaseImplement/Models/Dress.cs index 98b9979..82dbf42 100644 --- a/SewingDresses/SewingDressesDatabaseImplement/Models/Dress.cs +++ b/SewingDresses/SewingDressesDatabaseImplement/Models/Dress.cs @@ -31,8 +31,6 @@ namespace SewingDressesDatabaseImplement.Models public virtual List Components { get; set; } = new(); [ForeignKey("DressId")] public virtual List Orders { get; set; } = new(); - [ForeignKey("DressId")] - public virtual List Shops { get; set; } = new(); public static Dress Create(SewingDressesDatabase context, DressBindingModel model) { return new Dress() diff --git a/SewingDresses/SewingDressesView/MainForm.cs b/SewingDresses/SewingDressesView/MainForm.cs index 8e9ee41..9ba3c84 100644 --- a/SewingDresses/SewingDressesView/MainForm.cs +++ b/SewingDresses/SewingDressesView/MainForm.cs @@ -188,7 +188,7 @@ namespace SewingDressesView using var dialog = new SaveFileDialog { Filter = "docx|*.docx" }; if (dialog.ShowDialog() == DialogResult.OK) { - _reportLogic.SaveComponentsToWordFile(new ReportBindingModel + _reportLogic.SaveShopsToWordFile(new ReportBindingModel { FileName = dialog.FileName }); diff --git a/SewingDresses/SewingDressesView/ReportShopsDressesForm.Designer.cs b/SewingDresses/SewingDressesView/ReportShopsDressesForm.Designer.cs index ede4182..f737fde 100644 --- a/SewingDresses/SewingDressesView/ReportShopsDressesForm.Designer.cs +++ b/SewingDresses/SewingDressesView/ReportShopsDressesForm.Designer.cs @@ -87,6 +87,7 @@ Controls.Add(dataGridView); Name = "ReportShopsDressesForm"; Text = "Магазины-изделия"; + Load += ReportShopsDressesForm_Load; ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); ResumeLayout(false); } diff --git a/SewingDresses/SewingDressesView/ReportShopsDressesForm.resx b/SewingDresses/SewingDressesView/ReportShopsDressesForm.resx index 2af4679..d5a11f1 100644 --- a/SewingDresses/SewingDressesView/ReportShopsDressesForm.resx +++ b/SewingDresses/SewingDressesView/ReportShopsDressesForm.resx @@ -126,13 +126,4 @@ True - - True - - - True - - - True - \ No newline at end of file