diff --git a/PlumbingRepair/FormImplementer.Designer.cs b/PlumbingRepair/FormImplementer.Designer.cs new file mode 100644 index 0000000..6b30b2a --- /dev/null +++ b/PlumbingRepair/FormImplementer.Designer.cs @@ -0,0 +1,173 @@ +namespace PlumbingRepair +{ + partial class FormImplementer + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + FIOTextBox = new TextBox(); + PasswordTextBox = new TextBox(); + LabelFIO = new Label(); + LabelPassword = new Label(); + QualificationNumericUpDown = new NumericUpDown(); + WorkExpNumericUpDown = new NumericUpDown(); + LabelWorkExperience = new Label(); + LabelQualification = new Label(); + ButtonCancel = new Button(); + ButtonSave = new Button(); + ((System.ComponentModel.ISupportInitialize)QualificationNumericUpDown).BeginInit(); + ((System.ComponentModel.ISupportInitialize)WorkExpNumericUpDown).BeginInit(); + SuspendLayout(); + // + // FIOTextBox + // + FIOTextBox.Location = new Point(128, 16); + FIOTextBox.Margin = new Padding(3, 4, 3, 4); + FIOTextBox.Name = "FIOTextBox"; + FIOTextBox.Size = new Size(194, 27); + FIOTextBox.TabIndex = 0; + // + // PasswordTextBox + // + PasswordTextBox.Location = new Point(128, 65); + PasswordTextBox.Margin = new Padding(3, 4, 3, 4); + PasswordTextBox.Name = "PasswordTextBox"; + PasswordTextBox.Size = new Size(194, 27); + PasswordTextBox.TabIndex = 1; + // + // LabelFIO + // + LabelFIO.AutoSize = true; + LabelFIO.Location = new Point(14, 20); + LabelFIO.Name = "LabelFIO"; + LabelFIO.Size = new Size(49, 20); + LabelFIO.TabIndex = 2; + LabelFIO.Text = "ФИО: "; + // + // LabelPassword + // + LabelPassword.AutoSize = true; + LabelPassword.Location = new Point(14, 69); + LabelPassword.Name = "LabelPassword"; + LabelPassword.Size = new Size(69, 20); + LabelPassword.TabIndex = 3; + LabelPassword.Text = "Пароль: "; + // + // QualificationNumericUpDown + // + QualificationNumericUpDown.Location = new Point(128, 175); + QualificationNumericUpDown.Margin = new Padding(3, 4, 3, 4); + QualificationNumericUpDown.Name = "QualificationNumericUpDown"; + QualificationNumericUpDown.Size = new Size(194, 27); + QualificationNumericUpDown.TabIndex = 4; + // + // WorkExpNumericUpDown + // + WorkExpNumericUpDown.Location = new Point(128, 120); + WorkExpNumericUpDown.Margin = new Padding(3, 4, 3, 4); + WorkExpNumericUpDown.Name = "WorkExpNumericUpDown"; + WorkExpNumericUpDown.Size = new Size(194, 27); + WorkExpNumericUpDown.TabIndex = 5; + // + // LabelWorkExperience + // + LabelWorkExperience.AutoSize = true; + LabelWorkExperience.Location = new Point(14, 123); + LabelWorkExperience.Name = "LabelWorkExperience"; + LabelWorkExperience.Size = new Size(109, 20); + LabelWorkExperience.TabIndex = 6; + LabelWorkExperience.Text = "Опыт работы: "; + // + // LabelQualification + // + LabelQualification.AutoSize = true; + LabelQualification.Location = new Point(5, 177); + LabelQualification.Name = "LabelQualification"; + LabelQualification.Size = new Size(118, 20); + LabelQualification.TabIndex = 7; + LabelQualification.Text = "Квалификация: "; + // + // ButtonCancel + // + ButtonCancel.Location = new Point(211, 225); + ButtonCancel.Margin = new Padding(3, 4, 3, 4); + ButtonCancel.Name = "ButtonCancel"; + ButtonCancel.Size = new Size(111, 39); + ButtonCancel.TabIndex = 8; + ButtonCancel.Text = "Отмена"; + ButtonCancel.UseVisualStyleBackColor = true; + ButtonCancel.Click += ButtonCancel_Click; + // + // ButtonSave + // + ButtonSave.Location = new Point(94, 225); + ButtonSave.Margin = new Padding(3, 4, 3, 4); + ButtonSave.Name = "ButtonSave"; + ButtonSave.Size = new Size(111, 39); + ButtonSave.TabIndex = 9; + ButtonSave.Text = "Сохранить"; + ButtonSave.UseVisualStyleBackColor = true; + ButtonSave.Click += ButtonSave_Click; + // + // FormImplementer + // + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(350, 285); + Controls.Add(ButtonSave); + Controls.Add(ButtonCancel); + Controls.Add(LabelQualification); + Controls.Add(LabelWorkExperience); + Controls.Add(WorkExpNumericUpDown); + Controls.Add(QualificationNumericUpDown); + Controls.Add(LabelPassword); + Controls.Add(LabelFIO); + Controls.Add(PasswordTextBox); + Controls.Add(FIOTextBox); + Margin = new Padding(3, 4, 3, 4); + Name = "FormImplementer"; + Text = "Исполнитель"; + Load += FormImplementer_Load; + ((System.ComponentModel.ISupportInitialize)QualificationNumericUpDown).EndInit(); + ((System.ComponentModel.ISupportInitialize)WorkExpNumericUpDown).EndInit(); + ResumeLayout(false); + PerformLayout(); + } + + #endregion + + private TextBox FIOTextBox; + private TextBox PasswordTextBox; + private Label LabelFIO; + private Label LabelPassword; + private NumericUpDown QualificationNumericUpDown; + private NumericUpDown WorkExpNumericUpDown; + private Label LabelWorkExperience; + private Label LabelQualification; + private Button ButtonCancel; + private Button ButtonSave; + } +} \ No newline at end of file diff --git a/PlumbingRepair/FormImplementer.cs b/PlumbingRepair/FormImplementer.cs new file mode 100644 index 0000000..daad2de --- /dev/null +++ b/PlumbingRepair/FormImplementer.cs @@ -0,0 +1,106 @@ +using Microsoft.Extensions.Logging; +using PlumbingRepairContracts.BindingModels; +using PlumbingRepairContracts.BusinessLogicsContracts; +using PlumbingRepairContracts.SearchModels; +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 PlumbingRepair +{ + public partial class FormImplementer : Form + { + private readonly ILogger _logger; + private readonly IImplementerLogic _logic; + private int? _id; + public int Id { set { _id = value; } } + + public FormImplementer(ILogger logger, IImplementerLogic logic) + { + InitializeComponent(); + _logger = logger; + _logic = logic; + } + + private void ButtonSave_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(PasswordTextBox.Text)) + { + MessageBox.Show("Заполните пароль", "Ошибка", + MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + if (string.IsNullOrEmpty(FIOTextBox.Text)) + { + MessageBox.Show("Заполните фио", "Ошибка", + MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + _logger.LogInformation("Сохранение исполнителя"); + try + { + var model = new ImplementerBindingModel + { + Id = _id ?? 0, + ImplementerFIO = FIOTextBox.Text, + Password = PasswordTextBox.Text, + Qualification = (int)QualificationNumericUpDown.Value, + WorkExperience = (int)WorkExpNumericUpDown.Value, + }; + 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(); + } + + 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) + { + FIOTextBox.Text = view.ImplementerFIO; + PasswordTextBox.Text = view.Password; + QualificationNumericUpDown.Value = view.Qualification; + WorkExpNumericUpDown.Value = view.WorkExperience; + } + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка получения исполнителя"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + } +} diff --git a/PlumbingRepair/FormImplementer.resx b/PlumbingRepair/FormImplementer.resx new file mode 100644 index 0000000..f298a7b --- /dev/null +++ b/PlumbingRepair/FormImplementer.resx @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/PlumbingRepair/FormImplementers.Designer.cs b/PlumbingRepair/FormImplementers.Designer.cs new file mode 100644 index 0000000..6c36b91 --- /dev/null +++ b/PlumbingRepair/FormImplementers.Designer.cs @@ -0,0 +1,114 @@ +namespace PlumbingRepair +{ + partial class FormImplementers + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.DataGridView = new System.Windows.Forms.DataGridView(); + this.AddButton = new System.Windows.Forms.Button(); + this.ChangeButton = new System.Windows.Forms.Button(); + this.DeleteButton = new System.Windows.Forms.Button(); + this.UpdateButton = new System.Windows.Forms.Button(); + ((System.ComponentModel.ISupportInitialize)(this.DataGridView)).BeginInit(); + this.SuspendLayout(); + // + // DataGridView + // + this.DataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.DataGridView.Location = new System.Drawing.Point(1, 1); + this.DataGridView.Name = "DataGridView"; + this.DataGridView.RowTemplate.Height = 25; + this.DataGridView.Size = new System.Drawing.Size(632, 448); + this.DataGridView.TabIndex = 0; + // + // AddButton + // + this.AddButton.Location = new System.Drawing.Point(639, 12); + this.AddButton.Name = "AddButton"; + this.AddButton.Size = new System.Drawing.Size(98, 45); + this.AddButton.TabIndex = 1; + this.AddButton.Text = "Добавить"; + this.AddButton.UseVisualStyleBackColor = true; + this.AddButton.Click += new System.EventHandler(this.AddButton_Click); + // + // ChangeButton + // + this.ChangeButton.Location = new System.Drawing.Point(639, 63); + this.ChangeButton.Name = "ChangeButton"; + this.ChangeButton.Size = new System.Drawing.Size(98, 45); + this.ChangeButton.TabIndex = 2; + this.ChangeButton.Text = "Изменить"; + this.ChangeButton.UseVisualStyleBackColor = true; + this.ChangeButton.Click += new System.EventHandler(this.ChangeButton_Click); + // + // DeleteButton + // + this.DeleteButton.Location = new System.Drawing.Point(639, 114); + this.DeleteButton.Name = "DeleteButton"; + this.DeleteButton.Size = new System.Drawing.Size(98, 45); + this.DeleteButton.TabIndex = 3; + this.DeleteButton.Text = "Удалить"; + this.DeleteButton.UseVisualStyleBackColor = true; + this.DeleteButton.Click += new System.EventHandler(this.DeleteButton_Click); + // + // UpdateButton + // + this.UpdateButton.Location = new System.Drawing.Point(639, 165); + this.UpdateButton.Name = "UpdateButton"; + this.UpdateButton.Size = new System.Drawing.Size(98, 45); + this.UpdateButton.TabIndex = 4; + this.UpdateButton.Text = "Обновить"; + this.UpdateButton.UseVisualStyleBackColor = true; + this.UpdateButton.Click += new System.EventHandler(this.UpdateButton_Click); + // + // FormImplementers + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(749, 450); + this.Controls.Add(this.UpdateButton); + this.Controls.Add(this.DeleteButton); + this.Controls.Add(this.ChangeButton); + this.Controls.Add(this.AddButton); + 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 DataGridView DataGridView; + private Button AddButton; + private Button ChangeButton; + private Button DeleteButton; + private Button UpdateButton; + } +} \ No newline at end of file diff --git a/PlumbingRepair/FormImplementers.cs b/PlumbingRepair/FormImplementers.cs new file mode 100644 index 0000000..cd29385 --- /dev/null +++ b/PlumbingRepair/FormImplementers.cs @@ -0,0 +1,120 @@ +using Microsoft.Extensions.Logging; +using PlumbingRepairContracts.BindingModels; +using PlumbingRepairContracts.BusinessLogicsContracts; +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 PlumbingRepair +{ + public partial class FormImplementers : Form + { + private readonly ILogger _logger; + private readonly IImplementerLogic _logic; + public FormImplementers(ILogger logger, IImplementerLogic logic) + { + InitializeComponent(); + _logger = logger; + _logic = logic; + } + + private void AddButton_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormImplementer)); + + if (service is FormImplementer form) + { + if (form.ShowDialog() == DialogResult.OK) + { + LoadData(); + } + } + } + + private void ChangeButton_Click(object sender, EventArgs e) + { + if (DataGridView.SelectedRows.Count == 1) + { + var service = Program.ServiceProvider?.GetService(typeof(FormImplementer)); + if (service is FormImplementer form) + { + form.Id = Convert.ToInt32(DataGridView.SelectedRows[0].Cells["Id"].Value); + if (form.ShowDialog() == DialogResult.OK) + { + LoadData(); + } + } + } + } + + private void DeleteButton_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 UpdateButton_Click(object sender, EventArgs e) + { + LoadData(); + } + + 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); + } + } + } +} diff --git a/PlumbingRepair/FormImplementers.resx b/PlumbingRepair/FormImplementers.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/PlumbingRepair/FormImplementers.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/PlumbingRepair/FormMain.Designer.cs b/PlumbingRepair/FormMain.Designer.cs index 974bd20..100f154 100644 --- a/PlumbingRepair/FormMain.Designer.cs +++ b/PlumbingRepair/FormMain.Designer.cs @@ -37,12 +37,14 @@ WorksToolStripMenuItem = new ToolStripMenuItem(); WorkComponentToolStripMenuItem = new ToolStripMenuItem(); OrdersToolStripMenuItem = new ToolStripMenuItem(); + запускРаботToolStripMenuItem = new ToolStripMenuItem(); DataGridView = new DataGridView(); CreateOrderButton = new Button(); TakeOrderInWorkButton = new Button(); OrderReadyButton = new Button(); IssuedOrderButton = new Button(); UpdateListButton = new Button(); + исполнителиToolStripMenuItem = new ToolStripMenuItem(); MenuStrip.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)DataGridView).BeginInit(); SuspendLayout(); @@ -50,39 +52,38 @@ // MenuStrip // 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.Name = "MenuStrip"; - MenuStrip.Padding = new Padding(7, 3, 0, 3); - MenuStrip.Size = new Size(989, 30); + MenuStrip.Size = new Size(865, 24); MenuStrip.TabIndex = 0; MenuStrip.Text = "menuStrip1"; // // СправочникиToolStripMenuItem // - СправочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { РаботыToolStripMenuItem, КомпонентыToolStripMenuItem, КлиентыToolStripMenuItem }); + СправочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { РаботыToolStripMenuItem, КомпонентыToolStripMenuItem, КлиентыToolStripMenuItem, исполнителиToolStripMenuItem }); СправочникиToolStripMenuItem.Name = "СправочникиToolStripMenuItem"; - СправочникиToolStripMenuItem.Size = new Size(117, 24); + СправочникиToolStripMenuItem.Size = new Size(94, 20); СправочникиToolStripMenuItem.Text = "Cправочники"; // // РаботыToolStripMenuItem // РаботыToolStripMenuItem.Name = "РаботыToolStripMenuItem"; - РаботыToolStripMenuItem.Size = new Size(182, 26); + РаботыToolStripMenuItem.Size = new Size(180, 22); РаботыToolStripMenuItem.Text = "Работы"; РаботыToolStripMenuItem.Click += РаботыToolStripMenuItem_Click; // // КомпонентыToolStripMenuItem // КомпонентыToolStripMenuItem.Name = "КомпонентыToolStripMenuItem"; - КомпонентыToolStripMenuItem.Size = new Size(182, 26); + КомпонентыToolStripMenuItem.Size = new Size(180, 22); КомпонентыToolStripMenuItem.Text = "Компоненты"; КомпонентыToolStripMenuItem.Click += КомпонентыToolStripMenuItem_Click; // // КлиентыToolStripMenuItem // КлиентыToolStripMenuItem.Name = "КлиентыToolStripMenuItem"; - КлиентыToolStripMenuItem.Size = new Size(182, 26); + КлиентыToolStripMenuItem.Size = new Size(180, 22); КлиентыToolStripMenuItem.Text = "Клиенты"; КлиентыToolStripMenuItem.Click += КлиентыToolStripMenuItem_Click; // @@ -90,47 +91,52 @@ // отчетыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { WorksToolStripMenuItem, WorkComponentToolStripMenuItem, OrdersToolStripMenuItem }); отчетыToolStripMenuItem.Name = "отчетыToolStripMenuItem"; - отчетыToolStripMenuItem.Size = new Size(73, 24); + отчетыToolStripMenuItem.Size = new Size(60, 20); отчетыToolStripMenuItem.Text = "Отчеты"; // // WorksToolStripMenuItem // WorksToolStripMenuItem.Name = "WorksToolStripMenuItem"; - WorksToolStripMenuItem.Size = new Size(273, 26); + WorksToolStripMenuItem.Size = new Size(211, 22); WorksToolStripMenuItem.Text = "Список работ"; WorksToolStripMenuItem.Click += WorksToolStripMenuItem_Click; // // WorkComponentToolStripMenuItem // WorkComponentToolStripMenuItem.Name = "WorkComponentToolStripMenuItem"; - WorkComponentToolStripMenuItem.Size = new Size(273, 26); + WorkComponentToolStripMenuItem.Size = new Size(211, 22); WorkComponentToolStripMenuItem.Text = "Работы по компонентам"; WorkComponentToolStripMenuItem.Click += WorkComponentToolStripMenuItem_Click; // // OrdersToolStripMenuItem // OrdersToolStripMenuItem.Name = "OrdersToolStripMenuItem"; - OrdersToolStripMenuItem.Size = new Size(273, 26); + OrdersToolStripMenuItem.Size = new Size(211, 22); OrdersToolStripMenuItem.Text = "Список заказов"; OrdersToolStripMenuItem.Click += OrdersToolStripMenuItem_Click; // + // запускРаботToolStripMenuItem + // + запускРаботToolStripMenuItem.Name = "запускРаботToolStripMenuItem"; + запускРаботToolStripMenuItem.Size = new Size(92, 20); + запускРаботToolStripMenuItem.Text = "Запуск Работ"; + запускРаботToolStripMenuItem.Click += запускРаботToolStripMenuItem_Click; + // // DataGridView // DataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; - DataGridView.Location = new Point(0, 36); - DataGridView.Margin = new Padding(3, 4, 3, 4); + DataGridView.Location = new Point(0, 27); DataGridView.Name = "DataGridView"; DataGridView.RowHeadersWidth = 51; DataGridView.RowTemplate.Height = 25; - DataGridView.Size = new Size(825, 561); + DataGridView.Size = new Size(722, 421); DataGridView.TabIndex = 1; // // CreateOrderButton // - CreateOrderButton.Location = new Point(832, 37); - CreateOrderButton.Margin = new Padding(3, 4, 3, 4); + CreateOrderButton.Location = new Point(728, 28); CreateOrderButton.Name = "CreateOrderButton"; - CreateOrderButton.Size = new Size(143, 44); + CreateOrderButton.Size = new Size(125, 33); CreateOrderButton.TabIndex = 2; CreateOrderButton.Text = "Создать заказ"; CreateOrderButton.UseVisualStyleBackColor = true; @@ -138,10 +144,9 @@ // // TakeOrderInWorkButton // - TakeOrderInWorkButton.Location = new Point(832, 111); - TakeOrderInWorkButton.Margin = new Padding(3, 4, 3, 4); + TakeOrderInWorkButton.Location = new Point(728, 83); TakeOrderInWorkButton.Name = "TakeOrderInWorkButton"; - TakeOrderInWorkButton.Size = new Size(143, 52); + TakeOrderInWorkButton.Size = new Size(125, 39); TakeOrderInWorkButton.TabIndex = 3; TakeOrderInWorkButton.Text = "Отдать на выполнение"; TakeOrderInWorkButton.UseVisualStyleBackColor = true; @@ -149,10 +154,9 @@ // // OrderReadyButton // - OrderReadyButton.Location = new Point(832, 195); - OrderReadyButton.Margin = new Padding(3, 4, 3, 4); + OrderReadyButton.Location = new Point(728, 146); OrderReadyButton.Name = "OrderReadyButton"; - OrderReadyButton.Size = new Size(143, 44); + OrderReadyButton.Size = new Size(125, 33); OrderReadyButton.TabIndex = 4; OrderReadyButton.Text = "Заказ готов"; OrderReadyButton.UseVisualStyleBackColor = true; @@ -160,10 +164,9 @@ // // IssuedOrderButton // - IssuedOrderButton.Location = new Point(832, 272); - IssuedOrderButton.Margin = new Padding(3, 4, 3, 4); + IssuedOrderButton.Location = new Point(728, 204); IssuedOrderButton.Name = "IssuedOrderButton"; - IssuedOrderButton.Size = new Size(143, 44); + IssuedOrderButton.Size = new Size(125, 33); IssuedOrderButton.TabIndex = 5; IssuedOrderButton.Text = "Заказ выдан"; IssuedOrderButton.UseVisualStyleBackColor = true; @@ -171,20 +174,26 @@ // // UpdateListButton // - UpdateListButton.Location = new Point(832, 349); - UpdateListButton.Margin = new Padding(3, 4, 3, 4); + UpdateListButton.Location = new Point(728, 262); UpdateListButton.Name = "UpdateListButton"; - UpdateListButton.Size = new Size(143, 44); + UpdateListButton.Size = new Size(125, 33); UpdateListButton.TabIndex = 6; UpdateListButton.Text = "Обновить список"; UpdateListButton.UseVisualStyleBackColor = true; UpdateListButton.Click += UpdateListButton_Click; // + // исполнителиToolStripMenuItem + // + исполнителиToolStripMenuItem.Name = "исполнителиToolStripMenuItem"; + исполнителиToolStripMenuItem.Size = new Size(180, 22); + исполнителиToolStripMenuItem.Text = "Исполнители"; + исполнителиToolStripMenuItem.Click += исполнителиToolStripMenuItem_Click; + // // FormMain // - AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(989, 600); + ClientSize = new Size(865, 450); Controls.Add(UpdateListButton); Controls.Add(IssuedOrderButton); Controls.Add(OrderReadyButton); @@ -193,7 +202,6 @@ Controls.Add(DataGridView); Controls.Add(MenuStrip); MainMenuStrip = MenuStrip; - Margin = new Padding(3, 4, 3, 4); Name = "FormMain"; Text = "Ремонт сантехники"; Load += FormMain_Load; @@ -221,5 +229,7 @@ private ToolStripMenuItem WorksToolStripMenuItem; private ToolStripMenuItem WorkComponentToolStripMenuItem; private ToolStripMenuItem OrdersToolStripMenuItem; + private ToolStripMenuItem запускРаботToolStripMenuItem; + private ToolStripMenuItem исполнителиToolStripMenuItem; } } \ No newline at end of file diff --git a/PlumbingRepair/FormMain.cs b/PlumbingRepair/FormMain.cs index a373dac..6b65a2b 100644 --- a/PlumbingRepair/FormMain.cs +++ b/PlumbingRepair/FormMain.cs @@ -13,12 +13,14 @@ namespace PlumbingRepair private readonly IOrderLogic _orderLogic; private readonly IReportLogic _reportLogic; - public FormMain(ILogger logger, IOrderLogic orderLogic, IReportLogic reportLogic) + private readonly IWorkProcess _workProcess; + public FormMain(ILogger logger, IOrderLogic orderLogic, IReportLogic reportLogic, IWorkProcess workProcess) { InitializeComponent(); _logger = logger; _orderLogic = orderLogic; _reportLogic = reportLogic; + _workProcess = workProcess; } private void FormMain_Load(object sender, EventArgs e) @@ -231,5 +233,21 @@ namespace PlumbingRepair 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); + } + + private void исполнителиToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormImplementers)); + + if (service is FormImplementers form) + { + form.ShowDialog(); + } + } } } diff --git a/PlumbingRepairBusinessLogic/BusinessLogic/ImplementerLogic.cs b/PlumbingRepairBusinessLogic/BusinessLogic/ImplementerLogic.cs new file mode 100644 index 0000000..ae0c413 --- /dev/null +++ b/PlumbingRepairBusinessLogic/BusinessLogic/ImplementerLogic.cs @@ -0,0 +1,125 @@ +using Microsoft.Extensions.Logging; +using PlumbingRepairContracts.BindingModels; +using PlumbingRepairContracts.BusinessLogicsContracts; +using PlumbingRepairContracts.SearchModels; +using PlumbingRepairContracts.StoragesContracts; +using PlumbingRepairContracts.ViewModels; + +namespace PlumbingRepairBusinessLogic.BusinessLogic +{ + public class ImplementerLogic : IImplementerLogic + { + private readonly ILogger _logger; + private readonly IImplementerStorage _implementerStorage; + + public ImplementerLogic(ILogger logger, IImplementerStorage implementerStorage) + { + _logger = logger; + _implementerStorage = implementerStorage; + } + + public bool Create(ImplementerBindingModel model) + { + CheckModel(model); + if (_implementerStorage.Insert(model) == null) + { + _logger.LogWarning("Insert operation failed"); + return false; + } + return true; + } + + public bool Delete(ImplementerBindingModel model) + { + CheckModel(model, false); + _logger.LogInformation("Delete. Id:{Id}", model.Id); + if (_implementerStorage.Delete(model) == null) + { + _logger.LogWarning("Delete operation failed"); + return false; + } + return true; + } + + public ImplementerViewModel? ReadElement(ImplementerSearchModel model) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } + _logger.LogInformation("ReadElement. FIO:{FIO}.Id:{ Id}", + model.ImplementerFIO, model.Id); + var element = _implementerStorage.GetElement(model); + + if (element == null) + { + _logger.LogWarning("ReadElement element not found"); + return null; + } + _logger.LogInformation("ReadElement find. Id:{Id}", element.Id); + return element; + } + + public List? ReadList(ImplementerSearchModel? model) + { + _logger.LogInformation("ReadList. FIO:{FIO}.Id:{ Id} ", model?.ImplementerFIO, model?.Id); + var list = (model == null) ? _implementerStorage.GetFullList() : + _implementerStorage.GetFilteredList(model); + if (list == null) + { + _logger.LogWarning("ReadList return null list"); + return null; + } + _logger.LogInformation("ReadList. Count:{Count}", list.Count); + return list; + } + + public bool Update(ImplementerBindingModel model) + { + CheckModel(model); + if (_implementerStorage.Update(model) == null) + { + _logger.LogWarning("Update operation failed"); + return false; + } + return true; + } + + private void CheckModel(ImplementerBindingModel model, bool withParams = true) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } + if (!withParams) + { + return; + } + if (model.WorkExperience < 0) + { + throw new ArgumentException("Опыт работы не должен быть отрицательным", nameof(model.WorkExperience)); + } + if (model.Qualification < 0) + { + throw new ArgumentException("Квалификация не должна быть отрицательной", nameof(model.Qualification)); + } + if (string.IsNullOrEmpty(model.Password)) + { + throw new ArgumentNullException("Нет пароля исполнителя", nameof(model.ImplementerFIO)); + } + if (string.IsNullOrEmpty(model.ImplementerFIO)) + { + throw new ArgumentNullException("Нет ФИО исполнителя", nameof(model.ImplementerFIO)); + } + _logger.LogInformation("Implementer. Id: {Id}, FIO: {FIO}", model.Id, model.ImplementerFIO); + var element = _implementerStorage.GetElement(new ImplementerSearchModel + { + ImplementerFIO = model.ImplementerFIO, + }); + if (element != null && element.Id != model.Id) + { + throw new InvalidOperationException("Исполнитель с таким ФИО уже есть"); + } + } + } +} diff --git a/PlumbingRepairBusinessLogic/BusinessLogic/OrderLogic.cs b/PlumbingRepairBusinessLogic/BusinessLogic/OrderLogic.cs index f228f4d..bdb6d72 100644 --- a/PlumbingRepairBusinessLogic/BusinessLogic/OrderLogic.cs +++ b/PlumbingRepairBusinessLogic/BusinessLogic/OrderLogic.cs @@ -40,45 +40,56 @@ namespace PlumbingRepairBusinessLogic.BusinessLogic return true; } + public bool StatusUpdate(OrderBindingModel model, OrderStatus newStatus) + { + var viewModel = _orderStorage.GetElement(new OrderSearchModel { Id = model.Id }); + if (viewModel == null) + { + throw new ArgumentNullException(nameof(model)); + } + if (viewModel.Status + 1 != newStatus) + { + _logger.LogWarning("Update operation failed. Order status incorrect."); + return false; + } + model.Status = newStatus; + model.DateCreate = viewModel.DateCreate; + model.Sum = viewModel.Sum; + model.Count = viewModel.Count; + model.DateImplement = viewModel.DateImplement; + model.WorkId = viewModel.WorkId; + if (viewModel.ImplementerId.HasValue) + { + model.ImplementerId = viewModel.ImplementerId; + } + if (model.Status == OrderStatus.Готов) model.DateImplement = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Utc); + else + { + model.DateImplement = viewModel.DateImplement; + } + CheckModel(model); + if (_orderStorage.Update(model) == null) + { + model.Status--; + _logger.LogWarning("Update operation failed"); + return false; + } + return true; + } - public bool StatusUpdate(OrderBindingModel model, OrderStatus newStatus) - { - CheckModel(model); - - if (model.Status + 1 != newStatus) - { - _logger.LogWarning("Status update to " + newStatus.ToString() + " operation failed. Order status incorrect."); - return false; - } - - model.Status = newStatus; - - if (model.Status == OrderStatus.Выдан) - model.DateImplement = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Utc); - - if (_orderStorage.Update(model) == null) - { - model.Status--; - _logger.LogWarning("Update operation failed"); - return false; - } - - return true; - } - - public bool TakeOrderInWork(OrderBindingModel model) + public bool TakeOrderInWork(OrderBindingModel model) { return StatusUpdate(model, OrderStatus.Выполняется); } public bool DeliveryOrder(OrderBindingModel model) { - return StatusUpdate(model, OrderStatus.Готов); - } + return StatusUpdate(model, OrderStatus.Выдан); + } public bool FinishOrder(OrderBindingModel model) { - return StatusUpdate(model, OrderStatus.Выдан); + return StatusUpdate(model, OrderStatus.Готов); } public List? ReadList(OrderSearchModel? model) @@ -111,12 +122,12 @@ namespace PlumbingRepairBusinessLogic.BusinessLogic if (model.WorkId < 0) { - throw new ArgumentNullException("Некорректный идентификатор работы", nameof(model.WorkId)); + throw new ArgumentNullException("Некорректный идентификатор изделия", nameof(model.WorkId)); } if (model.Count <= 0) { - throw new ArgumentNullException("Количество работ в заказе должно быть больше 0", nameof(model.Count)); + throw new ArgumentNullException("Количество изделий в заказе должно быть больше 0", nameof(model.Count)); } if (model.Sum <= 0) @@ -126,5 +137,22 @@ namespace PlumbingRepairBusinessLogic.BusinessLogic _logger.LogInformation("Order. OrderId:{Id}.Sum:{ Sum}. WorkId: { WorkId}", model.Id, model.Sum, model.WorkId); } - } + + public OrderViewModel? ReadElement(OrderSearchModel model) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } + _logger.LogInformation("ReadElement. Id:{ Id}", model.Id); + var element = _orderStorage.GetElement(model); + if (element == null) + { + _logger.LogWarning("ReadElement element not found"); + return null; + } + _logger.LogInformation("ReadElement find. Id:{Id}", element.Id); + return element; + } + } } diff --git a/PlumbingRepairBusinessLogic/BusinessLogic/ReportLogic.cs b/PlumbingRepairBusinessLogic/BusinessLogic/ReportLogic.cs index 9e5e998..d8412fd 100644 --- a/PlumbingRepairBusinessLogic/BusinessLogic/ReportLogic.cs +++ b/PlumbingRepairBusinessLogic/BusinessLogic/ReportLogic.cs @@ -76,7 +76,7 @@ namespace PlumbingRepairBusinessLogic.BusinessLogic _saveToWord.CreateDoc(new WordInfo { FileName = model.FileName, - Title = "Список работ", + Title = "Список изделий", Works = _workStorage.GetFullList() }); } @@ -85,7 +85,7 @@ namespace PlumbingRepairBusinessLogic.BusinessLogic _saveToExcel.CreateReport(new ExcelInfo { FileName = model.FileName, - Title = "Список работ", + Title = "Список изделий", Works = GetWork() }); } diff --git a/PlumbingRepairBusinessLogic/BusinessLogic/WorkLogic.cs b/PlumbingRepairBusinessLogic/BusinessLogic/WorkLogic.cs index 222352b..5b68c25 100644 --- a/PlumbingRepairBusinessLogic/BusinessLogic/WorkLogic.cs +++ b/PlumbingRepairBusinessLogic/BusinessLogic/WorkLogic.cs @@ -113,12 +113,12 @@ namespace PlumbingRepairBusinessLogic.BusinessLogic if (string.IsNullOrEmpty(model.WorkName)) { - throw new ArgumentNullException("Нет названия работы", nameof(model.WorkName)); + throw new ArgumentNullException("Нет названия изделия", nameof(model.WorkName)); } if (model.Price <= 0) { - throw new ArgumentNullException("Цена работы должна быть больше 0", nameof(model.Price)); + throw new ArgumentNullException("Цена изделия должна быть больше 0", nameof(model.Price)); } _logger.LogInformation("Work. WorkName:{WorkName}.Price:{ Cost}. Id: { Id}", model.WorkName, model.Price, model.Id); @@ -130,7 +130,7 @@ namespace PlumbingRepairBusinessLogic.BusinessLogic if (element != null && element.Id != model.Id) { - throw new InvalidOperationException("Работа с таким названием уже есть"); + throw new InvalidOperationException("Изделие с таким названием уже есть"); } } } diff --git a/PlumbingRepairBusinessLogic/BusinessLogic/WorkModeling.cs b/PlumbingRepairBusinessLogic/BusinessLogic/WorkModeling.cs new file mode 100644 index 0000000..41b24d2 --- /dev/null +++ b/PlumbingRepairBusinessLogic/BusinessLogic/WorkModeling.cs @@ -0,0 +1,136 @@ +using Microsoft.Extensions.Logging; +using PlumbingRepairContracts.BindingModels; +using PlumbingRepairContracts.BusinessLogicsContracts; +using PlumbingRepairContracts.SearchModels; +using PlumbingRepairContracts.ViewModels; +using PlumbingRepairDataModels.Enums; + +namespace PlumbingRepairBusinessLogic.BusinessLogic +{ + public class WorkModeling : IWorkProcess + { + private readonly ILogger _logger; + private readonly Random _rnd; + private IOrderLogic? _orderLogic; + public WorkModeling(ILogger 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 { Status = 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)); + } + } + /// + /// Иммитация работы исполнителя + /// + /// + /// + private async Task WorkerWorkAsync(ImplementerViewModel implementer, List orders) + { + if (_orderLogic == null || implementer == null) + { + return; + } + await RunOrderInWork(implementer); + await Task.Run(() => + { + 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 + }); + // делаем работу + Thread.Sleep(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 + }); + // отдыхаем + Thread.Sleep(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; + } + } + }); + } + /// + /// Ищем заказ, которые уже в работе (вдруг исполнителя прервали) + /// + /// + /// + 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, + Status = OrderStatus.Выполняется + })); + if (runOrder == null) + { + return; + } + _logger.LogDebug("DoWork. Worker {Id} back to order {Order}", implementer.Id, runOrder.Id); + // доделываем работу + Thread.Sleep(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 + }); + // отдыхаем + Thread.Sleep(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; + } + } + } +} diff --git a/PlumbingRepairContracts/BindingModels/ImplementerBindingModel.cs b/PlumbingRepairContracts/BindingModels/ImplementerBindingModel.cs new file mode 100644 index 0000000..5cd56fa --- /dev/null +++ b/PlumbingRepairContracts/BindingModels/ImplementerBindingModel.cs @@ -0,0 +1,18 @@ +using PlumbingRepairDataModels.Models; + +namespace PlumbingRepairContracts.BindingModels +{ + public class ImplementerBindingModel : IImplementerModel + { + + public int Id { get; set; } + + public string ImplementerFIO { get; set; } = string.Empty; + + public string Password { get; set; } = string.Empty; + + public int WorkExperience { get; set; } + + public int Qualification { get; set; } + } +} diff --git a/PlumbingRepairContracts/BindingModels/OrderBindingModel.cs b/PlumbingRepairContracts/BindingModels/OrderBindingModel.cs index 541b689..203f25e 100644 --- a/PlumbingRepairContracts/BindingModels/OrderBindingModel.cs +++ b/PlumbingRepairContracts/BindingModels/OrderBindingModel.cs @@ -8,7 +8,8 @@ namespace PlumbingRepairContracts.BindingModels public int Id { get; set; } public int WorkId { get; set; } public int ClientId { get; set; } - public int Count { get; set; } + public int? ImplementerId { get; set; } + public int Count { get; set; } public double Sum { get; set; } public OrderStatus Status { get; set; } = OrderStatus.Неизвестен; public DateTime DateCreate { get; set; } = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Utc); diff --git a/PlumbingRepairContracts/BusinessLogicsContracts/IImplementerLogic.cs b/PlumbingRepairContracts/BusinessLogicsContracts/IImplementerLogic.cs new file mode 100644 index 0000000..aeba6dd --- /dev/null +++ b/PlumbingRepairContracts/BusinessLogicsContracts/IImplementerLogic.cs @@ -0,0 +1,19 @@ +using PlumbingRepairContracts.BindingModels; +using PlumbingRepairContracts.SearchModels; +using PlumbingRepairContracts.ViewModels; + +namespace PlumbingRepairContracts.BusinessLogicsContracts +{ + public interface IImplementerLogic + { + List? ReadList(ImplementerSearchModel? model); + + ImplementerViewModel? ReadElement(ImplementerSearchModel model); + + bool Create(ImplementerBindingModel model); + + bool Update(ImplementerBindingModel model); + + bool Delete(ImplementerBindingModel model); + } +} diff --git a/PlumbingRepairContracts/BusinessLogicsContracts/IOrderLogic.cs b/PlumbingRepairContracts/BusinessLogicsContracts/IOrderLogic.cs index f694d80..dbbe1c2 100644 --- a/PlumbingRepairContracts/BusinessLogicsContracts/IOrderLogic.cs +++ b/PlumbingRepairContracts/BusinessLogicsContracts/IOrderLogic.cs @@ -7,7 +7,8 @@ namespace PlumbingRepairContracts.BusinessLogicsContracts public interface IOrderLogic { List? ReadList(OrderSearchModel? model); - bool CreateOrder(OrderBindingModel model); + OrderViewModel? ReadElement(OrderSearchModel model); + bool CreateOrder(OrderBindingModel model); bool TakeOrderInWork(OrderBindingModel model); bool FinishOrder(OrderBindingModel model); bool DeliveryOrder(OrderBindingModel model); diff --git a/PlumbingRepairContracts/BusinessLogicsContracts/IWorkProcess.cs b/PlumbingRepairContracts/BusinessLogicsContracts/IWorkProcess.cs new file mode 100644 index 0000000..e29c45d --- /dev/null +++ b/PlumbingRepairContracts/BusinessLogicsContracts/IWorkProcess.cs @@ -0,0 +1,7 @@ +namespace PlumbingRepairContracts.BusinessLogicsContracts +{ + public interface IWorkProcess + { + void DoWork(IImplementerLogic implementerLogic, IOrderLogic orderLogic); + } +} diff --git a/PlumbingRepairContracts/SearchModels/ImplementerSearchModel.cs b/PlumbingRepairContracts/SearchModels/ImplementerSearchModel.cs new file mode 100644 index 0000000..3738380 --- /dev/null +++ b/PlumbingRepairContracts/SearchModels/ImplementerSearchModel.cs @@ -0,0 +1,11 @@ +namespace PlumbingRepairContracts.SearchModels +{ + public class ImplementerSearchModel + { + public int? Id { get; set; } + + public string? ImplementerFIO { get; set; } + + public string? Password { get; set; } + } +} diff --git a/PlumbingRepairContracts/SearchModels/OrderSearchModel.cs b/PlumbingRepairContracts/SearchModels/OrderSearchModel.cs index 558c523..d5e6b35 100644 --- a/PlumbingRepairContracts/SearchModels/OrderSearchModel.cs +++ b/PlumbingRepairContracts/SearchModels/OrderSearchModel.cs @@ -1,4 +1,6 @@ -namespace PlumbingRepairContracts.SearchModels +using PlumbingRepairDataModels.Enums; + +namespace PlumbingRepairContracts.SearchModels { public class OrderSearchModel { @@ -6,5 +8,7 @@ public int? ClientId { get; set; } public DateTime? DateFrom { get; set; } public DateTime? DateTo { get; set; } - } + public int? ImplementerId { get; set; } + public OrderStatus? Status { get; set; } + } } diff --git a/PlumbingRepairContracts/StoragesContracts/IImplementerStorage.cs b/PlumbingRepairContracts/StoragesContracts/IImplementerStorage.cs new file mode 100644 index 0000000..c22612b --- /dev/null +++ b/PlumbingRepairContracts/StoragesContracts/IImplementerStorage.cs @@ -0,0 +1,21 @@ +using PlumbingRepairContracts.BindingModels; +using PlumbingRepairContracts.SearchModels; +using PlumbingRepairContracts.ViewModels; + +namespace PlumbingRepairContracts.StoragesContracts +{ + public interface IImplementerStorage + { + List GetFullList(); + + List GetFilteredList(ImplementerSearchModel model); + + ImplementerViewModel? GetElement(ImplementerSearchModel model); + + ImplementerViewModel? Insert(ImplementerBindingModel model); + + ImplementerViewModel? Update(ImplementerBindingModel model); + + ImplementerViewModel? Delete(ImplementerBindingModel model); + } +} diff --git a/PlumbingRepairContracts/ViewModels/ImplementerViewModel.cs b/PlumbingRepairContracts/ViewModels/ImplementerViewModel.cs new file mode 100644 index 0000000..9632d3a --- /dev/null +++ b/PlumbingRepairContracts/ViewModels/ImplementerViewModel.cs @@ -0,0 +1,22 @@ +using PlumbingRepairDataModels.Models; +using System.ComponentModel; + +namespace PlumbingRepairContracts.ViewModels +{ + public class ImplementerViewModel : IImplementerModel + { + public int Id { get; set; } + + [DisplayName("ФИО исполнителя")] + public string ImplementerFIO { get; set; } = string.Empty; + + [DisplayName("Пароль")] + public string Password { get; set; } = string.Empty; + + [DisplayName("Стаж работы")] + public int WorkExperience { get; set; } + + [DisplayName("Квалификация")] + public int Qualification { get; set; } + } +} diff --git a/PlumbingRepairContracts/ViewModels/OrderViewModel.cs b/PlumbingRepairContracts/ViewModels/OrderViewModel.cs index 6cf65ac..8aa9bc9 100644 --- a/PlumbingRepairContracts/ViewModels/OrderViewModel.cs +++ b/PlumbingRepairContracts/ViewModels/OrderViewModel.cs @@ -9,12 +9,15 @@ namespace PlumbingRepairContracts.ViewModels [DisplayName("Номер")] public int Id { get; set; } public int WorkId { get; set; } - [DisplayName("Название работы")] + [DisplayName("Название изделия")] public string WorkName { get; set; } = string.Empty; public int ClientId { get; set; } [DisplayName("Клиент")] public string ClientFIO { get; set; } = string.Empty; - [DisplayName("Количество")] + public int? ImplementerId { get; set; } + [DisplayName("Исполнитель")] + public string ImplementerFIO { get; set; } = string.Empty; + [DisplayName("Количество")] public int Count { get; set; } [DisplayName("Сумма")] public double Sum { get; set; } diff --git a/PlumbingRepairContracts/ViewModels/WorkViewModel.cs b/PlumbingRepairContracts/ViewModels/WorkViewModel.cs index b85acc8..10404e2 100644 --- a/PlumbingRepairContracts/ViewModels/WorkViewModel.cs +++ b/PlumbingRepairContracts/ViewModels/WorkViewModel.cs @@ -6,7 +6,7 @@ namespace PlumbingRepairContracts.ViewModels public class WorkViewModel : IWorkModel { public int Id { get; set; } - [DisplayName("Название работы")] + [DisplayName("Название изделия")] public string WorkName { get; set; } = string.Empty; [DisplayName("Цена")] public double Price { get; set; } diff --git a/PlumbingRepairDataModels/Models/IImplementerModel.cs b/PlumbingRepairDataModels/Models/IImplementerModel.cs new file mode 100644 index 0000000..a9bd55c --- /dev/null +++ b/PlumbingRepairDataModels/Models/IImplementerModel.cs @@ -0,0 +1,10 @@ +namespace PlumbingRepairDataModels.Models +{ + public interface IImplementerModel : IId + { + string ImplementerFIO { get; } + string Password { get; } + int WorkExperience { get; } + int Qualification { get; } + } +} diff --git a/PlumbingRepairRestApi/Controllers/ImplementerController.cs b/PlumbingRepairRestApi/Controllers/ImplementerController.cs new file mode 100644 index 0000000..1964028 --- /dev/null +++ b/PlumbingRepairRestApi/Controllers/ImplementerController.cs @@ -0,0 +1,99 @@ +using Microsoft.AspNetCore.Mvc; +using PlumbingRepairContracts.BindingModels; +using PlumbingRepairContracts.BusinessLogicsContracts; +using PlumbingRepairContracts.SearchModels; +using PlumbingRepairContracts.ViewModels; +using PlumbingRepairDataModels.Enums; + +namespace PlumbingRepairRestApi.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 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? GetNewOrders() + { + try + { + return _order.ReadList(new OrderSearchModel + { + Status = 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; + } + } + } +}