Добавление форм, логики работы исполнителя и пр. // Лаб №6

This commit is contained in:
Артем Харламов 2023-05-14 22:24:24 +04:00
parent fc22f666e1
commit ea2c698577
14 changed files with 1421 additions and 408 deletions

View File

@ -124,7 +124,7 @@ namespace AbstractFoodOrdersBusinessLogic.BusinessLogics
if (requiredStatus - model.Status == 1) if (requiredStatus - model.Status == 1)
{ {
model.Status = requiredStatus; model.Status = requiredStatus;
if (model.Status == OrderStatus.Выдан) if (model.Status == OrderStatus.Готов)
model.DateImplement = DateTime.Now; model.DateImplement = DateTime.Now;
if (_orderStorage.Update(model) == null) if (_orderStorage.Update(model) == null)
{ {

View File

@ -0,0 +1,151 @@
using AbstractFoodOrdersContracts.BindingModels;
using AbstractFoodOrdersContracts.BusinessLogicsContracts;
using AbstractFoodOrdersContracts.SearchModels;
using AbstractFoodOrdersContracts.ViewModels;
using AbstractFoodOrdersDataModels.Enums;
using Microsoft.Extensions.Logging;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace AbstractFoodOrdersBusinessLogic.BusinessLogics
{
public class WorkModeling: IWorkProcess
{
private readonly ILogger _logger;
private readonly Random _rnd;
private IOrderLogic? _orderLogic;
public WorkModeling(ILogger<WorkModeling> logger)
{
_logger = logger;
_rnd = new Random(1000);
}
public void DoWork(IImplementerLogic implementerLogic, IOrderLogic orderLogic)
{
_orderLogic = orderLogic;
var implementers = implementerLogic.ReadList(null);
if (implementers == null)
{
_logger.LogWarning("DoWork. Implementers is null");
return;
}
var orders = _orderLogic.ReadList(new OrderSearchModel { OrderStatus = OrderStatus.Принят });
if (orders == null || orders.Count == 0)
{
_logger.LogWarning("DoWork. Orders is null or empty");
return;
}
_logger.LogDebug("DoWork for {Count} orders", orders.Count);
foreach (var implementer in implementers)
{
Task.Run(() => WorkerWorkAsync(implementer, orders));
}
}
/// <summary>
/// Иммитация работы исполнителя
/// </summary>
/// <param name="implementer"></param>
/// <param name="orders"></param>
private async Task WorkerWorkAsync(ImplementerViewModel implementer, List<OrderViewModel>? orders)
{
if (_orderLogic == null || implementer == null || orders == null)
{
return;
}
await RunOrderInWork(implementer);
if (orders == null || orders.Count == 0)
return;
await Task.Run(async () =>
{
foreach (var order in orders)
{
try
{
_logger.LogDebug("DoWork. Worker {Id} try get order {Order}", implementer.Id, order.Id);
// пытаемся назначить заказ на исполнителя
_orderLogic.TakeOrderInWork(new OrderBindingModel
{
Id = order.Id,
ImplementerId = implementer.Id
});
// делаем работу
await Task.Delay(implementer.WorkExperience * _rnd.Next(100, 1000) * order.Count);
_logger.LogDebug("DoWork. Worker {Id} finish order {Order}", implementer.Id, order.Id);
_orderLogic.FinishOrder(new OrderBindingModel
{
Id = order.Id
});
}
// кто-то мог уже перехватить заказ, игнорируем ошибку
catch (InvalidOperationException ex)
{
_logger.LogWarning(ex, "Error try get work");
}
// заканчиваем выполнение имитации в случае иной ошибки
catch (Exception ex)
{
_logger.LogError(ex, "Error while do work");
throw;
}
// отдыхаем
await Task.Delay(implementer.Qualification * _rnd.Next(10, 100));
}
});
}
/// <summary>
/// Ищем заказ, которые уже в работе (вдруг исполнителя прервали)
/// </summary>
/// <param name="implementer"></param>
/// <returns></returns>
private async Task RunOrderInWork(ImplementerViewModel implementer)
{
if (_orderLogic == null || implementer == null)
{
return;
}
try
{
var runOrder = await Task.Run(() => _orderLogic.ReadElement(new OrderSearchModel
{
ImplementerId = implementer.Id,
OrderStatus = OrderStatus.Выполняется
}));
if (runOrder == null)
{
return;
}
_logger.LogDebug("DoWork. Worker {Id} back to order {Order}", implementer.Id, runOrder.Id);
// доделываем работу
await Task.Delay(implementer.WorkExperience * _rnd.Next(100, 300) * runOrder.Count);
_logger.LogDebug("DoWork. Worker {Id} finish order {Order}", implementer.Id, runOrder.Id);
_orderLogic.FinishOrder(new OrderBindingModel
{
Id = runOrder.Id
});
// отдыхаем
await Task.Delay(implementer.Qualification * _rnd.Next(10, 100));
}
// заказа может не быть, просто игнорируем ошибку
catch (InvalidOperationException ex)
{
_logger.LogWarning(ex, "Error try get work");
}
// а может возникнуть иная ошибка, тогда просто заканчиваем выполнение имитации
catch (Exception ex)
{
_logger.LogError(ex, "Error while do work");
throw;
}
}
}
}

View File

@ -45,16 +45,17 @@ namespace AbstractFoodOrdersDatabaseImplement.Implements
} }
public ImplementerViewModel? GetElement(ImplementerSearchModel model) public ImplementerViewModel? GetElement(ImplementerSearchModel model)
{ {
if (string.IsNullOrEmpty(model.ImplementerFIO) && string.IsNullOrEmpty(model.Password) && !model.Id.HasValue)
{
return null;
}
using var context = new AbstractFoodOrdersDatabase(); using var context = new AbstractFoodOrdersDatabase();
return context.Implementers if (model.Id.HasValue)
.FirstOrDefault(x => (!string.IsNullOrEmpty(model.ImplementerFIO) && !string.IsNullOrEmpty(model.Password) return context.Implementers.FirstOrDefault(x => x.Id == model.Id)?.GetViewModel;
&& x.ImplementerFIO == model.ImplementerFIO && x.Password == model.Password) || if (model.ImplementerFIO != null && model.Password != null)
(model.Id.HasValue && x.Id == model.Id)) return context.Implementers
?.GetViewModel; .FirstOrDefault(x => x.ImplementerFIO.Equals(model.ImplementerFIO)
&& x.Password.Equals(model.Password))
?.GetViewModel;
if (model.ImplementerFIO != null)
return context.Implementers.FirstOrDefault(x => x.ImplementerFIO.Equals(model.ImplementerFIO))?.GetViewModel;
return null;
} }
public ImplementerViewModel? Insert(ImplementerBindingModel model) public ImplementerViewModel? Insert(ImplementerBindingModel model)
{ {

View File

@ -23,10 +23,18 @@ namespace AbstractFoodOrdersDatabaseImplement.Implements
} }
public List<OrderViewModel> GetFilteredList(OrderSearchModel model) public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
{ {
if (!model.Id.HasValue && !model.DateFrom.HasValue && !model.DateTo.HasValue && !model.ClientId.HasValue) if (!model.Id.HasValue && !model.DateFrom.HasValue && !model.DateTo.HasValue && !model.ClientId.HasValue && !model.OrderStatus.HasValue)
{ {
return new(); return new();
} }
if (model.OrderStatus.HasValue)
{
using var context = new AbstractFoodOrdersDatabase();
return context.Orders.Include(x => x.Client).Include(x => x.Implementer)
.Where(x => x.Status == model.OrderStatus)
.Select(x => AccessDishStorage(x.GetViewModel, context))
.ToList();
}
if (model.ClientId.HasValue) if (model.ClientId.HasValue)
{ {
using var context = new AbstractFoodOrdersDatabase(); using var context = new AbstractFoodOrdersDatabase();

View File

@ -0,0 +1,104 @@
using AbstractFoodOrdersContracts.BindingModels;
using AbstractFoodOrdersContracts.BusinessLogicsContracts;
using AbstractFoodOrdersContracts.SearchModels;
using AbstractFoodOrdersContracts.ViewModels;
using AbstractFoodOrdersDataModels.Enums;
using DocumentFormat.OpenXml.Office2010.Excel;
using Microsoft.AspNetCore.Mvc;
namespace AbstractFoodOrdersRestApi.Controllers
{
[Route("api/[controller]/[action]")]
[ApiController]
public class ImplementerController : Controller
{
private readonly ILogger _logger;
private readonly IOrderLogic _order;
private readonly IImplementerLogic _logic;
public ImplementerController(IOrderLogic order, IImplementerLogic logic,
ILogger<ImplementerController> logger)
{
_logger = logger;
_order = order;
_logic = logic;
}
[HttpGet]
public ImplementerViewModel? Login(string login, string password)
{
try
{
return _logic.ReadElement(new ImplementerSearchModel
{
ImplementerFIO = login,
Password = password
});
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка авторизации сотрудника");
throw;
}
}
[HttpGet]
public List<OrderViewModel>? GetNewOrders()
{
try
{
return _order.ReadList(new OrderSearchModel
{
OrderStatus = OrderStatus.Принят
});
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка получения новых заказов");
throw;
}
}
[HttpGet]
public OrderViewModel? GetImplementerOrder(int implementerId)
{
try
{
return _order.ReadElement(new OrderSearchModel
{
ImplementerId = implementerId
});
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка получения текущего заказа исполнителя");
throw;
}
}
[HttpPost]
public void TakeOrderInWork(OrderBindingModel model)
{
try
{
_order.TakeOrderInWork(model);
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка перевода заказа с №{Id} в работу",
model.Id);
throw;
}
}
[HttpPost]
public void FinishOrder(OrderBindingModel model)
{
try
{
_order.FinishOrder(model);
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка отметки о готовности заказа с №{ Id}", model.Id);
throw;
}
}
}
}

View File

@ -0,0 +1,163 @@
namespace FoodOrders
{
partial class FormCreateImplementer
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.textBoxWorkExperience = new System.Windows.Forms.TextBox();
this.textBoxFIO = new System.Windows.Forms.TextBox();
this.label1 = new System.Windows.Forms.Label();
this.labelName = new System.Windows.Forms.Label();
this.buttonCancel = new System.Windows.Forms.Button();
this.buttonSave = new System.Windows.Forms.Button();
this.textBoxPassword = new System.Windows.Forms.TextBox();
this.label2 = new System.Windows.Forms.Label();
this.textBoxQualification = new System.Windows.Forms.TextBox();
this.label3 = new System.Windows.Forms.Label();
this.SuspendLayout();
//
// textBoxWorkExperience
//
this.textBoxWorkExperience.Location = new System.Drawing.Point(118, 76);
this.textBoxWorkExperience.Name = "textBoxWorkExperience";
this.textBoxWorkExperience.Size = new System.Drawing.Size(191, 27);
this.textBoxWorkExperience.TabIndex = 11;
//
// textBoxFIO
//
this.textBoxFIO.Location = new System.Drawing.Point(118, 6);
this.textBoxFIO.Name = "textBoxFIO";
this.textBoxFIO.Size = new System.Drawing.Size(330, 27);
this.textBoxFIO.TabIndex = 10;
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(12, 79);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(105, 20);
this.label1.TabIndex = 9;
this.label1.Text = "Опыт работы:";
//
// labelName
//
this.labelName.AutoSize = true;
this.labelName.Location = new System.Drawing.Point(64, 6);
this.labelName.Name = "labelName";
this.labelName.Size = new System.Drawing.Size(45, 20);
this.labelName.TabIndex = 8;
this.labelName.Text = "ФИО:";
//
// buttonCancel
//
this.buttonCancel.Location = new System.Drawing.Point(354, 163);
this.buttonCancel.Name = "buttonCancel";
this.buttonCancel.Size = new System.Drawing.Size(94, 29);
this.buttonCancel.TabIndex = 7;
this.buttonCancel.Text = "Отмена";
this.buttonCancel.UseVisualStyleBackColor = true;
this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click);
//
// buttonSave
//
this.buttonSave.Location = new System.Drawing.Point(254, 163);
this.buttonSave.Name = "buttonSave";
this.buttonSave.Size = new System.Drawing.Size(94, 29);
this.buttonSave.TabIndex = 6;
this.buttonSave.Text = "Сохранить";
this.buttonSave.UseVisualStyleBackColor = true;
this.buttonSave.Click += new System.EventHandler(this.buttonSave_Click);
//
// textBoxPassword
//
this.textBoxPassword.Location = new System.Drawing.Point(118, 39);
this.textBoxPassword.Name = "textBoxPassword";
this.textBoxPassword.Size = new System.Drawing.Size(330, 27);
this.textBoxPassword.TabIndex = 13;
//
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(44, 42);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(65, 20);
this.label2.TabIndex = 12;
this.label2.Text = "Пароль:";
//
// textBoxQualification
//
this.textBoxQualification.Location = new System.Drawing.Point(118, 109);
this.textBoxQualification.Name = "textBoxQualification";
this.textBoxQualification.Size = new System.Drawing.Size(191, 27);
this.textBoxQualification.TabIndex = 15;
//
// label3
//
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(-2, 112);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(111, 20);
this.label3.TabIndex = 14;
this.label3.Text = "Квалификация";
//
// FormImplementer
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(454, 202);
this.Controls.Add(this.textBoxQualification);
this.Controls.Add(this.label3);
this.Controls.Add(this.textBoxPassword);
this.Controls.Add(this.label2);
this.Controls.Add(this.textBoxWorkExperience);
this.Controls.Add(this.textBoxFIO);
this.Controls.Add(this.label1);
this.Controls.Add(this.labelName);
this.Controls.Add(this.buttonCancel);
this.Controls.Add(this.buttonSave);
this.Name = "FormImplementer";
this.Text = "Исполнитель";
this.Load += new System.EventHandler(this.FormImplementer_Load);
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
private TextBox textBoxWorkExperience;
private TextBox textBoxFIO;
private Label label1;
private Label labelName;
private Button buttonCancel;
private Button buttonSave;
private TextBox textBoxPassword;
private Label label2;
private TextBox textBoxQualification;
private Label label3;
}
}

View File

@ -0,0 +1,109 @@
using AbstractFoodOrdersContracts.BindingModels;
using AbstractFoodOrdersContracts.BusinessLogicsContracts;
using AbstractFoodOrdersContracts.SearchModels;
using Microsoft.Extensions.Logging;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace FoodOrders
{
public partial class FormCreateImplementer : Form
{
private readonly ILogger _logger;
private readonly IImplementerLogic _logic;
private int? _id;
public int Id { set { _id = value; } }
public FormCreateImplementer(ILogger<FormCreateImplementer> logger, IImplementerLogic logic)
{
InitializeComponent();
_logger = logger;
_logic = logic;
}
private void FormImplementer_Load(object sender, EventArgs e)
{
if (_id.HasValue)
{
try
{
_logger.LogInformation("Получение исполнителя");
var view = _logic.ReadElement(new ImplementerSearchModel { Id = _id.Value });
if (view != null)
{
textBoxFIO.Text = view.ImplementerFIO;
textBoxPassword.Text = view.Password;
textBoxWorkExperience.Text = view.WorkExperience.ToString();
textBoxQualification.Text = view.Qualification.ToString();
}
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка получения исполнителя");
MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
}
private void buttonSave_Click(object sender, EventArgs e)
{
if (string.IsNullOrEmpty(textBoxFIO.Text))
{
MessageBox.Show("Заполните ФИО", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
return;
}
if (string.IsNullOrEmpty(textBoxPassword.Text))
{
MessageBox.Show("Заполните пароль", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
return;
}
if (string.IsNullOrEmpty(textBoxWorkExperience.Text))
{
MessageBox.Show("Заполните опыт работы", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
return;
}
if (string.IsNullOrEmpty(textBoxQualification.Text))
{
MessageBox.Show("Заполните квалификацию", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
return;
}
_logger.LogInformation("Сохранение исполнителя");
try
{
var model = new ImplementerBindingModel
{
Id = _id ?? 0,
ImplementerFIO = textBoxFIO.Text,
Password = textBoxPassword.Text,
WorkExperience = Convert.ToInt32(textBoxWorkExperience.Text),
Qualification = Convert.ToInt32(textBoxQualification.Text)
};
var operationResult = _id.HasValue ? _logic.Update(model) : _logic.Create(model);
if (!operationResult)
{
throw new Exception("Ошибка при сохранении. Дополнительная информация в логах.");
}
MessageBox.Show("Сохранение прошло успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
DialogResult = DialogResult.OK;
Close();
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка сохранения исполнителя");
MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
private void buttonCancel_Click(object sender, EventArgs e)
{
DialogResult = DialogResult.Cancel;
Close();
}
}
}

View File

@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>

View File

@ -0,0 +1,119 @@
namespace FoodOrders
{
partial class FormImplementers
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.buttonRef = new System.Windows.Forms.Button();
this.buttonDel = new System.Windows.Forms.Button();
this.buttonUpd = new System.Windows.Forms.Button();
this.buttonAdd = new System.Windows.Forms.Button();
this.dataGridView = new System.Windows.Forms.DataGridView();
((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
this.SuspendLayout();
//
// buttonRef
//
this.buttonRef.Location = new System.Drawing.Point(523, 185);
this.buttonRef.Name = "buttonRef";
this.buttonRef.Size = new System.Drawing.Size(94, 29);
this.buttonRef.TabIndex = 9;
this.buttonRef.Text = "Обновить";
this.buttonRef.UseVisualStyleBackColor = true;
this.buttonRef.Click += new System.EventHandler(this.buttonRef_Click);
//
// buttonDel
//
this.buttonDel.Location = new System.Drawing.Point(523, 127);
this.buttonDel.Name = "buttonDel";
this.buttonDel.Size = new System.Drawing.Size(94, 29);
this.buttonDel.TabIndex = 8;
this.buttonDel.Text = "Удалить";
this.buttonDel.UseVisualStyleBackColor = true;
this.buttonDel.Click += new System.EventHandler(this.buttonDel_Click);
//
// buttonUpd
//
this.buttonUpd.Location = new System.Drawing.Point(523, 70);
this.buttonUpd.Name = "buttonUpd";
this.buttonUpd.Size = new System.Drawing.Size(94, 29);
this.buttonUpd.TabIndex = 7;
this.buttonUpd.Text = "Изменить";
this.buttonUpd.UseVisualStyleBackColor = true;
this.buttonUpd.Click += new System.EventHandler(this.buttonUpd_Click);
//
// buttonAdd
//
this.buttonAdd.Location = new System.Drawing.Point(523, 13);
this.buttonAdd.Name = "buttonAdd";
this.buttonAdd.Size = new System.Drawing.Size(94, 29);
this.buttonAdd.TabIndex = 6;
this.buttonAdd.Text = "Добавить";
this.buttonAdd.UseVisualStyleBackColor = true;
this.buttonAdd.Click += new System.EventHandler(this.buttonAdd_Click);
//
// dataGridView
//
this.dataGridView.BackgroundColor = System.Drawing.Color.White;
this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dataGridView.Location = new System.Drawing.Point(1, 1);
this.dataGridView.MultiSelect = false;
this.dataGridView.Name = "dataGridView";
this.dataGridView.RowHeadersVisible = false;
this.dataGridView.RowHeadersWidth = 51;
this.dataGridView.RowTemplate.Height = 29;
this.dataGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
this.dataGridView.Size = new System.Drawing.Size(489, 449);
this.dataGridView.TabIndex = 5;
//
// FormImplementers
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(628, 450);
this.Controls.Add(this.buttonRef);
this.Controls.Add(this.buttonDel);
this.Controls.Add(this.buttonUpd);
this.Controls.Add(this.buttonAdd);
this.Controls.Add(this.dataGridView);
this.Name = "FormImplementers";
this.Text = "Исполнители";
this.Load += new System.EventHandler(this.FormImplementers_Load);
((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
this.ResumeLayout(false);
}
#endregion
private Button buttonRef;
private Button buttonDel;
private Button buttonUpd;
private Button buttonAdd;
private DataGridView dataGridView;
}
}

View File

@ -0,0 +1,110 @@
using AbstractFoodOrdersContracts.BindingModels;
using AbstractFoodOrdersContracts.BusinessLogicsContracts;
using Microsoft.Extensions.Logging;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace FoodOrders
{
public partial class FormImplementers : Form
{
private readonly ILogger _logger;
private readonly IImplementerLogic _logic;
public FormImplementers(ILogger<FormImplementers> logger, IImplementerLogic logic)
{
InitializeComponent();
_logger = logger;
_logic = logic;
}
private void FormImplementers_Load(object sender, EventArgs e)
{
LoadData();
}
private void LoadData()
{
try
{
var list = _logic.ReadList(null);
if (list != null)
{
dataGridView.DataSource = list;
dataGridView.Columns["Id"].Visible = false;
dataGridView.Columns["ImplementerFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
}
_logger.LogInformation("Загрузка исполнителей");
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка загрузки исполнителей");
MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
private void buttonAdd_Click(object sender, EventArgs e)
{
var service = Program.ServiceProvider?.GetService(typeof(FormCreateImplementer));
if (service is FormCreateImplementer form)
{
if (form.ShowDialog() == DialogResult.OK)
{
LoadData();
}
}
}
private void buttonUpd_Click(object sender, EventArgs e)
{
if (dataGridView.SelectedRows.Count == 1)
{
var service = Program.ServiceProvider?.GetService(typeof(FormCreateImplementer));
if (service is FormCreateImplementer form)
{
form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
if (form.ShowDialog() == DialogResult.OK)
{
LoadData();
}
}
}
}
private void buttonDel_Click(object sender, EventArgs e)
{
if (dataGridView.SelectedRows.Count == 1)
{
if (MessageBox.Show("Удалить запись?", "Вопрос", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
{
int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
_logger.LogInformation("Удаление исполнителя");
try
{
if (!_logic.Delete(new ImplementerBindingModel { Id = id }))
{
throw new Exception("Ошибка при удалении. Дополнительная информация в логах.");
}
LoadData();
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка удаления исполнителя");
MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
}
}
private void buttonRef_Click(object sender, EventArgs e)
{
LoadData();
}
}
}

View File

@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>

View File

@ -1,218 +1,210 @@
namespace FoodOrders namespace FoodOrders
{ {
partial class FormMain partial class FormMain
{ {
/// <summary> /// <summary>
/// Required designer variable. /// Required designer variable.
/// </summary> /// </summary>
private System.ComponentModel.IContainer components = null; private System.ComponentModel.IContainer components = null;
/// <summary> /// <summary>
/// Clean up any resources being used. /// Clean up any resources being used.
/// </summary> /// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param> /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing) protected override void Dispose(bool disposing)
{ {
if (disposing && (components != null)) if (disposing && (components != null))
{ {
components.Dispose(); components.Dispose();
} }
base.Dispose(disposing); base.Dispose(disposing);
} }
#region Windows Form Designer generated code #region Windows Form Designer generated code
/// <summary> /// <summary>
/// Required method for Designer support - do not modify /// Required method for Designer support - do not modify
/// the contents of this method with the code editor. /// the contents of this method with the code editor.
/// </summary> /// </summary>
private void InitializeComponent() private void InitializeComponent()
{ {
menuStrip = new MenuStrip(); menuStrip = new MenuStrip();
справочникиToolStripMenuItem = new ToolStripMenuItem(); справочникиToolStripMenuItem = new ToolStripMenuItem();
КомпонентыToolStripMenuItem = new ToolStripMenuItem(); КомпонентыToolStripMenuItem = new ToolStripMenuItem();
БлюдаToolStripMenuItem = new ToolStripMenuItem(); БлюдаToolStripMenuItem = new ToolStripMenuItem();
отчётыToolStripMenuItem = new ToolStripMenuItem(); ClientToolStripMenuItem = new ToolStripMenuItem();
ComponentToolStripMenuItem = new ToolStripMenuItem(); отчётыToolStripMenuItem = new ToolStripMenuItem();
ComponentProductsToolStripMenuItem = new ToolStripMenuItem(); ComponentToolStripMenuItem = new ToolStripMenuItem();
OrdersToolStripMenuItem = new ToolStripMenuItem(); ComponentProductsToolStripMenuItem = new ToolStripMenuItem();
dataGridView = new DataGridView(); OrdersToolStripMenuItem = new ToolStripMenuItem();
ButtonCreateOrder = new Button(); запускРаботыToolStripMenuItem = new ToolStripMenuItem();
ButtonTakeOrderInWork = new Button(); dataGridView = new DataGridView();
ButtonOrderReady = new Button(); ButtonCreateOrder = new Button();
ButtonIssuedOrder = new Button(); ButtonIssuedOrder = new Button();
ButtonRef = new Button(); ButtonRef = new Button();
ClientToolStripMenuItem = new ToolStripMenuItem(); исполнителиToolStripMenuItem = new ToolStripMenuItem();
menuStrip.SuspendLayout(); menuStrip.SuspendLayout();
((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
SuspendLayout(); SuspendLayout();
// //
// menuStrip // menuStrip
// //
menuStrip.ImageScalingSize = new Size(20, 20); menuStrip.ImageScalingSize = new Size(20, 20);
menuStrip.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, отчётыToolStripMenuItem }); menuStrip.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, отчётыToolStripMenuItem, запускРаботыToolStripMenuItem });
menuStrip.Location = new Point(0, 0); menuStrip.Location = new Point(0, 0);
menuStrip.Name = "menuStrip"; menuStrip.Name = "menuStrip";
menuStrip.Size = new Size(1104, 28); menuStrip.Size = new Size(1104, 28);
menuStrip.TabIndex = 0; menuStrip.TabIndex = 0;
menuStrip.Text = "menuStrip1"; menuStrip.Text = "menuStrip1";
// //
// справочникиToolStripMenuItem // справочникиToolStripMenuItem
// //
справочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { КомпонентыToolStripMenuItem, БлюдаToolStripMenuItem, ClientToolStripMenuItem }); справочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { КомпонентыToolStripMenuItem, БлюдаToolStripMenuItem, ClientToolStripMenuItem, исполнителиToolStripMenuItem });
справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem"; справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem";
справочникиToolStripMenuItem.Size = new Size(117, 24); справочникиToolStripMenuItem.Size = new Size(117, 24);
справочникиToolStripMenuItem.Text = "Справочники"; справочникиToolStripMenuItem.Text = "Справочники";
// //
// КомпонентыToolStripMenuItem // КомпонентыToolStripMenuItem
// //
КомпонентыToolStripMenuItem.Name = "КомпонентыToolStripMenuItem"; КомпонентыToolStripMenuItem.Name = "КомпонентыToolStripMenuItem";
КомпонентыToolStripMenuItem.Size = new Size(224, 26); КомпонентыToolStripMenuItem.Size = new Size(224, 26);
КомпонентыToolStripMenuItem.Text = "Компоненты"; КомпонентыToolStripMenuItem.Text = "Компоненты";
КомпонентыToolStripMenuItem.Click += КомпонентыToolStripMenuItem_Click; КомпонентыToolStripMenuItem.Click += КомпонентыToolStripMenuItem_Click;
// //
// БлюдаToolStripMenuItem // БлюдаToolStripMenuItem
// //
БлюдаToolStripMenuItem.Name = "БлюдаToolStripMenuItem"; БлюдаToolStripMenuItem.Name = "БлюдаToolStripMenuItem";
БлюдаToolStripMenuItem.Size = new Size(224, 26); БлюдаToolStripMenuItem.Size = new Size(224, 26);
БлюдаToolStripMenuItem.Text = "Блюда"; БлюдаToolStripMenuItem.Text = "Блюда";
БлюдаToolStripMenuItem.Click += ИзделияToolStripMenuItem_Click; БлюдаToolStripMenuItem.Click += ИзделияToolStripMenuItem_Click;
// //
// отчётыToolStripMenuItem // ClientToolStripMenuItem
// //
отчётыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { ComponentToolStripMenuItem, ComponentProductsToolStripMenuItem, OrdersToolStripMenuItem }); ClientToolStripMenuItem.Name = "ClientToolStripMenuItem";
отчётыToolStripMenuItem.Name = "отчётыToolStripMenuItem"; ClientToolStripMenuItem.Size = new Size(224, 26);
отчётыToolStripMenuItem.Size = new Size(73, 24); ClientToolStripMenuItem.Text = "Клиенты";
отчётыToolStripMenuItem.Text = "Отчёты"; ClientToolStripMenuItem.Click += ClientToolStripMenuItem_Click;
// //
// ComponentToolStripMenuItem // отчётыToolStripMenuItem
// //
ComponentToolStripMenuItem.Name = "ComponentToolStripMenuItem"; отчётыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { ComponentToolStripMenuItem, ComponentProductsToolStripMenuItem, OrdersToolStripMenuItem });
ComponentToolStripMenuItem.Size = new Size(264, 26); отчётыToolStripMenuItem.Name = "отчётыToolStripMenuItem";
ComponentToolStripMenuItem.Text = "Список блюд"; отчётыToolStripMenuItem.Size = new Size(73, 24);
ComponentToolStripMenuItem.Click += ComponentToolStripMenuItem_Click; отчётыToolStripMenuItem.Text = "Отчёты";
// //
// ComponentProductsToolStripMenuItem // ComponentToolStripMenuItem
// //
ComponentProductsToolStripMenuItem.Name = "ComponentProductsToolStripMenuItem"; ComponentToolStripMenuItem.Name = "ComponentToolStripMenuItem";
ComponentProductsToolStripMenuItem.Size = new Size(264, 26); ComponentToolStripMenuItem.Size = new Size(264, 26);
ComponentProductsToolStripMenuItem.Text = "Компоненты по блюдам"; ComponentToolStripMenuItem.Text = "Список блюд";
ComponentProductsToolStripMenuItem.Click += ComponentProductsToolStripMenuItem_Click; ComponentToolStripMenuItem.Click += ComponentToolStripMenuItem_Click;
// //
// OrdersToolStripMenuItem // ComponentProductsToolStripMenuItem
// //
OrdersToolStripMenuItem.Name = "OrdersToolStripMenuItem"; ComponentProductsToolStripMenuItem.Name = "ComponentProductsToolStripMenuItem";
OrdersToolStripMenuItem.Size = new Size(264, 26); ComponentProductsToolStripMenuItem.Size = new Size(264, 26);
OrdersToolStripMenuItem.Text = "Список заказов"; ComponentProductsToolStripMenuItem.Text = "Компоненты по блюдам";
OrdersToolStripMenuItem.Click += OrdersToolStripMenuItem_Click; ComponentProductsToolStripMenuItem.Click += ComponentProductsToolStripMenuItem_Click;
// //
// dataGridView // OrdersToolStripMenuItem
// //
dataGridView.BackgroundColor = SystemColors.ControlLightLight; OrdersToolStripMenuItem.Name = "OrdersToolStripMenuItem";
dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; OrdersToolStripMenuItem.Size = new Size(264, 26);
dataGridView.Location = new Point(0, 40); OrdersToolStripMenuItem.Text = "Список заказов";
dataGridView.Name = "dataGridView"; OrdersToolStripMenuItem.Click += OrdersToolStripMenuItem_Click;
dataGridView.RowHeadersWidth = 51; //
dataGridView.RowTemplate.Height = 29; // запускРаботыToolStripMenuItem
dataGridView.Size = new Size(798, 408); //
dataGridView.TabIndex = 1; запускРаботыToolStripMenuItem.Name = апускРаботыToolStripMenuItem";
// запускРаботыToolStripMenuItem.Size = new Size(125, 24);
// ButtonCreateOrder запускРаботыToolStripMenuItem.Text = "Запуск работы";
// запускРаботыToolStripMenuItem.Click += ЗапускРаботыToolStripMenuItem_Click;
ButtonCreateOrder.Location = new Point(831, 82); //
ButtonCreateOrder.Name = "ButtonCreateOrder"; // dataGridView
ButtonCreateOrder.Size = new Size(241, 29); //
ButtonCreateOrder.TabIndex = 2; dataGridView.BackgroundColor = SystemColors.ControlLightLight;
ButtonCreateOrder.Text = "Создать заказ"; dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
ButtonCreateOrder.UseVisualStyleBackColor = true; dataGridView.Location = new Point(0, 40);
ButtonCreateOrder.Click += ButtonCreateOrder_Click; dataGridView.Name = "dataGridView";
// dataGridView.RowHeadersWidth = 51;
// ButtonTakeOrderInWork dataGridView.RowTemplate.Height = 29;
// dataGridView.Size = new Size(798, 408);
ButtonTakeOrderInWork.Location = new Point(831, 141); dataGridView.TabIndex = 1;
ButtonTakeOrderInWork.Name = "ButtonTakeOrderInWork"; //
ButtonTakeOrderInWork.Size = new Size(241, 29); // ButtonCreateOrder
ButtonTakeOrderInWork.TabIndex = 3; //
ButtonTakeOrderInWork.Text = "Отдать заказ на выполнение"; ButtonCreateOrder.Location = new Point(831, 82);
ButtonTakeOrderInWork.UseVisualStyleBackColor = true; ButtonCreateOrder.Name = "ButtonCreateOrder";
ButtonTakeOrderInWork.Click += ButtonTakeOrderInWork_Click; ButtonCreateOrder.Size = new Size(241, 29);
// ButtonCreateOrder.TabIndex = 2;
// ButtonOrderReady ButtonCreateOrder.Text = "Создать заказ";
// ButtonCreateOrder.UseVisualStyleBackColor = true;
ButtonOrderReady.Location = new Point(831, 202); ButtonCreateOrder.Click += ButtonCreateOrder_Click;
ButtonOrderReady.Name = "ButtonOrderReady"; //
ButtonOrderReady.Size = new Size(241, 29); // ButtonIssuedOrder
ButtonOrderReady.TabIndex = 4; //
ButtonOrderReady.Text = "Заказ готов"; ButtonIssuedOrder.Location = new Point(831, 148);
ButtonOrderReady.UseVisualStyleBackColor = true; ButtonIssuedOrder.Name = "ButtonIssuedOrder";
ButtonOrderReady.Click += ButtonOrderReady_Click; ButtonIssuedOrder.Size = new Size(241, 29);
// ButtonIssuedOrder.TabIndex = 5;
// ButtonIssuedOrder ButtonIssuedOrder.Text = "Заказ выдан";
// ButtonIssuedOrder.UseVisualStyleBackColor = true;
ButtonIssuedOrder.Location = new Point(831, 264); ButtonIssuedOrder.Click += ButtonIssuedOrder_Click;
ButtonIssuedOrder.Name = "ButtonIssuedOrder"; //
ButtonIssuedOrder.Size = new Size(241, 29); // ButtonRef
ButtonIssuedOrder.TabIndex = 5; //
ButtonIssuedOrder.Text = "Заказ выдан"; ButtonRef.Location = new Point(831, 223);
ButtonIssuedOrder.UseVisualStyleBackColor = true; ButtonRef.Name = "ButtonRef";
ButtonIssuedOrder.Click += ButtonIssuedOrder_Click; ButtonRef.Size = new Size(241, 29);
// ButtonRef.TabIndex = 6;
// ButtonRef ButtonRef.Text = "Обновить список";
// ButtonRef.UseVisualStyleBackColor = true;
ButtonRef.Location = new Point(831, 331); ButtonRef.Click += ButtonRef_Click;
ButtonRef.Name = "ButtonRef"; //
ButtonRef.Size = new Size(241, 29); // исполнителиToolStripMenuItem
ButtonRef.TabIndex = 6; //
ButtonRef.Text = "Обновить список"; исполнителиToolStripMenuItem.Name = сполнителиToolStripMenuItem";
ButtonRef.UseVisualStyleBackColor = true; исполнителиToolStripMenuItem.Size = new Size(224, 26);
ButtonRef.Click += ButtonRef_Click; исполнителиToolStripMenuItem.Text = "Исполнители";
// исполнителиToolStripMenuItem.Click += ИсполнителиToolStripMenuItem_Click;
// ClientToolStripMenuItem //
// // FormMain
ClientToolStripMenuItem.Name = "ClientToolStripMenuItem"; //
ClientToolStripMenuItem.Size = new Size(224, 26); AutoScaleDimensions = new SizeF(8F, 20F);
ClientToolStripMenuItem.Text = "Клиенты"; AutoScaleMode = AutoScaleMode.Font;
ClientToolStripMenuItem.Click += ClientToolStripMenuItem_Click; ClientSize = new Size(1104, 470);
// Controls.Add(ButtonRef);
// FormMain Controls.Add(ButtonIssuedOrder);
// Controls.Add(ButtonCreateOrder);
AutoScaleDimensions = new SizeF(8F, 20F); Controls.Add(dataGridView);
AutoScaleMode = AutoScaleMode.Font; Controls.Add(menuStrip);
ClientSize = new Size(1104, 470); MainMenuStrip = menuStrip;
Controls.Add(ButtonRef); Name = "FormMain";
Controls.Add(ButtonIssuedOrder); Text = "Доставка еды";
Controls.Add(ButtonOrderReady); Load += FormMain_Load;
Controls.Add(ButtonTakeOrderInWork); menuStrip.ResumeLayout(false);
Controls.Add(ButtonCreateOrder); menuStrip.PerformLayout();
Controls.Add(dataGridView); ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
Controls.Add(menuStrip); ResumeLayout(false);
MainMenuStrip = menuStrip; PerformLayout();
Name = "FormMain"; }
Text = "Доставка еды";
Load += FormMain_Load;
menuStrip.ResumeLayout(false);
menuStrip.PerformLayout();
((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
ResumeLayout(false);
PerformLayout();
}
#endregion #endregion
private MenuStrip menuStrip; private MenuStrip menuStrip;
private ToolStripMenuItem справочникиToolStripMenuItem; private ToolStripMenuItem справочникиToolStripMenuItem;
private ToolStripMenuItem КомпонентыToolStripMenuItem; private ToolStripMenuItem КомпонентыToolStripMenuItem;
private ToolStripMenuItem БлюдаToolStripMenuItem; private ToolStripMenuItem БлюдаToolStripMenuItem;
private DataGridView dataGridView; private DataGridView dataGridView;
private Button ButtonCreateOrder; private Button ButtonCreateOrder;
private Button ButtonTakeOrderInWork; private Button ButtonIssuedOrder;
private Button ButtonOrderReady; private Button ButtonRef;
private Button ButtonIssuedOrder; private ToolStripMenuItem отчётыToolStripMenuItem;
private Button ButtonRef; private ToolStripMenuItem ComponentToolStripMenuItem;
private ToolStripMenuItem отчётыToolStripMenuItem; private ToolStripMenuItem ComponentProductsToolStripMenuItem;
private ToolStripMenuItem ComponentToolStripMenuItem; private ToolStripMenuItem OrdersToolStripMenuItem;
private ToolStripMenuItem ComponentProductsToolStripMenuItem; private ToolStripMenuItem ClientToolStripMenuItem;
private ToolStripMenuItem OrdersToolStripMenuItem; private ToolStripMenuItem запускРаботыToolStripMenuItem;
private ToolStripMenuItem ClientToolStripMenuItem; private ToolStripMenuItem исполнителиToolStripMenuItem;
} }
} }

View File

@ -14,194 +14,205 @@ using System.Windows.Forms;
namespace FoodOrders namespace FoodOrders
{ {
public partial class FormMain : Form public partial class FormMain : Form
{ {
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 FormMain(ILogger<FormMain> logger, IOrderLogic orderLogic, IReportLogic reportLogic) private readonly IWorkProcess _workProcess;
{ public FormMain(ILogger<FormMain> logger, IOrderLogic orderLogic, IReportLogic reportLogic, IWorkProcess workProcess)
InitializeComponent(); {
_logger = logger; InitializeComponent();
_orderLogic = orderLogic; _logger = logger;
_reportLogic = reportLogic; _orderLogic = orderLogic;
} _reportLogic = reportLogic;
private void FormMain_Load(object sender, EventArgs e) _workProcess = workProcess;
{ }
LoadData(); private void FormMain_Load(object sender, EventArgs e)
} {
private void LoadData() LoadData();
{ }
try private void LoadData()
{ {
var list = _orderLogic.ReadList(null); try
if (list != null) {
{ var list = _orderLogic.ReadList(null);
dataGridView.DataSource = list; if (list != null)
dataGridView.Columns["ClientId"].Visible = false; {
dataGridView.Columns["DishId"].Visible = false; dataGridView.DataSource = list;
} dataGridView.Columns["ClientId"].Visible = false;
_logger.LogInformation("Загрузка заказов"); dataGridView.Columns["DishId"].Visible = false;
} dataGridView.Columns["ImplementerId"].Visible = false;
catch (Exception ex) }
{ _logger.LogInformation("Загрузка заказов");
_logger.LogError(ex, "Ошибка загрузки заказов"); }
MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); catch (Exception ex)
} {
} _logger.LogError(ex, "Ошибка загрузки заказов");
private void КомпонентыToolStripMenuItem_Click(object sender, EventArgs e) MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
{ }
var service = }
Program.ServiceProvider?.GetService(typeof(FormComponents)); private void КомпонентыToolStripMenuItem_Click(object sender, EventArgs e)
if (service is FormComponents form) {
{ var service =
form.ShowDialog(); Program.ServiceProvider?.GetService(typeof(FormComponents));
} if (service is FormComponents form)
} {
private void ИзделияToolStripMenuItem_Click(object sender, EventArgs e) form.ShowDialog();
{ }
var service = }
Program.ServiceProvider?.GetService(typeof(FormDishes)); private void ИзделияToolStripMenuItem_Click(object sender, EventArgs e)
if (service is FormDishes form) {
{ var service =
form.ShowDialog(); Program.ServiceProvider?.GetService(typeof(FormDishes));
} if (service is FormDishes form)
} {
private void ButtonCreateOrder_Click(object sender, EventArgs e) form.ShowDialog();
{ }
var service = }
Program.ServiceProvider?.GetService(typeof(FormCreateOrder)); private void ButtonCreateOrder_Click(object sender, EventArgs e)
if (service is FormCreateOrder form) {
{ var service =
form.ShowDialog(); Program.ServiceProvider?.GetService(typeof(FormCreateOrder));
LoadData(); if (service is FormCreateOrder form)
} {
} form.ShowDialog();
private void ButtonTakeOrderInWork_Click(object sender, EventArgs e) LoadData();
{ }
if (dataGridView.SelectedRows.Count == 1) }
{ private void ButtonTakeOrderInWork_Click(object sender, EventArgs e)
int id = {
Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); if (dataGridView.SelectedRows.Count == 1)
_logger.LogInformation("Заказ №{id}. Меняется статус на 'В работе'", id); {
try int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
{ _logger.LogInformation("Заказ №{id}. Меняется статус на 'В работе'", id);
var operationResult = _orderLogic.TakeOrderInWork(new try
OrderBindingModel {
{ Id = id }); var operationResult = _orderLogic.TakeOrderInWork(new OrderBindingModel { Id = id });
if (!operationResult) if (!operationResult)
{ {
throw new Exception("Ошибка при сохранении. Дополнительная информация в логах."); throw new Exception("Ошибка при сохранении. Дополнительная информация в логах.");
} }
LoadData(); LoadData();
} }
catch (Exception ex) catch (Exception ex)
{ {
_logger.LogError(ex, "Ошибка передачи заказа в работу"); _logger.LogError(ex, "Ошибка передачи заказа в работу");
MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
MessageBoxIcon.Error); }
} }
} }
} private void ButtonOrderReady_Click(object sender, EventArgs e)
private void ButtonOrderReady_Click(object sender, EventArgs e) {
{ if (dataGridView.SelectedRows.Count == 1)
if (dataGridView.SelectedRows.Count == 1) {
{ int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
int id = _logger.LogInformation("Заказ №{id}. Меняется статус на 'Готов'", id);
Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); try
_logger.LogInformation("Заказ №{id}. Меняется статус на 'Готов'", {
id); var operationResult = _orderLogic.FinishOrder(new OrderBindingModel { Id = id });
try if (!operationResult)
{ {
var operationResult = _orderLogic.FinishOrder(new throw new Exception("Ошибка при сохранении. Дополнительная информация в логах.");
OrderBindingModel }
{ Id = id }); LoadData();
if (!operationResult) }
{ catch (Exception ex)
throw new Exception("Ошибка при сохранении. Дополнительная информация в логах."); {
} _logger.LogError(ex, "Ошибка отметки о готовности заказа");
LoadData(); MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
} }
catch (Exception ex) }
{ }
_logger.LogError(ex, "Ошибка отметки о готовности заказа"); private void ButtonIssuedOrder_Click(object sender, EventArgs e)
MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); {
} if (dataGridView.SelectedRows.Count == 1)
} {
} int id =
private void ButtonIssuedOrder_Click(object sender, EventArgs e) Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
{ _logger.LogInformation("Заказ №{id}. Меняется статус на 'Выдан'",
if (dataGridView.SelectedRows.Count == 1) id);
{ try
int id = {
Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); var operationResult = _orderLogic.DeliveryOrder(new
_logger.LogInformation("Заказ №{id}. Меняется статус на 'Выдан'", OrderBindingModel
id); { Id = id });
try if (!operationResult)
{ {
var operationResult = _orderLogic.DeliveryOrder(new throw new Exception("Ошибка при сохранении. Дополнительная информация в логах.");
OrderBindingModel }
{ Id = id }); _logger.LogInformation("Заказ №{id} выдан", id);
if (!operationResult) LoadData();
{ }
throw new Exception("Ошибка при сохранении. Дополнительная информация в логах."); catch (Exception ex)
} {
_logger.LogInformation("Заказ №{id} выдан", id); _logger.LogError(ex, "Ошибка отметки о выдачи заказа");
LoadData(); MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
} MessageBoxIcon.Error);
catch (Exception ex) }
{ }
_logger.LogError(ex, "Ошибка отметки о выдачи заказа"); }
MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, private void ButtonRef_Click(object sender, EventArgs e)
MessageBoxIcon.Error); {
} LoadData();
} }
}
private void ButtonRef_Click(object sender, EventArgs e)
{
LoadData();
}
private void ComponentToolStripMenuItem_Click(object sender, EventArgs e) private void ComponentToolStripMenuItem_Click(object sender, EventArgs e)
{ {
using var dialog = new SaveFileDialog { Filter = "docx|*.docx" }; using var dialog = new SaveFileDialog { Filter = "docx|*.docx" };
if (dialog.ShowDialog() == DialogResult.OK) if (dialog.ShowDialog() == DialogResult.OK)
{ {
_reportLogic.SaveComponentsToWordFile(new ReportBindingModel _reportLogic.SaveComponentsToWordFile(new ReportBindingModel
{ {
FileName = dialog.FileName FileName = dialog.FileName
}); });
MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK,
MessageBoxIcon.Information); MessageBoxIcon.Information);
} }
} }
private void ComponentProductsToolStripMenuItem_Click(object sender, EventArgs e) private void ComponentProductsToolStripMenuItem_Click(object sender, EventArgs e)
{ {
var service = Program.ServiceProvider?.GetService(typeof(FormReportDishComponents)); var service = Program.ServiceProvider?.GetService(typeof(FormReportDishComponents));
if (service is FormReportDishComponents form) if (service is FormReportDishComponents form)
{ {
form.ShowDialog(); form.ShowDialog();
} }
} }
private void OrdersToolStripMenuItem_Click(object sender, EventArgs e) private void OrdersToolStripMenuItem_Click(object sender, EventArgs e)
{ {
var service = Program.ServiceProvider?.GetService(typeof(FormReportOrders)); var service = Program.ServiceProvider?.GetService(typeof(FormReportOrders));
if (service is FormReportOrders form) if (service is FormReportOrders form)
{ {
form.ShowDialog(); form.ShowDialog();
} }
} }
private void ClientToolStripMenuItem_Click(object sender, EventArgs e) private void ClientToolStripMenuItem_Click(object sender, EventArgs e)
{ {
var service = Program.ServiceProvider?.GetService(typeof(FormClients)); var service = Program.ServiceProvider?.GetService(typeof(FormClients));
if (service is FormClients form) if (service is FormClients form)
{ {
form.ShowDialog(); form.ShowDialog();
} }
} }
} private void ИсполнителиToolStripMenuItem_Click(object sender, EventArgs e)
{
var service = Program.ServiceProvider?.GetService(typeof(FormImplementers));
if (service is FormImplementers form)
{
form.ShowDialog();
}
}
private void ЗапускРаботыToolStripMenuItem_Click(object sender, EventArgs e)
{
_workProcess.DoWork((Program.ServiceProvider?.GetService(typeof(IImplementerLogic)) as IImplementerLogic)!, _orderLogic);
MessageBox.Show("Процесс обработки запущен", "Сообщение",
MessageBoxButtons.OK, MessageBoxIcon.Information);
}
}
} }

View File

@ -40,12 +40,15 @@ namespace FoodOrders
services.AddTransient<IOrderStorage, OrderStorage>(); services.AddTransient<IOrderStorage, OrderStorage>();
services.AddTransient<IDishStorage, DishStorage>(); services.AddTransient<IDishStorage, DishStorage>();
services.AddTransient<IClientStorage, ClientStorage>(); services.AddTransient<IClientStorage, ClientStorage>();
services.AddTransient<IImplementerStorage, ImplementerStorage>();
services.AddTransient<IComponentLogic, ComponentLogic>(); services.AddTransient<IComponentLogic, ComponentLogic>();
services.AddTransient<IOrderLogic, OrderLogic>(); services.AddTransient<IOrderLogic, OrderLogic>();
services.AddTransient<IDishLogic, DishLogic>(); services.AddTransient<IDishLogic, DishLogic>();
services.AddTransient<IReportLogic, ReportLogic>(); services.AddTransient<IReportLogic, ReportLogic>();
services.AddTransient<IClientLogic, ClientLogic>(); services.AddTransient<IClientLogic, ClientLogic>();
services.AddTransient<AbstractSaveToExcel, SaveToExcel>(); services.AddTransient<IImplementerLogic, ImplementerLogic>();
services.AddTransient<IWorkProcess, WorkModeling>();
services.AddTransient<AbstractSaveToExcel, SaveToExcel>();
services.AddTransient<AbstractSaveToWord, SaveToWord>(); services.AddTransient<AbstractSaveToWord, SaveToWord>();
services.AddTransient<AbstractSaveToPdf, SaveToPdf>(); services.AddTransient<AbstractSaveToPdf, SaveToPdf>();
services.AddTransient<FormMain>(); services.AddTransient<FormMain>();
@ -58,6 +61,8 @@ namespace FoodOrders
services.AddTransient<FormReportDishComponents>(); services.AddTransient<FormReportDishComponents>();
services.AddTransient<FormReportOrders>(); services.AddTransient<FormReportOrders>();
services.AddTransient<FormClients>(); services.AddTransient<FormClients>();
} services.AddTransient<FormCreateImplementer>();
services.AddTransient<FormImplementers>();
}
} }
} }