check
This commit is contained in:
parent
8fbd671942
commit
f15280cae5
@ -48,7 +48,7 @@ namespace SewingDressesDatabaseImplement.Implements
|
|||||||
if (string.IsNullOrEmpty(model.ImplementFIO) && !model.Id.HasValue)
|
if (string.IsNullOrEmpty(model.ImplementFIO) && !model.Id.HasValue)
|
||||||
return null;
|
return null;
|
||||||
using var context = new SewingDressesDatabase();
|
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()
|
public List<ImplementViewModel> GetFullList()
|
||||||
{
|
{
|
||||||
|
28
SewingDresses/SewingDressesView/MainForm.Designer.cs
generated
28
SewingDresses/SewingDressesView/MainForm.Designer.cs
generated
@ -42,6 +42,8 @@
|
|||||||
DressesReportToolStripMenuItem = new ToolStripMenuItem();
|
DressesReportToolStripMenuItem = new ToolStripMenuItem();
|
||||||
компонентыПоИзделиямToolStripMenuItem = new ToolStripMenuItem();
|
компонентыПоИзделиямToolStripMenuItem = new ToolStripMenuItem();
|
||||||
списокЗаказовToolStripMenuItem = new ToolStripMenuItem();
|
списокЗаказовToolStripMenuItem = new ToolStripMenuItem();
|
||||||
|
toolStripMenuItem1 = new ToolStripMenuItem();
|
||||||
|
запускРаботToolStripMenuItem = new ToolStripMenuItem();
|
||||||
((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
|
((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
|
||||||
menuStrip1.SuspendLayout();
|
menuStrip1.SuspendLayout();
|
||||||
SuspendLayout();
|
SuspendLayout();
|
||||||
@ -89,7 +91,7 @@
|
|||||||
// menuStrip1
|
// menuStrip1
|
||||||
//
|
//
|
||||||
menuStrip1.ImageScalingSize = new Size(20, 20);
|
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.Location = new Point(0, 0);
|
||||||
menuStrip1.Name = "menuStrip1";
|
menuStrip1.Name = "menuStrip1";
|
||||||
menuStrip1.Size = new Size(1096, 28);
|
menuStrip1.Size = new Size(1096, 28);
|
||||||
@ -106,30 +108,30 @@
|
|||||||
// компонентыToolStripMenuItem
|
// компонентыToolStripMenuItem
|
||||||
//
|
//
|
||||||
компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem";
|
компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem";
|
||||||
компонентыToolStripMenuItem.Size = new Size(224, 26);
|
компонентыToolStripMenuItem.Size = new Size(185, 26);
|
||||||
компонентыToolStripMenuItem.Text = "Компоненты";
|
компонентыToolStripMenuItem.Text = "Компоненты";
|
||||||
компонентыToolStripMenuItem.Click += ComponentsToolStripMenuItem_Click;
|
компонентыToolStripMenuItem.Click += ComponentsToolStripMenuItem_Click;
|
||||||
//
|
//
|
||||||
// платьяToolStripMenuItem
|
// платьяToolStripMenuItem
|
||||||
//
|
//
|
||||||
платьяToolStripMenuItem.Name = "платьяToolStripMenuItem";
|
платьяToolStripMenuItem.Name = "платьяToolStripMenuItem";
|
||||||
платьяToolStripMenuItem.Size = new Size(224, 26);
|
платьяToolStripMenuItem.Size = new Size(185, 26);
|
||||||
платьяToolStripMenuItem.Text = "Платья";
|
платьяToolStripMenuItem.Text = "Платья";
|
||||||
платьяToolStripMenuItem.Click += DressesToolStripMenuItem_Click;
|
платьяToolStripMenuItem.Click += DressesToolStripMenuItem_Click;
|
||||||
//
|
//
|
||||||
// clientsToolStripMenuItem
|
// clientsToolStripMenuItem
|
||||||
//
|
//
|
||||||
clientsToolStripMenuItem.Name = "clientsToolStripMenuItem";
|
clientsToolStripMenuItem.Name = "clientsToolStripMenuItem";
|
||||||
clientsToolStripMenuItem.Size = new Size(224, 26);
|
clientsToolStripMenuItem.Size = new Size(185, 26);
|
||||||
clientsToolStripMenuItem.Text = "Клиенты";
|
clientsToolStripMenuItem.Text = "Клиенты";
|
||||||
clientsToolStripMenuItem.Click += clientsToolStripMenuItem_Click;
|
clientsToolStripMenuItem.Click += clientsToolStripMenuItem_Click;
|
||||||
//
|
//
|
||||||
// исполнителиToolStripMenuItem
|
// исполнителиToolStripMenuItem
|
||||||
//
|
//
|
||||||
исполнителиToolStripMenuItem.Name = "исполнителиToolStripMenuItem";
|
исполнителиToolStripMenuItem.Name = "исполнителиToolStripMenuItem";
|
||||||
исполнителиToolStripMenuItem.Size = new Size(224, 26);
|
исполнителиToolStripMenuItem.Size = new Size(185, 26);
|
||||||
исполнителиToolStripMenuItem.Text = "Исполнители";
|
исполнителиToolStripMenuItem.Text = "Исполнители";
|
||||||
исполнителиToolStripMenuItem.Click += исполнителиToolStripMenuItem_Click;
|
исполнителиToolStripMenuItem.Click += ImplementToolStripMenuItem_Click;
|
||||||
//
|
//
|
||||||
// отчетыToolStripMenuItem
|
// отчетыToolStripMenuItem
|
||||||
//
|
//
|
||||||
@ -159,6 +161,18 @@
|
|||||||
списокЗаказовToolStripMenuItem.Text = "Список заказов";
|
списокЗаказовToolStripMenuItem.Text = "Список заказов";
|
||||||
списокЗаказовToolStripMenuItem.Click += OrdersToolStripMenuItemReport_Click;
|
списокЗаказов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
|
// MainForm
|
||||||
//
|
//
|
||||||
AutoScaleDimensions = new SizeF(8F, 20F);
|
AutoScaleDimensions = new SizeF(8F, 20F);
|
||||||
@ -196,5 +210,7 @@
|
|||||||
private ToolStripMenuItem списокЗаказовToolStripMenuItem;
|
private ToolStripMenuItem списокЗаказовToolStripMenuItem;
|
||||||
private ToolStripMenuItem clientsToolStripMenuItem;
|
private ToolStripMenuItem clientsToolStripMenuItem;
|
||||||
private ToolStripMenuItem исполнителиToolStripMenuItem;
|
private ToolStripMenuItem исполнителиToolStripMenuItem;
|
||||||
|
private ToolStripMenuItem toolStripMenuItem1;
|
||||||
|
private ToolStripMenuItem запускРаботToolStripMenuItem;
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -11,12 +11,14 @@ namespace SewingDressesView
|
|||||||
private readonly ILogger _logger;
|
private readonly ILogger _logger;
|
||||||
private readonly IOrderLogic _orderLogic;
|
private readonly IOrderLogic _orderLogic;
|
||||||
private readonly IReportLogic _reportLogic;
|
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();
|
InitializeComponent();
|
||||||
_logger = logger;
|
_logger = logger;
|
||||||
_orderLogic = orderLogic;
|
_orderLogic = orderLogic;
|
||||||
_reportLogic = reportLogic;
|
_reportLogic = reportLogic;
|
||||||
|
_workProcess = workProcess;
|
||||||
}
|
}
|
||||||
private void LoadData()
|
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)
|
if (service is ImplementsForm form)
|
||||||
{
|
{
|
||||||
form.ShowDialog();
|
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);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -42,6 +42,7 @@ namespace SewingDressesView
|
|||||||
services.AddTransient<IClientLogic, ClientLogic>();
|
services.AddTransient<IClientLogic, ClientLogic>();
|
||||||
services.AddTransient<IImplementLogic, ImplementLogic>();
|
services.AddTransient<IImplementLogic, ImplementLogic>();
|
||||||
services.AddTransient<IImplementStorage, ImplementStorage>();
|
services.AddTransient<IImplementStorage, ImplementStorage>();
|
||||||
|
services.AddTransient<IWorkProcess, WorkModeling>();
|
||||||
services.AddTransient<AbstractSaveToExcel, SaveToExcel>();
|
services.AddTransient<AbstractSaveToExcel, SaveToExcel>();
|
||||||
services.AddTransient<AbstractSaveToPdf, SaveToPdf>();
|
services.AddTransient<AbstractSaveToPdf, SaveToPdf>();
|
||||||
services.AddTransient<AbstractSaveToWord, SaveToWord>();
|
services.AddTransient<AbstractSaveToWord, SaveToWord>();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user