Serxionaft/PIbd-21_KozyrevSS_SewingDresses_Base
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PIbd-21 Lab5-Hard KozyrevSS SewingDresses #23

Closed
Serxionaft wants to merge 36 commits from Lab5-Hard into Lab5
pull from: Lab5-Hard
merge into: Serxionaft:Lab5
Conversation 1 Commits 36 Files Changed 144 +2 -12
4 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 53137e33d3 - Show all commits

2
SewingDresses/SewingDressesDatabaseImplement/Models/Dress.cs
View File

@ -31,8 +31,6 @@ namespace SewingDressesDatabaseImplement.Models
public virtual List<DressComponent> Components { get; set; } = new();
[ForeignKey("DressId")]
public virtual List<Order> Orders { get; set; } = new();
[ForeignKey("DressId")]
public virtual List<Shop> Shops { get; set; } = new();
public static Dress Create(SewingDressesDatabase context, DressBindingModel model)
{
return new Dress()

2
SewingDresses/SewingDressesView/MainForm.cs
View File

@ -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
});

1
SewingDresses/SewingDressesView/ReportShopsDressesForm.Designer.cs generated
View File

@ -87,6 +87,7 @@
Controls.Add(dataGridView);
Name = "ReportShopsDressesForm";
Text = "Магазины-изделия";
Load += ReportShopsDressesForm_Load;
((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
ResumeLayout(false);
}

9
SewingDresses/SewingDressesView/ReportShopsDressesForm.resx
View File

@ -126,13 +126,4 @@
<metadata name="CountColumn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ShopColumn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="DressColumn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="CountColumn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
</root>