PIbd-22. Stroev V.M. Lab Work Hard 02 #9

Closed
StroevVladimir wants to merge 8 commits from Lab2_Hard into Lab1_Hard
37 changed files with 1762 additions and 439 deletions

View File

@ -13,6 +13,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PlumbingRepairBusinessLogic
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PlumbingRepairListImplement", "PlumbingRepairListImplement\PlumbingRepairListImplement.csproj", "{E89CA82F-2FEA-4235-93A2-E5A412D0116F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlumbingRepairFileImplement", "PlumbingRepairFileImplement\PlumbingRepairFileImplement.csproj", "{CF58BB85-A6FB-4581-940D-BB7D1AB815CD}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -39,6 +41,10 @@ Global
{E89CA82F-2FEA-4235-93A2-E5A412D0116F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E89CA82F-2FEA-4235-93A2-E5A412D0116F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E89CA82F-2FEA-4235-93A2-E5A412D0116F}.Release|Any CPU.Build.0 = Release|Any CPU
{CF58BB85-A6FB-4581-940D-BB7D1AB815CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CF58BB85-A6FB-4581-940D-BB7D1AB815CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CF58BB85-A6FB-4581-940D-BB7D1AB815CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CF58BB85-A6FB-4581-940D-BB7D1AB815CD}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

View File

@ -40,7 +40,7 @@
//
dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
dataGridView.Location = new Point(10, 8);
dataGridView.Margin = new Padding(2, 2, 2, 2);
dataGridView.Margin = new Padding(2);
dataGridView.Name = "dataGridView";
dataGridView.RowHeadersWidth = 62;
dataGridView.RowTemplate.Height = 33;
@ -50,7 +50,7 @@
// buttonAdd
//
buttonAdd.Location = new Point(547, 33);
buttonAdd.Margin = new Padding(2, 2, 2, 2);
buttonAdd.Margin = new Padding(2);
buttonAdd.Name = "buttonAdd";
buttonAdd.Size = new Size(108, 27);
buttonAdd.TabIndex = 1;
@ -61,7 +61,7 @@
// buttonDel
//
buttonDel.Location = new Point(547, 85);
buttonDel.Margin = new Padding(2, 2, 2, 2);
buttonDel.Margin = new Padding(2);
buttonDel.Name = "buttonDel";
buttonDel.Size = new Size(108, 27);
buttonDel.TabIndex = 2;
@ -72,7 +72,7 @@
// buttonChange
//
buttonChange.Location = new Point(547, 147);
buttonChange.Margin = new Padding(2, 2, 2, 2);
buttonChange.Margin = new Padding(2);
buttonChange.Name = "buttonChange";
buttonChange.Size = new Size(108, 27);
buttonChange.TabIndex = 3;
@ -83,7 +83,7 @@
// buttonRef
//
buttonRef.Location = new Point(547, 209);
buttonRef.Margin = new Padding(2, 2, 2, 2);
buttonRef.Margin = new Padding(2);
buttonRef.Name = "buttonRef";
buttonRef.Size = new Size(108, 27);
buttonRef.TabIndex = 4;
@ -101,9 +101,10 @@
Controls.Add(buttonDel);
Controls.Add(buttonAdd);
Controls.Add(dataGridView);
Margin = new Padding(2, 2, 2, 2);
Margin = new Padding(2);
Name = "FormComponents";
Text = "Компоненты";
Load += FormComponents_Load;
((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
ResumeLayout(false);
}

View File

@ -13,6 +13,7 @@ namespace PlumbingRepairView
InitializeComponent();
_logger = logger;
_logic = logic;
LoadData();
}
private void FormComponents_Load(object sender, EventArgs e)
{

View File

@ -40,6 +40,7 @@
buttonIssuedOrder = new Button();
buttonUpdateList = new Button();
StoreReplenishment = new Button();
SellWorkButton = new Button();
menuStrip1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
SuspendLayout();
@ -50,7 +51,8 @@
menuStrip1.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem });
menuStrip1.Location = new Point(0, 0);
menuStrip1.Name = "menuStrip1";
menuStrip1.Size = new Size(1053, 28);
menuStrip1.Padding = new Padding(8, 2, 0, 2);
menuStrip1.Size = new Size(1316, 33);
menuStrip1.TabIndex = 0;
menuStrip1.Text = "menuStrip1";
//
@ -58,45 +60,47 @@
//
справочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem, работыToolStripMenuItem, магазинToolStripMenuItem });
справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem";
справочникиToolStripMenuItem.Size = new Size(117, 24);
справочникиToolStripMenuItem.Size = new Size(139, 29);
справочникиToolStripMenuItem.Text = "Справочники";
//
// компонентыToolStripMenuItem
//
компонентыToolStripMenuItem.Name = омпонентыToolStripMenuItem";
компонентыToolStripMenuItem.Size = new Size(182, 26);
компонентыToolStripMenuItem.Size = new Size(218, 34);
компонентыToolStripMenuItem.Text = "Компоненты";
компонентыToolStripMenuItem.Click += компонентыToolStripMenuItem_Click;
//
// работыToolStripMenuItem
//
работыToolStripMenuItem.Name = "работыToolStripMenuItem";
работыToolStripMenuItem.Size = new Size(182, 26);
работыToolStripMenuItem.Size = new Size(218, 34);
работыToolStripMenuItem.Text = "Работы";
работыToolStripMenuItem.Click += работыToolStripMenuItem_Click;
//
// магазинToolStripMenuItem
//
магазинToolStripMenuItem.Name = агазинToolStripMenuItem";
магазинToolStripMenuItem.Size = new Size(32, 19);
магазинToolStripMenuItem.Size = new Size(218, 34);
магазинToolStripMenuItem.Text = "Магазины";
магазинToolStripMenuItem.Click += new System.EventHandler(this.магазинToolStripMenuItem_Click);
магазинToolStripMenuItem.Click += магазинToolStripMenuItem_Click;
//
// dataGridView
//
dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
dataGridView.Location = new Point(0, 31);
dataGridView.Location = new Point(0, 39);
dataGridView.Margin = new Padding(4, 4, 4, 4);
dataGridView.Name = "dataGridView";
dataGridView.RowHeadersWidth = 51;
dataGridView.RowTemplate.Height = 29;
dataGridView.Size = new Size(832, 420);
dataGridView.Size = new Size(1040, 525);
dataGridView.TabIndex = 1;
//
// buttonCreateOrder
//
buttonCreateOrder.Location = new Point(850, 54);
buttonCreateOrder.Location = new Point(1062, 68);
buttonCreateOrder.Margin = new Padding(4, 4, 4, 4);
buttonCreateOrder.Name = "buttonCreateOrder";
buttonCreateOrder.Size = new Size(170, 29);
buttonCreateOrder.Size = new Size(212, 36);
buttonCreateOrder.TabIndex = 2;
buttonCreateOrder.Text = "Создать заказ";
buttonCreateOrder.UseVisualStyleBackColor = true;
@ -104,9 +108,10 @@
//
// buttonTakeOrderInWork
//
buttonTakeOrderInWork.Location = new Point(850, 135);
buttonTakeOrderInWork.Location = new Point(1062, 138);
buttonTakeOrderInWork.Margin = new Padding(4, 4, 4, 4);
buttonTakeOrderInWork.Name = "buttonTakeOrderInWork";
buttonTakeOrderInWork.Size = new Size(170, 29);
buttonTakeOrderInWork.Size = new Size(212, 62);
buttonTakeOrderInWork.TabIndex = 3;
buttonTakeOrderInWork.Text = "Отдать на выполнение";
buttonTakeOrderInWork.UseVisualStyleBackColor = true;
@ -114,9 +119,10 @@
//
// buttonOrderReady
//
buttonOrderReady.Location = new Point(850, 206);
buttonOrderReady.Location = new Point(1062, 239);
buttonOrderReady.Margin = new Padding(4, 4, 4, 4);
buttonOrderReady.Name = "buttonOrderReady";
buttonOrderReady.Size = new Size(170, 29);
buttonOrderReady.Size = new Size(212, 36);
buttonOrderReady.TabIndex = 4;
buttonOrderReady.Text = "Заказ готов";
buttonOrderReady.UseVisualStyleBackColor = true;
@ -124,9 +130,10 @@
//
// buttonIssuedOrder
//
buttonIssuedOrder.Location = new Point(850, 279);
buttonIssuedOrder.Location = new Point(1062, 313);
buttonIssuedOrder.Margin = new Padding(4, 4, 4, 4);
buttonIssuedOrder.Name = "buttonIssuedOrder";
buttonIssuedOrder.Size = new Size(170, 29);
buttonIssuedOrder.Size = new Size(212, 36);
buttonIssuedOrder.TabIndex = 5;
buttonIssuedOrder.Text = "Заказ выдан";
buttonIssuedOrder.UseVisualStyleBackColor = true;
@ -134,9 +141,10 @@
//
// buttonUpdateList
//
buttonUpdateList.Location = new Point(850, 394);
buttonUpdateList.Location = new Point(1062, 528);
buttonUpdateList.Margin = new Padding(4, 4, 4, 4);
buttonUpdateList.Name = "buttonUpdateList";
buttonUpdateList.Size = new Size(170, 29);
buttonUpdateList.Size = new Size(212, 36);
buttonUpdateList.TabIndex = 6;
buttonUpdateList.Text = "Обновить список";
buttonUpdateList.UseVisualStyleBackColor = true;
@ -144,20 +152,33 @@
//
// StoreReplenishment
//
StoreReplenishment.Location = new Point(879, 327);
StoreReplenishment.Location = new Point(1099, 381);
StoreReplenishment.Margin = new Padding(4, 4, 4, 4);
StoreReplenishment.Name = "StoreReplenishment";
StoreReplenishment.Size = new Size(125, 50);
StoreReplenishment.Size = new Size(156, 62);
StoreReplenishment.TabIndex = 7;
StoreReplenishment.Text = "Пополнение магазина";
StoreReplenishment.UseVisualStyleBackColor = true;
StoreReplenishment.Click += StoreReplenishment_Click;
//
// SellWorkButton
//
SellWorkButton.Location = new Point(1099, 463);
SellWorkButton.Margin = new Padding(4, 4, 4, 4);
SellWorkButton.Name = "SellWorkButton";
SellWorkButton.Size = new Size(156, 39);
SellWorkButton.TabIndex = 8;
SellWorkButton.Text = "Продать изделие";
SellWorkButton.UseVisualStyleBackColor = true;
SellWorkButton.Click += SellWorkButton_Click;
//
// FormMain
//
AutoScaleDimensions = new SizeF(8F, 20F);
AutoScaleDimensions = new SizeF(10F, 25F);
AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(1053, 474);
ClientSize = new Size(1316, 592);
Controls.Add(StoreReplenishment);
Controls.Add(SellWorkButton);
Controls.Add(buttonUpdateList);
Controls.Add(buttonIssuedOrder);
Controls.Add(buttonOrderReady);
@ -166,6 +187,7 @@
Controls.Add(dataGridView);
Controls.Add(menuStrip1);
MainMenuStrip = menuStrip1;
Margin = new Padding(4, 4, 4, 4);
Name = "FormMain";
Text = "Ремонт сантехники";
Load += FormMain_Load;
@ -190,5 +212,6 @@
private Button StoreReplenishment;
private ToolStripMenuItem компонентыToolStripMenuItem;
private ToolStripMenuItem работыToolStripMenuItem;
private Button SellWorkButton;
}
}

View File

@ -24,6 +24,7 @@ namespace PlumbingRepairView
InitializeComponent();
_logger = logger;
_orderLogic = orderLogic;
LoadData();
}
private void FormMain_Load(object sender, EventArgs e)
@ -215,5 +216,14 @@ namespace PlumbingRepairView
form.ShowDialog();
}
}
private void SellWorkButton_Click(object sender, EventArgs e)
{
var service = Program.ServiceProvider?.GetService(typeof(FormSellWork));
if (service is FormSellWork form)
{
form.ShowDialog();
}
}
}
}

View File

@ -0,0 +1,124 @@
namespace PlumbingRepairView
{
partial class FormSellWork
{
/// <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()
{
WorkLabel = new Label();
QuantityLabel = new Label();
WorkСomboBox = new ComboBox();
QuantityTextBox = new TextBox();
SaveButton = new Button();
ButtonCancel = new Button();
SuspendLayout();
//
// WorkLabel
//
WorkLabel.AutoSize = true;
WorkLabel.Location = new Point(14, 24);
WorkLabel.Name = "WorkLabel";
WorkLabel.Size = new Size(71, 20);
WorkLabel.TabIndex = 0;
WorkLabel.Text = "Изделие:";
//
// QuantityLabel
//
QuantityLabel.AutoSize = true;
QuantityLabel.Location = new Point(14, 68);
QuantityLabel.Name = "QuantityLabel";
QuantityLabel.Size = new Size(93, 20);
QuantityLabel.TabIndex = 1;
QuantityLabel.Text = "Количество:";
//
// WorkСomboBox
//
WorkСomboBox.FormattingEnabled = true;
WorkСomboBox.Location = new Point(101, 20);
WorkСomboBox.Margin = new Padding(3, 4, 3, 4);
WorkСomboBox.Name = "WorkСomboBox";
WorkСomboBox.Size = new Size(210, 28);
WorkСomboBox.TabIndex = 2;
//
// QuantityTextBox
//
QuantityTextBox.Location = new Point(101, 64);
QuantityTextBox.Margin = new Padding(3, 4, 3, 4);
QuantityTextBox.Name = "QuantityTextBox";
QuantityTextBox.Size = new Size(210, 27);
QuantityTextBox.TabIndex = 3;
//
// SaveButton
//
SaveButton.Location = new Point(82, 133);
SaveButton.Margin = new Padding(3, 4, 3, 4);
SaveButton.Name = "SaveButton";
SaveButton.Size = new Size(111, 39);
SaveButton.TabIndex = 4;
SaveButton.Text = "Сохранить";
SaveButton.UseVisualStyleBackColor = true;
SaveButton.Click += SaveButton_Click;
//
// ButtonCancel
//
ButtonCancel.Location = new Point(200, 133);
ButtonCancel.Margin = new Padding(3, 4, 3, 4);
ButtonCancel.Name = "ButtonCancel";
ButtonCancel.Size = new Size(111, 39);
ButtonCancel.TabIndex = 5;
ButtonCancel.Text = "Отмена";
ButtonCancel.UseVisualStyleBackColor = true;
ButtonCancel.Click += ButtonCancel_Click;
//
// FormSellWork
//
AutoScaleDimensions = new SizeF(8F, 20F);
AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(325, 188);
Controls.Add(ButtonCancel);
Controls.Add(SaveButton);
Controls.Add(QuantityTextBox);
Controls.Add(WorkСomboBox);
Controls.Add(QuantityLabel);
Controls.Add(WorkLabel);
Margin = new Padding(3, 4, 3, 4);
Name = "FormSellWork";
Text = "Продать Изделие";
Load += FormSellWork_Load;
ResumeLayout(false);
PerformLayout();
}
#endregion
private Label WorkLabel;
private Label QuantityLabel;
private ComboBox WorkСomboBox;
private TextBox QuantityTextBox;
private Button SaveButton;
private Button ButtonCancel;
}
}

View File

@ -0,0 +1,103 @@
using Microsoft.Extensions.Logging;
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 PlumbingRepairView
{
public partial class FormSellWork : Form
{
private readonly ILogger _logger;
private readonly IWorkLogic _logicWork;
private readonly IStoreLogic _logicStore;
public FormSellWork(ILogger<FormSellWork> logger, IWorkLogic logicPackage, IStoreLogic logicStore)
{
InitializeComponent();
_logger = logger;
_logicWork = logicPackage;
_logicStore = logicStore;
LoadData();
}
private void FormSellWork_Load(object sender, EventArgs e)
{
LoadData();
}
private void LoadData()
{
_logger.LogInformation("Loading works for sale.");
try
{
var list = _logicWork.ReadList(null);
if (list != null)
{
WorkСomboBox.DisplayMember = "WorkName";
WorkСomboBox.ValueMember = "Id";
WorkСomboBox.DataSource = list;
WorkСomboBox.SelectedItem = null;
}
}
catch (Exception ex)
{
_logger.LogError(ex, "List loading error.");
MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
private void SaveButton_Click(object sender, EventArgs e)
{
if (string.IsNullOrEmpty(QuantityTextBox.Text))
{
MessageBox.Show("Укажите количество", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
return;
}
if (WorkСomboBox.SelectedValue == null)
{
MessageBox.Show("Выберите изделие", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
return;
}
_logger.LogInformation("Work sale.");
try
{
var operationResult = _logicStore.SellWork(_logicWork.ReadElement(new WorkSearchModel()
{
Id = Convert.ToInt32(WorkСomboBox.SelectedValue)
})!, Convert.ToInt32(QuantityTextBox.Text));
if (!operationResult)
{
throw new Exception("Ошибка при продаже изделия. Дополнительная информация в логах.");
}
MessageBox.Show("Сохранение прошло успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
DialogResult = DialogResult.OK;
Close();
}
catch (Exception ex)
{
_logger.LogError(ex, "Work sale error.");
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

@ -28,139 +28,171 @@
/// </summary>
private void InitializeComponent()
{
this.StoreNameLabel = new System.Windows.Forms.Label();
this.StoreAdressLabel = new System.Windows.Forms.Label();
this.OpeningDateLabel = new System.Windows.Forms.Label();
this.NameTextBox = new System.Windows.Forms.TextBox();
this.AdressTextBox = new System.Windows.Forms.TextBox();
this.DataGridView = new System.Windows.Forms.DataGridView();
this.WorkName = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.WorkPrice = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.WorkCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.SaveButton = new System.Windows.Forms.Button();
this.ButtonCancel = new System.Windows.Forms.Button();
this.OpeningDatePicker = new System.Windows.Forms.DateTimePicker();
((System.ComponentModel.ISupportInitialize)(this.DataGridView)).BeginInit();
this.SuspendLayout();
StoreNameLabel = new Label();
StoreAdressLabel = new Label();
OpeningDateLabel = new Label();
NameTextBox = new TextBox();
AdressTextBox = new TextBox();
DataGridView = new DataGridView();
WorkName = new DataGridViewTextBoxColumn();
WorkPrice = new DataGridViewTextBoxColumn();
WorkCount = new DataGridViewTextBoxColumn();
SaveButton = new Button();
ButtonCancel = new Button();
OpeningDatePicker = new DateTimePicker();
VolumeNumericUpDown = new NumericUpDown();
WorkMaxCountLable = new Label();
((System.ComponentModel.ISupportInitialize)DataGridView).BeginInit();
((System.ComponentModel.ISupportInitialize)VolumeNumericUpDown).BeginInit();
SuspendLayout();
//
// StoreNameLabel
//
this.StoreNameLabel.AutoSize = true;
this.StoreNameLabel.Location = new System.Drawing.Point(12, 9);
this.StoreNameLabel.Name = "StoreNameLabel";
this.StoreNameLabel.Size = new System.Drawing.Size(119, 15);
this.StoreNameLabel.TabIndex = 0;
this.StoreNameLabel.Text = "Название магазина: ";
StoreNameLabel.AutoSize = true;
StoreNameLabel.Location = new Point(14, 12);
StoreNameLabel.Name = "StoreNameLabel";
StoreNameLabel.Size = new Size(154, 20);
StoreNameLabel.TabIndex = 0;
StoreNameLabel.Text = "Название магазина: ";
//
// StoreAdressLabel
//
this.StoreAdressLabel.AutoSize = true;
this.StoreAdressLabel.Location = new System.Drawing.Point(12, 40);
this.StoreAdressLabel.Name = "StoreAdressLabel";
this.StoreAdressLabel.Size = new System.Drawing.Size(100, 15);
this.StoreAdressLabel.TabIndex = 1;
this.StoreAdressLabel.Text = "Адрес магазина: ";
StoreAdressLabel.AutoSize = true;
StoreAdressLabel.Location = new Point(14, 53);
StoreAdressLabel.Name = "StoreAdressLabel";
StoreAdressLabel.Size = new Size(128, 20);
StoreAdressLabel.TabIndex = 1;
StoreAdressLabel.Text = "Адрес магазина: ";
//
// OpeningDateLabel
//
this.OpeningDateLabel.AutoSize = true;
this.OpeningDateLabel.Location = new System.Drawing.Point(12, 72);
this.OpeningDateLabel.Name = "OpeningDateLabel";
this.OpeningDateLabel.Size = new System.Drawing.Size(93, 15);
this.OpeningDateLabel.TabIndex = 2;
this.OpeningDateLabel.Text = "Дата открытия: ";
OpeningDateLabel.AutoSize = true;
OpeningDateLabel.Location = new Point(14, 96);
OpeningDateLabel.Name = "OpeningDateLabel";
OpeningDateLabel.Size = new Size(117, 20);
OpeningDateLabel.TabIndex = 2;
OpeningDateLabel.Text = "Дата открытия: ";
//
// NameComboBox
// NameTextBox
//
this.NameTextBox.Location = new System.Drawing.Point(137, 6);
this.NameTextBox.Name = "NameComboBox";
this.NameTextBox.Size = new System.Drawing.Size(174, 23);
this.NameTextBox.TabIndex = 3;
NameTextBox.Location = new Point(157, 8);
NameTextBox.Margin = new Padding(3, 4, 3, 4);
NameTextBox.Name = "NameTextBox";
NameTextBox.Size = new Size(198, 27);
NameTextBox.TabIndex = 3;
//
// AdressTextBox
//
this.AdressTextBox.Location = new System.Drawing.Point(137, 37);
this.AdressTextBox.Name = "AdressTextBox";
this.AdressTextBox.Size = new System.Drawing.Size(174, 23);
this.AdressTextBox.TabIndex = 4;
AdressTextBox.Location = new Point(157, 49);
AdressTextBox.Margin = new Padding(3, 4, 3, 4);
AdressTextBox.Name = "AdressTextBox";
AdressTextBox.Size = new Size(198, 27);
AdressTextBox.TabIndex = 4;
//
// DataGridView
//
this.DataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.DataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.WorkName,
this.WorkPrice,
this.WorkCount});
this.DataGridView.Location = new System.Drawing.Point(12, 109);
this.DataGridView.Name = "DataGridView";
this.DataGridView.RowTemplate.Height = 25;
this.DataGridView.Size = new System.Drawing.Size(776, 288);
this.DataGridView.TabIndex = 6;
DataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
DataGridView.Columns.AddRange(new DataGridViewColumn[] { WorkName, WorkPrice, WorkCount });
DataGridView.Location = new Point(14, 145);
DataGridView.Margin = new Padding(3, 4, 3, 4);
DataGridView.Name = "DataGridView";
DataGridView.RowHeadersWidth = 51;
DataGridView.RowTemplate.Height = 25;
DataGridView.Size = new Size(887, 384);
DataGridView.TabIndex = 6;
//
// PackageName
// WorkName
//
this.WorkName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
this.WorkName.HeaderText = "Название изделия";
this.WorkName.Name = "PackageName";
WorkName.AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
WorkName.HeaderText = "Название изделия";
WorkName.MinimumWidth = 6;
WorkName.Name = "WorkName";
//
// PackagePrice
// WorkPrice
//
this.WorkPrice.HeaderText = "Цена";
this.WorkPrice.Name = "PackagePrice";
WorkPrice.HeaderText = "Цена";
WorkPrice.MinimumWidth = 6;
WorkPrice.Name = "WorkPrice";
WorkPrice.Width = 125;
//
// PackageCount
// WorkCount
//
this.WorkCount.HeaderText = "Количество";
this.WorkCount.Name = "PackageCount";
WorkCount.HeaderText = "Количество";
WorkCount.MinimumWidth = 6;
WorkCount.Name = "WorkCount";
WorkCount.Width = 125;
//
// SaveButton
//
this.SaveButton.Location = new System.Drawing.Point(552, 403);
this.SaveButton.Name = "SaveButton";
this.SaveButton.Size = new System.Drawing.Size(115, 35);
this.SaveButton.TabIndex = 7;
this.SaveButton.Text = "Сохранить";
this.SaveButton.UseVisualStyleBackColor = true;
this.SaveButton.Click += new System.EventHandler(this.SaveButton_Click);
SaveButton.Location = new Point(631, 537);
SaveButton.Margin = new Padding(3, 4, 3, 4);
SaveButton.Name = "SaveButton";
SaveButton.Size = new Size(131, 47);
SaveButton.TabIndex = 7;
SaveButton.Text = "Сохранить";
SaveButton.UseVisualStyleBackColor = true;
SaveButton.Click += SaveButton_Click;
//
// ButtonCancel
//
this.ButtonCancel.Location = new System.Drawing.Point(673, 403);
this.ButtonCancel.Name = "ButtonCancel";
this.ButtonCancel.Size = new System.Drawing.Size(115, 35);
this.ButtonCancel.TabIndex = 8;
this.ButtonCancel.Text = "Отменить";
this.ButtonCancel.UseVisualStyleBackColor = true;
this.ButtonCancel.Click += new System.EventHandler(this.ButtonCancel_Click);
ButtonCancel.Location = new Point(769, 537);
ButtonCancel.Margin = new Padding(3, 4, 3, 4);
ButtonCancel.Name = "ButtonCancel";
ButtonCancel.Size = new Size(131, 47);
ButtonCancel.TabIndex = 8;
ButtonCancel.Text = "Отменить";
ButtonCancel.UseVisualStyleBackColor = true;
ButtonCancel.Click += ButtonCancel_Click;
//
// OpeningDatePicker
//
this.OpeningDatePicker.Location = new System.Drawing.Point(137, 66);
this.OpeningDatePicker.Name = "OpeningDatePicker";
this.OpeningDatePicker.Size = new System.Drawing.Size(174, 23);
this.OpeningDatePicker.TabIndex = 9;
OpeningDatePicker.Location = new Point(157, 88);
OpeningDatePicker.Margin = new Padding(3, 4, 3, 4);
OpeningDatePicker.Name = "OpeningDatePicker";
OpeningDatePicker.Size = new Size(198, 27);
OpeningDatePicker.TabIndex = 9;
//
// VolumeNumericUpDown
//
VolumeNumericUpDown.Location = new Point(570, 10);
VolumeNumericUpDown.Margin = new Padding(3, 4, 3, 4);
VolumeNumericUpDown.Name = "VolumeNumericUpDown";
VolumeNumericUpDown.Size = new Size(192, 27);
VolumeNumericUpDown.TabIndex = 10;
//
// WorkMaxCountLable
//
WorkMaxCountLable.AutoSize = true;
WorkMaxCountLable.Location = new Point(389, 12);
WorkMaxCountLable.Name = "WorkMaxCountLable";
WorkMaxCountLable.Size = new Size(177, 20);
WorkMaxCountLable.TabIndex = 11;
WorkMaxCountLable.Text = "Вместимость магазина: ";
//
// FormStore
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(800, 450);
this.Controls.Add(this.OpeningDatePicker);
this.Controls.Add(this.ButtonCancel);
this.Controls.Add(this.SaveButton);
this.Controls.Add(this.DataGridView);
this.Controls.Add(this.AdressTextBox);
this.Controls.Add(this.NameTextBox);
this.Controls.Add(this.OpeningDateLabel);
this.Controls.Add(this.StoreAdressLabel);
this.Controls.Add(this.StoreNameLabel);
this.Name = "FormStore";
this.Text = "Изделия магазина";
this.Load += new System.EventHandler(this.FormStore_Load);
((System.ComponentModel.ISupportInitialize)(this.DataGridView)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
AutoScaleDimensions = new SizeF(8F, 20F);
AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(914, 600);
Controls.Add(WorkMaxCountLable);
Controls.Add(VolumeNumericUpDown);
Controls.Add(OpeningDatePicker);
Controls.Add(ButtonCancel);
Controls.Add(SaveButton);
Controls.Add(DataGridView);
Controls.Add(AdressTextBox);
Controls.Add(NameTextBox);
Controls.Add(OpeningDateLabel);
Controls.Add(StoreAdressLabel);
Controls.Add(StoreNameLabel);
Margin = new Padding(3, 4, 3, 4);
Name = "FormStore";
Text = "Изделия магазина";
Load += FormStore_Load;
((System.ComponentModel.ISupportInitialize)DataGridView).EndInit();
((System.ComponentModel.ISupportInitialize)VolumeNumericUpDown).EndInit();
ResumeLayout(false);
PerformLayout();
}
#endregion
@ -177,5 +209,7 @@
private DataGridViewTextBoxColumn WorkPrice;
private DataGridViewTextBoxColumn WorkCount;
private DateTimePicker OpeningDatePicker;
private NumericUpDown VolumeNumericUpDown;
private Label WorkMaxCountLable;
}
}

View File

@ -6,6 +6,7 @@ using PlumbingRepairContracts.ViewModels;
using PlumbingRepairDataModels.Models;
using PlumbingRepairListImplement.Models;
using System;
using System.Reflection;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
@ -20,35 +21,19 @@ namespace PlumbingRepairView
{
public partial class FormStore : Form
{
private readonly List<StoreViewModel>? _listStores;
private readonly IStoreLogic _logic;
private readonly ILogger _logger;
private Dictionary<int, (IWorkModel, int)> _works;
public int Id { get; set; }
private int? _id;
private Dictionary<int, (IWorkModel, int)> _listStores;
public int Id { set { _id = value; } }
public FormStore(ILogger<FormStore> logger, IStoreLogic logic)
{
InitializeComponent();
_logger = logger;
_listStores = logic.ReadList(null);
_logic = logic;
_works = new Dictionary<int, (IWorkModel, int)>();
}
private IStoreModel? GetStore(int id)
{
if (_listStores == null)
{
return null;
}
foreach (var elem in _listStores)
{
if (elem.Id == id)
{
return elem;
}
}
return null;
_listStores = new Dictionary<int, (IWorkModel, int)>();
}
private void SaveButton_Click(object sender, EventArgs e)
@ -65,30 +50,20 @@ namespace PlumbingRepairView
return;
}
_logger.LogInformation("Сохранение изделия");
_logger.LogInformation("Сохранение магазина");
try
{
DateTime.TryParse(OpeningDatePicker.Text, out var dateTime);
StoreBindingModel model = new()
var model = new StoreBindingModel
{
Id = _id ?? 0,
StoreName = NameTextBox.Text,
StoreAdress = AdressTextBox.Text,
OpeningDate = dateTime,
Works = _works
OpeningDate = OpeningDatePicker.Value.Date,
WorkMaxCount = (int)VolumeNumericUpDown.Value,
StoreWorks = _listStores
};
var vmodel = GetStore(Id);
bool operationResult = false;
if (vmodel != null)
{
model.Id = vmodel.Id;
operationResult = _logic.Update(model);
}
else
{
operationResult = _logic.Create(model);
}
var operationResult = _id.HasValue ? _logic.Update(model) : _logic.Create(model);
if (!operationResult)
{
@ -101,7 +76,7 @@ namespace PlumbingRepairView
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка сохранения изделия");
_logger.LogError(ex, "Ошибка сохранения магазина");
MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
@ -114,50 +89,52 @@ namespace PlumbingRepairView
private void FormStore_Load(object sender, EventArgs e)
{
_logger.LogInformation("Загрузка изделия");
if (_id.HasValue)
{
_logger.LogInformation("Загрузка магазина");
try
{
var view = _logic.ReadElement(new StoreSearchModel { Id = Id });
var view = _logic.ReadElement(new StoreSearchModel
{
Id = _id.Value
});
if (view != null)
{
NameTextBox.Text = view.StoreName;
AdressTextBox.Text = view.StoreAdress;
OpeningDatePicker.Value = view.OpeningDate;
_works = view.Works ?? new Dictionary<int, (IWorkModel, int)>();
OpeningDatePicker.Text = view.OpeningDate.ToString();
VolumeNumericUpDown.Value = view.WorkMaxCount;
_listStores = view.StoreWorks ?? new Dictionary<int, (IWorkModel, int)>();
LoadData();
}
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка загрузки магазина");
MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
private void LoadData()
{
try
{
if (_works != null)
{
DataGridView.Rows.Clear();
foreach (var pc in _works)
{
DataGridView.Rows.Add(new object[] { pc.Key, pc.Value.Item1.WorkName, pc.Value.Item2 });
}
}
_logger.LogInformation("Загрузка магазинов");
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка загрузки магазинов");
MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
MessageBoxIcon.Error);
}
}
private void NameComboBox_SelectedIndexChanged(object sender, EventArgs e)
}
private void LoadData(bool extendDate = true)
{
LoadData();
_logger.LogInformation("Загрузка изделий магазина");
try
{
if (_listStores != null)
{
DataGridView.Rows.Clear();
foreach (var elem in _listStores)
{
DataGridView.Rows.Add(new object[] { elem.Value.Item1.WorkName, elem.Value.Item1.Price, elem.Value.Item2 });
}
}
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка загрузки изделий магазина");
MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
}
}

View File

@ -40,7 +40,7 @@ namespace PlumbingRepairView
DataGridView.DataSource = list;
DataGridView.Columns["Id"].Visible = false;
DataGridView.Columns["StoreName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
DataGridView.Columns["Works"].Visible = false;
DataGridView.Columns["StoreWorks"].Visible = false;
}
_logger.LogInformation("Загрузка магазинов");

View File

@ -75,9 +75,9 @@
groupBox1.Controls.Add(buttonAdd);
groupBox1.Controls.Add(dataGridView);
groupBox1.Location = new Point(40, 108);
groupBox1.Margin = new Padding(4, 4, 4, 4);
groupBox1.Margin = new Padding(4);
groupBox1.Name = "groupBox1";
groupBox1.Padding = new Padding(4, 4, 4, 4);
groupBox1.Padding = new Padding(4);
groupBox1.Size = new Size(945, 384);
groupBox1.TabIndex = 2;
groupBox1.TabStop = false;
@ -86,7 +86,7 @@
// buttonRef
//
buttonRef.Location = new Point(752, 258);
buttonRef.Margin = new Padding(4, 4, 4, 4);
buttonRef.Margin = new Padding(4);
buttonRef.Name = "buttonRef";
buttonRef.Size = new Size(118, 36);
buttonRef.TabIndex = 4;
@ -97,7 +97,7 @@
// buttonDel
//
buttonDel.Location = new Point(752, 190);
buttonDel.Margin = new Padding(4, 4, 4, 4);
buttonDel.Margin = new Padding(4);
buttonDel.Name = "buttonDel";
buttonDel.Size = new Size(118, 36);
buttonDel.TabIndex = 3;
@ -108,7 +108,7 @@
// buttonUpd
//
buttonUpd.Location = new Point(752, 122);
buttonUpd.Margin = new Padding(4, 4, 4, 4);
buttonUpd.Margin = new Padding(4);
buttonUpd.Name = "buttonUpd";
buttonUpd.Size = new Size(118, 36);
buttonUpd.TabIndex = 2;
@ -119,7 +119,7 @@
// buttonAdd
//
buttonAdd.Location = new Point(752, 55);
buttonAdd.Margin = new Padding(4, 4, 4, 4);
buttonAdd.Margin = new Padding(4);
buttonAdd.Name = "buttonAdd";
buttonAdd.Size = new Size(118, 36);
buttonAdd.TabIndex = 1;
@ -132,7 +132,7 @@
dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
dataGridView.Columns.AddRange(new DataGridViewColumn[] { ComponentId, ComponentName, Count });
dataGridView.Location = new Point(0, 32);
dataGridView.Margin = new Padding(4, 4, 4, 4);
dataGridView.Margin = new Padding(4);
dataGridView.Name = "dataGridView";
dataGridView.RowHeadersWidth = 51;
dataGridView.RowTemplate.Height = 29;
@ -164,7 +164,7 @@
// textBoxName
//
textBoxName.Location = new Point(188, 12);
textBoxName.Margin = new Padding(4, 4, 4, 4);
textBoxName.Margin = new Padding(4);
textBoxName.Name = "textBoxName";
textBoxName.Size = new Size(373, 31);
textBoxName.TabIndex = 3;
@ -172,7 +172,7 @@
// textBoxCost
//
textBoxCost.Location = new Point(188, 61);
textBoxCost.Margin = new Padding(4, 4, 4, 4);
textBoxCost.Margin = new Padding(4);
textBoxCost.Name = "textBoxCost";
textBoxCost.Size = new Size(256, 31);
textBoxCost.TabIndex = 4;
@ -180,7 +180,7 @@
// buttonCancel
//
buttonCancel.Location = new Point(857, 511);
buttonCancel.Margin = new Padding(4, 4, 4, 4);
buttonCancel.Margin = new Padding(4);
buttonCancel.Name = "buttonCancel";
buttonCancel.Size = new Size(118, 36);
buttonCancel.TabIndex = 5;
@ -191,7 +191,7 @@
// buttonSave
//
buttonSave.Location = new Point(731, 511);
buttonSave.Margin = new Padding(4, 4, 4, 4);
buttonSave.Margin = new Padding(4);
buttonSave.Name = "buttonSave";
buttonSave.Size = new Size(118, 36);
buttonSave.TabIndex = 6;
@ -211,9 +211,10 @@
Controls.Add(groupBox1);
Controls.Add(label2);
Controls.Add(label1);
Margin = new Padding(4, 4, 4, 4);
Margin = new Padding(4);
Name = "FormWork";
Text = "Работа";
Load += FormWork_Load;
groupBox1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
ResumeLayout(false);

View File

@ -18,7 +18,7 @@
<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="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>

View File

@ -28,79 +28,79 @@
/// </summary>
private void InitializeComponent()
{
this.dataGridView = new System.Windows.Forms.DataGridView();
this.buttonAdd = new System.Windows.Forms.Button();
this.buttonUpd = new System.Windows.Forms.Button();
this.buttonDel = new System.Windows.Forms.Button();
this.buttonRef = new System.Windows.Forms.Button();
((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
this.SuspendLayout();
dataGridView = new DataGridView();
buttonAdd = new Button();
buttonUpd = new Button();
buttonDel = new Button();
buttonRef = new Button();
((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
SuspendLayout();
//
// dataGridView
//
this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dataGridView.Location = new System.Drawing.Point(1, 0);
this.dataGridView.Name = "dataGridView";
this.dataGridView.RowHeadersWidth = 51;
this.dataGridView.RowTemplate.Height = 29;
this.dataGridView.Size = new System.Drawing.Size(611, 449);
this.dataGridView.TabIndex = 0;
dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
dataGridView.Location = new Point(1, 0);
dataGridView.Name = "dataGridView";
dataGridView.RowHeadersWidth = 51;
dataGridView.RowTemplate.Height = 29;
dataGridView.Size = new Size(611, 449);
dataGridView.TabIndex = 0;
//
// buttonAdd
//
this.buttonAdd.Location = new System.Drawing.Point(670, 23);
this.buttonAdd.Name = "buttonAdd";
this.buttonAdd.Size = new System.Drawing.Size(94, 29);
this.buttonAdd.TabIndex = 1;
this.buttonAdd.Text = "Добавить";
this.buttonAdd.UseVisualStyleBackColor = true;
this.buttonAdd.Click += new System.EventHandler(this.AddButton_Click);
buttonAdd.Location = new Point(670, 23);
buttonAdd.Name = "buttonAdd";
buttonAdd.Size = new Size(94, 29);
buttonAdd.TabIndex = 1;
buttonAdd.Text = "Добавить";
buttonAdd.UseVisualStyleBackColor = true;
buttonAdd.Click += AddButton_Click;
//
// buttonUpd
//
this.buttonUpd.Location = new System.Drawing.Point(670, 75);
this.buttonUpd.Name = "buttonUpd";
this.buttonUpd.Size = new System.Drawing.Size(94, 29);
this.buttonUpd.TabIndex = 2;
this.buttonUpd.Text = "Изменить";
this.buttonUpd.UseVisualStyleBackColor = true;
this.buttonUpd.Click += new System.EventHandler(this.ChangeButton_Click);
buttonUpd.Location = new Point(670, 75);
buttonUpd.Name = "buttonUpd";
buttonUpd.Size = new Size(94, 29);
buttonUpd.TabIndex = 2;
buttonUpd.Text = "Изменить";
buttonUpd.UseVisualStyleBackColor = true;
buttonUpd.Click += ChangeButton_Click;
//
// buttonDel
//
this.buttonDel.Location = new System.Drawing.Point(670, 132);
this.buttonDel.Name = "buttonDel";
this.buttonDel.Size = new System.Drawing.Size(94, 29);
this.buttonDel.TabIndex = 3;
this.buttonDel.Text = "Удалить";
this.buttonDel.UseVisualStyleBackColor = true;
this.buttonDel.Click += new System.EventHandler(this.DeleteButton_Click);
buttonDel.Location = new Point(670, 132);
buttonDel.Name = "buttonDel";
buttonDel.Size = new Size(94, 29);
buttonDel.TabIndex = 3;
buttonDel.Text = "Удалить";
buttonDel.UseVisualStyleBackColor = true;
buttonDel.Click += DeleteButton_Click;
//
// buttonRef
//
this.buttonRef.Location = new System.Drawing.Point(670, 188);
this.buttonRef.Name = "buttonRef";
this.buttonRef.Size = new System.Drawing.Size(94, 29);
this.buttonRef.TabIndex = 4;
this.buttonRef.Text = "Обновить";
this.buttonRef.UseVisualStyleBackColor = true;
this.buttonRef.Click += new System.EventHandler(this.UpdateButton_Click);
buttonRef.Location = new Point(670, 188);
buttonRef.Name = "buttonRef";
buttonRef.Size = new Size(94, 29);
buttonRef.TabIndex = 4;
buttonRef.Text = "Обновить";
buttonRef.UseVisualStyleBackColor = true;
buttonRef.Click += UpdateButton_Click;
//
// FormWorks
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(800, 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 = "FormWorks";
this.Text = "Работы";
((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
this.ResumeLayout(false);
AutoScaleDimensions = new SizeF(8F, 20F);
AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(800, 450);
Controls.Add(buttonRef);
Controls.Add(buttonDel);
Controls.Add(buttonUpd);
Controls.Add(buttonAdd);
Controls.Add(dataGridView);
Name = "FormWorks";
Text = "Работы";
Load += FormComponents_Load;
((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
ResumeLayout(false);
}
#endregion

View File

@ -23,6 +23,7 @@ namespace PlumbingRepairView
InitializeComponent();
_logger = logger;
_logic = logic;
LoadData();
}
private void FormComponents_Load(object sender, EventArgs e)

View File

@ -18,7 +18,7 @@
<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="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>

View File

@ -15,6 +15,7 @@
<ItemGroup>
<ProjectReference Include="..\PlumbingRepairBusinessLogic\PlumbingRepairBusinessLogic.csproj" />
<ProjectReference Include="..\PlumbingRepairContracts\PlumbingRepairContracts.csproj" />
<ProjectReference Include="..\PlumbingRepairFileImplement\PlumbingRepairFileImplement.csproj" />
<ProjectReference Include="..\PlumbingRepairListImplement\PlumbingRepairListImplement.csproj" />
</ItemGroup>

View File

@ -1,6 +1,6 @@
using PlumbingRepairContracts.BusinessLogicsContracts;
using PlumbingRepairContracts.StoragesContracts;
using PlumbingRepairListImplement.Implements;
using PlumbingRepairFileImplement.Implements;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using NLog.Extensions.Logging;
@ -53,6 +53,7 @@ namespace PlumbingRepairView
services.AddTransient<FormStores>();
services.AddTransient<FormStore>();
services.AddTransient<FormStoreReplenishment>();
services.AddTransient<FormSellWork>();
}
}
}

View File

@ -17,11 +17,15 @@ namespace PlumbingRepairBusinessLogic.BusinessLogics
{
private readonly ILogger _logger;
private readonly IOrderStorage _orderStorage;
private readonly IStoreLogic _storeLogic;
private readonly IWorkStorage _workStorage;
public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage
orderStorage)
orderStorage, IStoreLogic storeLogic, IWorkStorage workStorage)
{
_logger = logger;
_orderStorage = orderStorage;
_storeLogic = storeLogic;
_workStorage = workStorage;
}
public List<OrderViewModel>? ReadList(OrderSearchModel? model)
{
@ -74,8 +78,12 @@ namespace PlumbingRepairBusinessLogic.BusinessLogics
}
public bool StatusUpdate(OrderBindingModel model, OrderStatus newStatus)
{
CheckModel(model);
if (model.Status + 1 != 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("Status update to " + newStatus.ToString() + " operation failed. Order status incorrect.");
return false;
@ -83,8 +91,27 @@ namespace PlumbingRepairBusinessLogic.BusinessLogics
model.Status = newStatus;
if (model.Status == OrderStatus.Выдан)
if (model.Status == OrderStatus.Готов)
{
model.DateImplement = DateTime.Now;
var work = _workStorage.GetElement(new() { Id = viewModel.WorkId });
if (work == null)
{
throw new ArgumentNullException(nameof(work));
}
if (!_storeLogic.AddWork(work, viewModel.Count))
{
throw new Exception($"AddWork operation failed. Store is full.");
}
}
else
{
model.DateImplement = viewModel.DateImplement;
}
CheckModel(model, false);
if (_orderStorage.Update(model) == null)
{

View File

@ -31,29 +31,30 @@ namespace PlumbingRepairBusinessLogic.BusinessLogics
if (quantity <= 0)
{
throw new ArgumentException("Количество добавляемого изделия должно быть больше 0", nameof(quantity));
throw new ArgumentException("Количество изделий должно быть больше 0", nameof(quantity));
}
_logger.LogInformation("AddWorkInStore. StoreName:{StoreName}.Id:{ Id}", model.StoreName, model.Id);
_logger.LogInformation("AddWork. StoreName:{StoreName}.Id:{ Id}", model.StoreName, model.Id);
var element = _storeStorage.GetElement(model);
if (element == null)
{
_logger.LogWarning("AddWorkInStore element not found");
_logger.LogWarning("AddWork element not found");
return false;
}
_logger.LogInformation("AddWorkInStore find. Id:{Id}", element.Id);
if (element.Works.TryGetValue(work.Id, out var pair))
if (element.WorkMaxCount - element.StoreWorks.Select(x => x.Value.Item2).Sum() < quantity)
{
element.Works[work.Id] = (work, quantity + pair.Item2);
_logger.LogInformation("AddWorkInStore. Has been added {quantity} {work} in {StoreName}", quantity, work.WorkName, element.StoreName);
throw new ArgumentNullException("Магазин переполнен", nameof(quantity));
}
if (element.StoreWorks.TryGetValue(work.Id, out var pair))
{
element.StoreWorks[work.Id] = (work, quantity + pair.Item2);
_logger.LogInformation("AddWork. Added {quantity} {work} to '{StoreName}' store", quantity, work.WorkName, element.StoreName);
}
else
{
element.Works[work.Id] = (work, quantity);
_logger.LogInformation("AddWorkInShop. Has been added {quantity} new Work {work} in {StoreName}", quantity, work.WorkName, element.StoreName);
element.StoreWorks[work.Id] = (work, quantity);
_logger.LogInformation("AddWork. Added {quantity} new package {package} to '{StoreName}' store", quantity, work.WorkName, element.StoreName);
}
_storeStorage.Update(new()
@ -62,15 +63,63 @@ namespace PlumbingRepairBusinessLogic.BusinessLogics
StoreAdress = element.StoreAdress,
StoreName = element.StoreName,
OpeningDate = element.OpeningDate,
Works = element.Works
WorkMaxCount = element.WorkMaxCount,
StoreWorks = element.StoreWorks
});
return true;
}
public bool AddWork(IWorkModel work, int quantity)
{
if (work == null)
{
throw new ArgumentNullException(nameof(work));
}
if (quantity <= 0)
{
throw new ArgumentException("Количество добавляемого изделия должно быть больше 0", nameof(quantity));
}
var freePlaces = _storeStorage.GetFullList()
.Select(x => x.WorkMaxCount - x.StoreWorks
.Select(p => p.Value.Item2).Sum()).Sum() - quantity;
if (freePlaces < 0)
{
_logger.LogInformation("AddWork. Failed to add work to store. It's full.");
return false;
}
foreach (var store in _storeStorage.GetFullList())
{
var temp = Math.Min(quantity, store.WorkMaxCount - store.StoreWorks.Select(x => x.Value.Item2).Sum());
if (temp <= 0)
{
continue;
}
if (!AddWork(new() { Id = store.Id }, work, temp))
{
_logger.LogWarning("An error occurred while adding work to stores");
return false;
}
quantity -= temp;
if (quantity == 0)
{
return true;
}
}
return true;
}
public bool Create(StoreBindingModel model)
{
CheckModel(model);
model.Works = new();
model.StoreWorks = new();
if (_storeStorage.Insert(model) == null)
{
@ -130,7 +179,10 @@ namespace PlumbingRepairBusinessLogic.BusinessLogics
_logger.LogInformation("ReadList. Count:{Count}", list.Count);
return list;
}
public bool SellWork(IWorkModel work, int quantity)
{
return _storeStorage.SellWork(work, quantity);
}
public bool Update(StoreBindingModel model)
{
CheckModel(model, false);
@ -165,6 +217,11 @@ namespace PlumbingRepairBusinessLogic.BusinessLogics
throw new ArgumentNullException("Нет названия магазина", nameof(model.StoreName));
}
if (model.WorkMaxCount < 0)
{
throw new ArgumentException("Максимальное количество изделий в магазине не может быть меньше нуля", nameof(model.WorkMaxCount));
}
_logger.LogInformation("Store. StoreName:{0}.StoreAdress:{1}. Id: {2}", model.StoreName, model.StoreAdress, model.Id);
var element = _storeStorage.GetElement(new StoreSearchModel
{

View File

@ -13,6 +13,7 @@ namespace PlumbingRepairContracts.BindingModels
public string StoreName { get; set; } = string.Empty;
public string StoreAdress { get; set; } = string.Empty;
public DateTime OpeningDate { get; set; } = DateTime.Now;
public Dictionary<int, (IWorkModel, int)> Works { get; set; } = new();
public Dictionary<int, (IWorkModel, int)> StoreWorks { get; set; } = new();
public int WorkMaxCount { get; set; }
}
}

View File

@ -18,5 +18,7 @@ namespace PlumbingRepairContracts.BusinessLogicsContracts
bool Update(StoreBindingModel model);
bool Delete(StoreBindingModel model);
bool AddWork(StoreSearchModel model, IWorkModel work, int quantity);
bool AddWork(IWorkModel package, int quantity);
bool SellWork(IWorkModel package, int quantity);
}
}

View File

@ -1,6 +1,7 @@
using PlumbingRepairContracts.BindingModels;
using PlumbingRepairContracts.SearchModels;
using PlumbingRepairContracts.ViewModels;
using PlumbingRepairDataModels.Models;
using System;
using System.Collections.Generic;
using System.Linq;
@ -17,5 +18,6 @@ namespace PlumbingRepairContracts.StoragesContracts
StoreViewModel? Insert(StoreBindingModel model);
StoreViewModel? Update(StoreBindingModel model);
StoreViewModel? Delete(StoreBindingModel model);
bool SellWork(IWorkModel model, int quantity);
}
}

View File

@ -10,14 +10,15 @@ namespace PlumbingRepairContracts.ViewModels
{
public class StoreViewModel : IStoreModel
{
public Dictionary<int, (IWorkModel, int)> Works { get; set; } = new();
public Dictionary<int, (IWorkModel, int)> StoreWorks { get; set; } = new();
public int Id { get; set; }
[DisplayName("Название магазина")]
public string StoreName { get; set; } = string.Empty;
[DisplayName("Адрес магазина")]
public string StoreAdress { get; set; } = string.Empty;
[DisplayName("Дата открытия")]
public DateTime OpeningDate { get; set; } = DateTime.Now;
[DisplayName("Вместимость магазина")]
public int WorkMaxCount { get; set; }
}
}

View File

@ -11,6 +11,7 @@ namespace PlumbingRepairDataModels.Models
string StoreName { get; }
string StoreAdress { get; }
DateTime OpeningDate { get; }
Dictionary<int, (IWorkModel, int)> Works { get; }
Dictionary<int, (IWorkModel, int)> StoreWorks { get; }
public int WorkMaxCount { get; }
}
}

View File

@ -0,0 +1,67 @@
using PlumbingRepairFileImplement.Models;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Xml.Linq;
namespace PlumbingRepairFileImplement
{
internal class DataFileSingleton
{
private static DataFileSingleton? instance;
private readonly string ComponentFileName = "Component.xml";
private readonly string OrderFileName = "Order.xml";
private readonly string WorkFileName = "Work.xml";
private readonly string StoreFileName = "Store.xml";
public List<Component> Components { get; private set; }
public List<Order> Orders { get; private set; }
public List<Work> Works { get; private set; }
public List<Store> Stores { get; private set; }
public static DataFileSingleton GetInstance()
{
if (instance == null)
{
instance = new DataFileSingleton();
}
return instance;
}
public void SaveComponents() => SaveData(Components, ComponentFileName,
"Components", x => x.GetXElement);
public void SaveWorks() => SaveData(Works, WorkFileName,
"Works", x => x.GetXElement);
public void SaveOrders() => SaveData(Orders, OrderFileName,
"Orders", x => x.GetXElement);
public void SaveStores() => SaveData(Stores, StoreFileName,
"Stores", x => x.GetXElement);
private DataFileSingleton()
{
Components = LoadData(ComponentFileName, "Component", x =>
Component.Create(x)!)!;
Works = LoadData(WorkFileName, "Work", x =>
Work.Create(x)!)!;
Orders = LoadData(OrderFileName, "Order", x => Order.Create(x)!)!;
Stores = LoadData(StoreFileName, "Store", x => Store.Create(x)!)!;
}
private static List<T>? LoadData<T>(string filename, string xmlNodeName,
Func<XElement, T> selectFunction)
{
if (File.Exists(filename))
{
return XDocument.Load(filename)?.Root?.Elements(xmlNodeName)?
.Select(selectFunction)?.ToList();
}
return new List<T>();
}
private static void SaveData<T>(List<T> data, string filename, string
xmlNodeName, Func<T, XElement> selectFunction)
{
if (data != null)
{
new XDocument(new XElement(xmlNodeName,
data.Select(selectFunction).ToArray())).Save(filename);
}
}
}
}

View File

@ -0,0 +1,90 @@
using PlumbingRepairContracts.BindingModels;
using PlumbingRepairContracts.SearchModels;
using PlumbingRepairContracts.StoragesContracts;
using PlumbingRepairContracts.ViewModels;
using PlumbingRepairFileImplement.Models;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace PlumbingRepairFileImplement.Implements
{
public class ComponentStorage : IComponentStorage
{
private readonly DataFileSingleton source;
public ComponentStorage()
{
source = DataFileSingleton.GetInstance();
}
public List<ComponentViewModel> GetFullList()
{
return source.Components
.Select(x => x.GetViewModel)
.ToList();
}
public List<ComponentViewModel> GetFilteredList(ComponentSearchModel
model)
{
if (string.IsNullOrEmpty(model.ComponentName))
{
return new();
}
return source.Components
.Where(x => x.ComponentName.Contains(model.ComponentName))
.Select(x => x.GetViewModel).ToList();
}
public ComponentViewModel? GetElement(ComponentSearchModel model)
{
if (string.IsNullOrEmpty(model.ComponentName) && !model.Id.HasValue)
{
return null;
}
return source.Components
.FirstOrDefault(x =>
(!string.IsNullOrEmpty(model.ComponentName) && x.ComponentName ==
model.ComponentName) ||
(model.Id.HasValue && x.Id == model.Id))
?.GetViewModel;
}
public ComponentViewModel? Insert(ComponentBindingModel model)
{
model.Id = source.Components.Count > 0 ? source.Components.Max(x =>
x.Id) + 1 : 1;
var newComponent = Component.Create(model);
if (newComponent == null)
{
return null;
}
source.Components.Add(newComponent);
source.SaveComponents();
return newComponent.GetViewModel;
}
public ComponentViewModel? Update(ComponentBindingModel model)
{
var component = source.Components.FirstOrDefault(x => x.Id ==
model.Id);
if (component == null)
{
return null;
}
component.Update(model);
source.SaveComponents();
return component.GetViewModel;
}
public ComponentViewModel? Delete(ComponentBindingModel model)
{
var element = source.Components.FirstOrDefault(x => x.Id ==
model.Id);
if (element != null)
{
source.Components.Remove(element);
source.SaveComponents();
return element.GetViewModel;
}
return null;
}
}
}

View File

@ -0,0 +1,93 @@
using PlumbingRepairContracts.BindingModels;
using PlumbingRepairContracts.SearchModels;
using PlumbingRepairContracts.StoragesContracts;
using PlumbingRepairContracts.ViewModels;
using PlumbingRepairFileImplement.Models;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace PlumbingRepairFileImplement.Implements
{
public class OrderStorage : IOrderStorage
{
private readonly DataFileSingleton source;
public OrderStorage()
{
source = DataFileSingleton.GetInstance();
}
public List<OrderViewModel> GetFullList()
{
return source.Orders.Select(x => x.GetViewModel).ToList();
}
public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
{
if (!model.Id.HasValue)
{
return new();
}
return source.Orders.Where(x => x.Id == model.Id).Select(x => x.GetViewModel).ToList();
}
public OrderViewModel? GetElement(OrderSearchModel model)
{
if (!model.Id.HasValue)
{
return null;
}
return source.Orders.FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
}
public OrderViewModel? Insert(OrderBindingModel model)
{
model.Id = source.Orders.Count > 0 ? source.Orders.Max(x => x.Id) + 1 : 1;
var newOrder = Order.Create(model);
if (newOrder == null)
{
return null;
}
source.Orders.Add(newOrder);
source.SaveOrders();
return newOrder.GetViewModel;
}
public OrderViewModel? Update(OrderBindingModel model)
{
var order = source.Orders.FirstOrDefault(x => x.Id == model.Id);
if (order == null)
{
return null;
}
order.Update(model);
source.SaveOrders();
return order.GetViewModel;
}
public OrderViewModel? Delete(OrderBindingModel model)
{
var element = source.Orders.FirstOrDefault(x => x.Id == model.Id);
if (element != null)
{
source.Orders.Remove(element);
source.SaveOrders();
return element.GetViewModel;
}
return null;
}
}
}

View File

@ -0,0 +1,114 @@
using PlumbingRepairContracts.BindingModels;
using PlumbingRepairContracts.SearchModels;
using PlumbingRepairContracts.StoragesContracts;
using PlumbingRepairContracts.ViewModels;
using PlumbingRepairDataModels.Models;
using PlumbingRepairFileImplement.Models;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace PlumbingRepairFileImplement.Implements
{
public class StoreStorage : IStoreStorage
{
private readonly DataFileSingleton source;
public StoreStorage()
{
source = DataFileSingleton.GetInstance();
}
public StoreViewModel? GetElement(StoreSearchModel model)
{
if (string.IsNullOrEmpty(model.StoreName) && !model.Id.HasValue)
{
return null;
}
return source.Stores.FirstOrDefault(x =>
(!string.IsNullOrEmpty(model.StoreName) && x.StoreName ==
model.StoreName) || (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
}
public List<StoreViewModel> GetFilteredList(StoreSearchModel model)
{
if (string.IsNullOrEmpty(model.StoreName))
{
return new();
}
return source.Stores.Where(x =>
x.StoreName.Contains(model.StoreName)).Select(x => x.GetViewModel).ToList();
}
public List<StoreViewModel> GetFullList()
{
return source.Stores.Select(x => x.GetViewModel).ToList();
}
public StoreViewModel? Insert(StoreBindingModel model)
{
model.Id = source.Stores.Count > 0 ? source.Stores.Max(x => x.Id) + 1 : 1;
var newStore = Store.Create(model);
if (newStore == null)
{
return null;
}
source.Stores.Add(newStore);
source.SaveStores();
return newStore.GetViewModel;
}
public StoreViewModel? Update(StoreBindingModel model)
{
var store = source.Stores.FirstOrDefault(x => x.Id == model.Id);
if (store == null)
{
return null;
}
store.Update(model);
source.SaveStores();
return store.GetViewModel;
}
public StoreViewModel? Delete(StoreBindingModel model)
{
var element = source.Stores.FirstOrDefault(x => x.Id == model.Id);
if (element != null)
{
source.Stores.Remove(element);
source.SaveStores();
return element.GetViewModel;
}
return null;
}
public bool SellWork(IWorkModel model, int quantity)
{
if (source.Stores.Select(x => x.StoreWorks.FirstOrDefault(y => y.Key == model.Id).Value.Item2).Sum() < quantity)
{
return false;
}
foreach (var store in source.Stores.Where(x => x.StoreWorks.ContainsKey(model.Id)))
{
int QuantityInCurrentShop = store.StoreWorks[model.Id].Item2;
if (QuantityInCurrentShop <= quantity)
{
store.StoreWorks.Remove(model.Id);
quantity -= QuantityInCurrentShop;
}
else
{
store.StoreWorks[model.Id] = (store.StoreWorks[model.Id].Item1, QuantityInCurrentShop - quantity);
quantity = 0;
}
if (quantity == 0)
{
return true;
}
}
return false;
}
}
}

View File

@ -0,0 +1,94 @@
using PlumbingRepairContracts.BindingModels;
using PlumbingRepairContracts.SearchModels;
using PlumbingRepairContracts.StoragesContracts;
using PlumbingRepairContracts.ViewModels;
using PlumbingRepairFileImplement.Models;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace PlumbingRepairFileImplement.Implements
{
public class WorkStorage : IWorkStorage
{
private readonly DataFileSingleton source;
public WorkStorage()
{
source = DataFileSingleton.GetInstance();
}
public List<WorkViewModel> GetFullList()
{
return source.Works.Select(x => x.GetViewModel).ToList();
}
public List<WorkViewModel> GetFilteredList(WorkSearchModel model)
{
if (string.IsNullOrEmpty(model.WorkName))
{
return new();
}
return source.Works.Where(x => x.WorkName.Contains(model.WorkName)).Select(x => x.GetViewModel).ToList();
}
public WorkViewModel? GetElement(WorkSearchModel model)
{
if (string.IsNullOrEmpty(model.WorkName) && !model.Id.HasValue)
{
return null;
}
return source.Works.FirstOrDefault(x => (!string.IsNullOrEmpty(model.WorkName) && x.WorkName == model.WorkName) || (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
}
public WorkViewModel? Insert(WorkBindingModel model)
{
model.Id = source.Works.Count > 0 ? source.Works.Max(x => x.Id) + 1 : 1;
var newWork = Work.Create(model);
if (newWork == null)
{
return null;
}
source.Works.Add(newWork);
source.SaveWorks();
return newWork.GetViewModel;
}
public WorkViewModel? Update(WorkBindingModel model)
{
var work = source.Works.FirstOrDefault(x => x.Id == model.Id);
if (work == null)
{
return null;
}
work.Update(model);
source.SaveWorks();
return work.GetViewModel;
}
public WorkViewModel? Delete(WorkBindingModel model)
{
var element = source.Works.FirstOrDefault(x => x.Id == model.Id);
if (element != null)
{
source.Works.Remove(element);
source.SaveWorks();
return element.GetViewModel;
}
return null;
}
}
}

View File

@ -0,0 +1,59 @@
using PlumbingRepairContracts.BindingModels;
using PlumbingRepairContracts.ViewModels;
using PlumbingRepairDataModels.Models;
using System.Xml.Linq;
namespace PlumbingRepairFileImplement.Models
{
public class Component : IComponentModel
{
public int Id { get; private set; }
public string ComponentName { get; private set; } = string.Empty;
public double Cost { get; set; }
public static Component? Create(ComponentBindingModel model)
{
if (model == null)
{
return null;
}
return new Component()
{
Id = model.Id,
ComponentName = model.ComponentName,
Cost = model.Cost
};
}
public static Component? Create(XElement element)
{
if (element == null)
{
return null;
}
return new Component()
{
Id = Convert.ToInt32(element.Attribute("Id")!.Value),
ComponentName = element.Element("ComponentName")!.Value,
Cost = Convert.ToDouble(element.Element("Cost")!.Value)
};
}
public void Update(ComponentBindingModel? model)
{
if (model == null)
{
return;
}
ComponentName = model.ComponentName;
Cost = model.Cost;
}
public ComponentViewModel GetViewModel => new()
{
Id = Id,
ComponentName = ComponentName,
Cost = Cost
};
public XElement GetXElement => new("Component",
new XAttribute("Id", Id),
new XElement("ComponentName", ComponentName),
new XElement("Cost", Cost.ToString()));
}
}

View File

@ -0,0 +1,95 @@
using PlumbingRepairContracts.BindingModels;
using PlumbingRepairContracts.ViewModels;
using PlumbingRepairDataModels.Enums;
using PlumbingRepairDataModels.Models;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Xml.Linq;
namespace PlumbingRepairFileImplement.Models
{
public class Order : IOrderModel
{
public int Id { get; private set; }
public int WorkId { get; private set; }
public String WorkName { get; private set; } = string.Empty;
public int Count { get; private set; }
public double Sum { get; private set; }
public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен;
public DateTime DateCreate { get; private set; } = DateTime.Now;
public DateTime? DateImplement { get; private set; }
public static Order? Create(OrderBindingModel? model)
{
if (model == null)
{
return null;
}
return new Order()
{
Id = model.Id,
WorkId = model.WorkId,
WorkName = model.WorkName,
Count = model.Count,
Sum = model.Sum,
Status = model.Status,
DateCreate = model.DateCreate,
DateImplement = model.DateImplement,
};
}
public static Order? Create(XElement? element)
{
if (element == null)
{
return null;
}
return new Order()
{
Id = Convert.ToInt32(element.Attribute("Id")!.Value),
WorkId = Convert.ToInt32(element.Element("WorkId")!.Value),
WorkName = element.Element("WorkName")!.Value,
Count = Convert.ToInt32(element.Element("Count")!.Value),
Sum = Convert.ToDouble(element.Element("Sum")!.Value),
Status = (OrderStatus)Enum.Parse(typeof(OrderStatus), element.Element("Status")!.Value),
DateCreate = Convert.ToDateTime(element.Element("DateCreate")!.Value),
DateImplement = string.IsNullOrEmpty(element.Element("DateImplement")!.Value) ? null
: Convert.ToDateTime(element.Element("DateImplement")!.Value)
};
}
public void Update(OrderBindingModel? model)
{
if (model == null)
{
return;
}
Count = model.Count;
Sum = model.Sum;
Status = model.Status;
DateCreate = model.DateCreate;
DateImplement = model.DateImplement;
}
public OrderViewModel GetViewModel => new()
{
Id = Id,
WorkId = WorkId,
WorkName = WorkName,
Count = Count,
Sum = Sum,
Status = Status,
DateCreate = DateCreate,
DateImplement = DateImplement,
};
public XElement GetXElement => new("Order",
new XAttribute("Id", Id),
new XElement("WorkName", WorkName),
new XElement("WorkId", WorkId.ToString()),
new XElement("Count", Count.ToString()),
new XElement("Sum", Sum.ToString()),
new XElement("Status", Status.ToString()),
new XElement("DateCreate", DateCreate.ToString()),
new XElement("DateImplement", DateImplement.ToString()));
}
}

View File

@ -0,0 +1,108 @@
using PlumbingRepairContracts.BindingModels;
using PlumbingRepairContracts.ViewModels;
using PlumbingRepairDataModels.Models;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Xml.Linq;
namespace PlumbingRepairFileImplement.Models
{
public class Store : IStoreModel
{
public string StoreName { get; private set; } = string.Empty;
public string StoreAdress { get; private set; } = string.Empty;
public DateTime OpeningDate { get; private set; }
public Dictionary<int, int> Works { get; private set; } = new();
public Dictionary<int, (IWorkModel, int)> _storeWorks = null;
public int Id { get; private set; }
public int WorkMaxCount { get; private set; }
public Dictionary<int, (IWorkModel, int)> StoreWorks
{
get
{
if (_storeWorks == null)
{
var source = DataFileSingleton.GetInstance();
_storeWorks = Works.ToDictionary(x => x.Key, y => ((source.Works.FirstOrDefault(z => z.Id == y.Key) as IWorkModel)!, y.Value));
}
return _storeWorks;
}
}
public static Store? Create(StoreBindingModel? model)
{
if (model == null)
{
return null;
}
return new Store()
{
Id = model.Id,
StoreName = model.StoreName,
StoreAdress = model.StoreAdress,
WorkMaxCount = model.WorkMaxCount,
OpeningDate = model.OpeningDate,
Works = model.StoreWorks.ToDictionary(x => x.Key, x => x.Value.Item2)
};
}
public static Store? Create(XElement element)
{
if (element == null)
{
return null;
}
return new()
{
Id = Convert.ToInt32(element.Attribute("Id")!.Value),
StoreName = element.Element("StoreName")!.Value,
StoreAdress = element.Element("StoreAdress")!.Value,
OpeningDate = Convert.ToDateTime(element.Element("OpeningDate")!.Value),
WorkMaxCount = Convert.ToInt32(element.Element("WorkMaxCount")!.Value),
Works = element.Element("StoreWorks")!.Elements("Work").ToDictionary(
x => Convert.ToInt32(x.Element("Key")?.Value),
x => Convert.ToInt32(x.Element("Value")?.Value))
};
}
public void Update(StoreBindingModel? model)
{
if (model == null)
{
return;
}
StoreName = model.StoreName;
StoreAdress = model.StoreAdress;
OpeningDate = model.OpeningDate;
WorkMaxCount = model.WorkMaxCount;
Works = model.StoreWorks.ToDictionary(x => x.Key, x => x.Value.Item2);
_storeWorks = null;
}
public StoreViewModel GetViewModel => new()
{
Id = Id,
StoreName = StoreName,
StoreAdress = StoreAdress,
StoreWorks = StoreWorks,
OpeningDate = OpeningDate,
WorkMaxCount = WorkMaxCount,
};
public XElement GetXElement => new("Store",
new XAttribute("Id", Id),
new XElement("StoreName", StoreName),
new XElement("StoreAdress", StoreAdress),
new XElement("OpeningDate", OpeningDate),
new XElement("WorkMaxCount", WorkMaxCount),
new XElement("StoreWorks", Works
.Select(x => new XElement("Work",
new XElement("Key", x.Key),
new XElement("Value", x.Value))
).ToArray()));
}
}

View File

@ -0,0 +1,90 @@
using PlumbingRepairContracts.BindingModels;
using PlumbingRepairContracts.ViewModels;
using PlumbingRepairDataModels.Models;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Xml.Linq;
namespace PlumbingRepairFileImplement.Models
{
public class Work : IWorkModel
{
public int Id { get; private set; }
public string WorkName { get; private set; } = string.Empty;
public double Price { get; private set; }
public Dictionary<int, int> Components { get; private set; } = new();
private Dictionary<int, (IComponentModel, int)>? _workComponents = null;
public Dictionary<int, (IComponentModel, int)> WorkComponents
{
get
{
if(_workComponents == null)
{
var source = DataFileSingleton.GetInstance();
_workComponents = Components.ToDictionary(x => x.Key, y =>
((source.Components.FirstOrDefault(z => z.Id == y.Key)
as IComponentModel)!, y.Value));
}
return _workComponents;
}
}
public static Work? Create(WorkBindingModel? model)
{
if (model == null)
{
return null;
}
return new Work()
{
Id = model.Id,
WorkName = model.WorkName,
Price = model.Price,
Components = model.WorkComponents.ToDictionary(x => x.Key, x => x.Value.Item2)
};
}
public static Work? Create(XElement element)
{
if (element == null)
{
return null;
}
return new Work()
{
Id = Convert.ToInt32(element.Attribute("Id")!.Value),
WorkName = element.Element("WorkName")!.Value,
Price = Convert.ToDouble(element.Element("Price")!.Value),
Components = element.Element("WorkComponents")!.Elements("WorkComponent")
.ToDictionary(x => Convert.ToInt32(x.Element("Key")?.Value), x => Convert.ToInt32(x.Element("Value")?.Value))
};
}
public void Update(WorkBindingModel? model)
{
if (model == null)
{
return;
}
WorkName = model.WorkName;
Price = model.Price;
Components = model.WorkComponents.ToDictionary(x => x.Key, x => x.Value.Item2);
_workComponents = null;
}
public WorkViewModel GetViewModel => new()
{
Id = Id,
WorkName = WorkName,
Price = Price,
WorkComponents = WorkComponents
};
public XElement GetXElement => new("Work",
new XAttribute("Id", Id),
new XElement("WorkName", WorkName),
new XElement("Price", Price.ToString()),
new XElement("WorkComponents", Components.Select(x =>
new XElement("WorkComponent",
new XElement("Key", x.Key),
new XElement("Value", x.Value))).ToArray()));
}
}

View File

@ -0,0 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\PlumbingRepairContracts\PlumbingRepairContracts.csproj" />
<ProjectReference Include="..\PlumbingRepairDataModels\PlumbingRepairDataModels.csproj" />
</ItemGroup>
</Project>

View File

@ -2,6 +2,7 @@
using PlumbingRepairContracts.SearchModels;
using PlumbingRepairContracts.StoragesContracts;
using PlumbingRepairContracts.ViewModels;
using PlumbingRepairDataModels.Models;
using PlumbingRepairListImplement.Models;
using System;
using System.Collections.Generic;
@ -105,7 +106,10 @@ namespace PlumbingRepairListImplement.Implements
return newStore.GetViewModel;
}
public bool SellWork(IWorkModel model, int quantity)
{
throw new NotImplementedException();
}
public StoreViewModel? Update(StoreBindingModel model)
{
foreach (var store in _source.Stores)

View File

@ -16,7 +16,7 @@ namespace PlumbingRepairListImplement.Models
public DateTime OpeningDate { get; private set; }
public Dictionary<int, (IWorkModel, int)> Works { get; private set; } = new();
public Dictionary<int, (IWorkModel, int)> StoreWorks { get; private set; } = new();
public int Id { get; private set; }
@ -32,7 +32,7 @@ namespace PlumbingRepairListImplement.Models
StoreName = model.StoreName,
StoreAdress = model.StoreAdress,
OpeningDate = model.OpeningDate,
Works = new()
StoreWorks = new()
};
}
@ -45,7 +45,7 @@ namespace PlumbingRepairListImplement.Models
StoreName = model.StoreName;
StoreAdress = model.StoreAdress;
OpeningDate = model.OpeningDate;
Works = model.Works;
StoreWorks = model.StoreWorks;
}
public StoreViewModel GetViewModel => new()
@ -54,7 +54,8 @@ namespace PlumbingRepairListImplement.Models
StoreName = StoreName,
StoreAdress = StoreAdress,
OpeningDate = OpeningDate,
Works = Works
StoreWorks = StoreWorks
};
public int WorkMaxCount => throw new NotImplementedException();
}
}