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

PIbd-21 Lab6 KozyrevSS SewingDresses #19

Closed
Serxionaft wants to merge 10 commits from Lab6 into Lab5Magic
pull from: Lab6
merge into: Serxionaft:Lab5Magic
Conversation 0 Commits 10 Files Changed 48 +36 -10
4 changed files with 36 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f15280cae5 - Show all commits

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

@ -48,7 +48,7 @@ namespace SewingDressesDatabaseImplement.Implements
if (string.IsNullOrEmpty(model.ImplementFIO) && !model.Id.HasValue)
return null;
using var context = new SewingDressesDatabase();
return context.Implements.FirstOrDefault(x => !(string.IsNullOrEmpty(model.ImplementFIO) && x.ImplementFIO.Contains(model.ImplementFIO)) || (model.Id.HasValue && model.Id == x.Id))?.GetViewModel;
return context.Implements.FirstOrDefault(x => (string.IsNullOrEmpty(model.ImplementFIO) || x.ImplementFIO.Equals(model.ImplementFIO)) && (!model.Id.HasValue && model.Id == x.Id))?.GetViewModel;
}
public List<ImplementViewModel> GetFullList()
{

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

@ -42,6 +42,8 @@
DressesReportToolStripMenuItem = new ToolStripMenuItem();
компонентыПоИзделиямToolStripMenuItem = new ToolStripMenuItem();
списокЗаказовToolStripMenuItem = new ToolStripMenuItem();
toolStripMenuItem1 = new ToolStripMenuItem();
запускРаботToolStripMenuItem = new ToolStripMenuItem();
((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
menuStrip1.SuspendLayout();
SuspendLayout();
@ -89,7 +91,7 @@
// menuStrip1
//
menuStrip1.ImageScalingSize = new Size(20, 20);
menuStrip1.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, отчетыToolStripMenuItem });
menuStrip1.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, отчетыToolStripMenuItem, toolStripMenuItem1, запускРаботToolStripMenuItem });
menuStrip1.Location = new Point(0, 0);
menuStrip1.Name = "menuStrip1";
menuStrip1.Size = new Size(1096, 28);
@ -106,30 +108,30 @@
// компонентыToolStripMenuItem
//
компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem";
компонентыToolStripMenuItem.Size = new Size(224, 26);
компонентыToolStripMenuItem.Size = new Size(185, 26);
компонентыToolStripMenuItem.Text = "Компоненты";
компонентыToolStripMenuItem.Click += ComponentsToolStripMenuItem_Click;
//
// платьяToolStripMenuItem
//
платьяToolStripMenuItem.Name = "платьяToolStripMenuItem";
платьяToolStripMenuItem.Size = new Size(224, 26);
платьяToolStripMenuItem.Size = new Size(185, 26);
платьяToolStripMenuItem.Text = "Платья";
платьяToolStripMenuItem.Click += DressesToolStripMenuItem_Click;
//
// clientsToolStripMenuItem
//
clientsToolStripMenuItem.Name = "clientsToolStripMenuItem";
clientsToolStripMenuItem.Size = new Size(224, 26);
clientsToolStripMenuItem.Size = new Size(185, 26);
clientsToolStripMenuItem.Text = "Клиенты";
clientsToolStripMenuItem.Click += clientsToolStripMenuItem_Click;
//
// исполнителиToolStripMenuItem
//
исполнителиToolStripMenuItem.Name = "исполнителиToolStripMenuItem";
исполнителиToolStripMenuItem.Size = new Size(224, 26);
исполнителиToolStripMenuItem.Size = new Size(185, 26);
исполнителиToolStripMenuItem.Text = "Исполнители";
исполнителиToolStripMenuItem.Click += исполнителиToolStripMenuItem_Click;
исполнителиToolStripMenuItem.Click += ImplementToolStripMenuItem_Click;
//
// отчетыToolStripMenuItem
//
@ -159,6 +161,18 @@
списокЗаказовToolStripMenuItem.Text = "Список заказов";
списокЗаказовToolStripMenuItem.Click += OrdersToolStripMenuItemReport_Click;
//
// toolStripMenuItem1
//
toolStripMenuItem1.Name = "toolStripMenuItem1";
toolStripMenuItem1.Size = new Size(14, 24);
//
// запускРаботToolStripMenuItem
//
запускРаботToolStripMenuItem.Name = "запускРаботToolStripMenuItem";
запускРаботToolStripMenuItem.Size = new Size(114, 24);
запускРаботToolStripMenuItem.Text = "Запуск работ";
запускРаботToolStripMenuItem.Click += запускРаботToolStripMenuItem_Click;
//
// MainForm
//
AutoScaleDimensions = new SizeF(8F, 20F);
@ -196,5 +210,7 @@
private ToolStripMenuItem списокЗаказовToolStripMenuItem;
private ToolStripMenuItem clientsToolStripMenuItem;
private ToolStripMenuItem исполнителиToolStripMenuItem;
private ToolStripMenuItem toolStripMenuItem1;
private ToolStripMenuItem запускРаботToolStripMenuItem;
}
}

15
SewingDresses/SewingDressesView/MainForm.cs
View File

@ -11,12 +11,14 @@ namespace SewingDressesView
private readonly ILogger _logger;
private readonly IOrderLogic _orderLogic;
private readonly IReportLogic _reportLogic;
public MainForm(ILogger<MainForm> logger, IOrderLogic orderLogic, IReportLogic reportLogic)
private readonly IWorkProcess _workProcess;
public MainForm(ILogger<MainForm> logger, IOrderLogic orderLogic, IReportLogic reportLogic, IWorkProcess workProcess)
{
InitializeComponent();
_logger = logger;
_orderLogic = orderLogic;
_reportLogic = reportLogic;
_workProcess = workProcess;
}
private void LoadData()
{
@ -139,13 +141,20 @@ namespace SewingDressesView
}
}
private void исполнителиToolStripMenuItem_Click(object sender, EventArgs e)
private void ImplementToolStripMenuItem_Click(object sender, EventArgs e)
{
var service = Program.ServiceProvider?.GetService(typeof(ClientsForm));
var service = Program.ServiceProvider?.GetService(typeof(ImplementsForm));
if (service is ImplementsForm form)
{
form.ShowDialog();
}
}
private void запускРаботToolStripMenuItem_Click(object sender, EventArgs e)
{
_workProcess.DoWork((Program.ServiceProvider?.GetService(typeof(IImplementLogic)) as IImplementLogic)!, _orderLogic);
MessageBox.Show("Процесс обработки запущен", "Сообщение",
MessageBoxButtons.OK, MessageBoxIcon.Information);
}
}
}

1
SewingDresses/SewingDressesView/Program.cs
View File

@ -42,6 +42,7 @@ namespace SewingDressesView
services.AddTransient<IClientLogic, ClientLogic>();
services.AddTransient<IImplementLogic, ImplementLogic>();
services.AddTransient<IImplementStorage, ImplementStorage>();
services.AddTransient<IWorkProcess, WorkModeling>();
services.AddTransient<AbstractSaveToExcel, SaveToExcel>();
services.AddTransient<AbstractSaveToPdf, SaveToPdf>();
services.AddTransient<AbstractSaveToWord, SaveToWord>();