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 +3 -37
3 changed files with 3 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4b0bd99e4c - Show all commits

2
SewingDresses/SewingDressesDatabaseImplement/Implements/OrderStorage.cs
View File

@ -21,7 +21,7 @@ namespace SewingDressesDatabaseImplement.Implements
}
using var context = new SewingDressesDatabase();
if (model.Id.HasValue)
return context.Orders.Where(x => x.Id == model.Id).Select(x => AcessDressesStorage(x.GetViewModel, context)).ToList(); return context.Orders.Where(x => x.Id == model.Id).Select(x => AcessDressesStorage(x.GetViewModel, context)).ToList();
return context.Orders.Where(x => x.Id == model.Id).Select(x => AcessDressesStorage(x.GetViewModel, context)).ToList();
else if (model.ClientId.HasValue)
return context.Orders.Where(x => x.ClientId == model.ClientId).Select(x => AcessDressesStorage(x.GetViewModel, context)).ToList();
else

17
SewingDresses/SewingDressesView/MainForm.Designer.cs generated
View File

@ -198,22 +198,6 @@
#endregion
private DataGridView dataGridView;
private Button buttonCreate;
private Button buttonDoOrder;
private Button buttonOrderReady;
private Button buttonOrderGive;
private Button buttonOrderUpdate;
private MenuStrip menuStrip1;
private ToolStripMenuItem справочникиToolStripMenuItem;
private ToolStripMenuItem компонентыToolStripMenuItem;
private ToolStripMenuItem платьяToolStripMenuItem;
private ToolStripMenuItem отчетыToolStripMenuItem;
private ToolStripMenuItem DressesReportToolStripMenuItem;
private ToolStripMenuItem компонентыПоИзделиямToolStripMenuItem;
private ToolStripMenuItem списокЗаказовToolStripMenuItem;
private ToolStripMenuItem clientsToolStripMenuItem;
}
private DataGridView dataGridView;
private Button buttonCreate;
private Button buttonDoOrder;
@ -234,5 +218,6 @@
private ToolStripMenuItem списокПлатьевПоМагазинамToolStripMenuItem;
private ToolStripMenuItem списокЗаказовПоДатамToolStripMenuItem;
private ToolStripMenuItem списокПлатьевToolStripMenuItem;
private ToolStripMenuItem clientsToolStripMenuItem;
}
}

21
SewingDresses/SewingDressesView/MainForm.cs
View File

@ -221,26 +221,7 @@ namespace SewingDressesView
form.ShowDialog();
}
}
private void MainForm_Load(object sender, EventArgs e)
{
LoadData();
}
private void ComponentProductsToolStripMenuItemReport_Click(object sender, EventArgs e)
{
var service = Program.ServiceProvider?.GetService(typeof(ReportDressComponentsForm));
if (service is ReportDressComponentsForm form)
{
form.ShowDialog();
}
}
private void OrdersToolStripMenuItemReport_Click(object sender, EventArgs e)
{
var service = Program.ServiceProvider?.GetService(typeof(ReportOrdersForm));
if (service is ReportOrdersForm form)
{
form.ShowDialog();
}
}
private void DressesToolStripMenuItemReport_Click(object sender, EventArgs e)
{