Gerimovich_Ilya/SUBD_Gerimovich_Ilya_PIbd-22
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

13

Browse Source
This commit is contained in:
platoff aeeee 2024-05-24 13:42:42 +04:00
parent 2cefd91025
commit fef0d95c7a
24 changed files with 385 additions and 418 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
FurnitureAssembly/FurnitureAssemblyView/FormCreateOrder.Designer.cs → FurnitureAssembly/FurnitureAssemblyView/FormCreateAd.Designer.cs generated
View File

@ -1,6 +1,6 @@
namespace FurnitureAssemblyView
{
partial class FormCreateOrder
partial class FormCreateAd
{
/// <summary>
/// Required designer variable.

4
FurnitureAssembly/FurnitureAssemblyView/FormCreateOrder.cs → FurnitureAssembly/FurnitureAssemblyView/FormCreateAd.cs
View File

@ -15,7 +15,7 @@ using System.Windows.Forms;
namespace FurnitureAssemblyView
{
public partial class FormCreateOrder : Form
public partial class FormCreateAd : Form
{
private readonly ILogger _logger;
@ -23,7 +23,7 @@ namespace FurnitureAssemblyView
private readonly IAdLogic _logicO;
public FormCreateOrder(ILogger<FormCreateOrder> logger, IUsersLogic logicM, IAdLogic logicO)
public FormCreateAd(ILogger<FormCreateAd> logger, IUsersLogic logicM, IAdLogic logicO)
{
InitializeComponent();

0
FurnitureAssembly/FurnitureAssemblyView/FormCreateOrder.resx → FurnitureAssembly/FurnitureAssemblyView/FormCreateAd.resx
View File

118
FurnitureAssembly/FurnitureAssemblyView/FormFurnitureWorkPiece.Designer.cs generated
View File

@ -1,118 +0,0 @@
namespace FurnitureAssemblyView
{
partial class FormFurnitureWorkPiece
{
/// <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()
{
labelWorkPiece = new Label();
labelCount = new Label();
comboBoxWorkPiece = new ComboBox();
textBoxCount = new TextBox();
buttonSave = new Button();
buttonCancel = new Button();
SuspendLayout();
//
// labelWorkPiece
//
labelWorkPiece.AutoSize = true;
labelWorkPiece.Location = new Point(31, 33);
labelWorkPiece.Name = "labelWorkPiece";
labelWorkPiece.Size = new Size(81, 20);
labelWorkPiece.TabIndex = 0;
labelWorkPiece.Text = "Заготовка:";
//
// labelCount
//
labelCount.AutoSize = true;
labelCount.Location = new Point(31, 79);
labelCount.Name = "labelCount";
labelCount.Size = new Size(93, 20);
labelCount.TabIndex = 1;
labelCount.Text = "Количество:";
//
// comboBoxWorkPiece
//
comboBoxWorkPiece.FormattingEnabled = true;
comboBoxWorkPiece.Location = new Point(156, 30);
comboBoxWorkPiece.Name = "comboBoxWorkPiece";
comboBoxWorkPiece.Size = new Size(320, 28);
comboBoxWorkPiece.TabIndex = 2;
//
// textBoxCount
//
textBoxCount.Location = new Point(156, 76);
textBoxCount.Name = "textBoxCount";
textBoxCount.Size = new Size(320, 27);
textBoxCount.TabIndex = 3;
//
// buttonSave
//
buttonSave.Location = new Point(236, 118);
buttonSave.Name = "buttonSave";
buttonSave.Size = new Size(110, 38);
buttonSave.TabIndex = 4;
buttonSave.Text = "Сохранить";
buttonSave.UseVisualStyleBackColor = true;
buttonSave.Click += ButtonSave_Click;
//
// buttonCancel
//
buttonCancel.Location = new Point(363, 118);
buttonCancel.Name = "buttonCancel";
buttonCancel.Size = new Size(113, 38);
buttonCancel.TabIndex = 5;
buttonCancel.Text = "Отмена";
buttonCancel.UseVisualStyleBackColor = true;
buttonCancel.Click += ButtonCancel_Click;
//
// FormFurnitureWorkPiece
//
AutoScaleDimensions = new SizeF(8F, 20F);
AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(526, 168);
Controls.Add(buttonCancel);
Controls.Add(buttonSave);
Controls.Add(textBoxCount);
Controls.Add(comboBoxWorkPiece);
Controls.Add(labelCount);
Controls.Add(labelWorkPiece);
Name = "FormFurnitureWorkPiece";
Text = "Заготовки для изделия";
ResumeLayout(false);
PerformLayout();
}
#endregion
private Label labelWorkPiece;
private Label labelCount;
private ComboBox comboBoxWorkPiece;
private TextBox textBoxCount;
private Button buttonSave;
private Button buttonCancel;
}
}

45
FurnitureAssembly/FurnitureAssemblyView/FormWorkPiece.Designer.cs → FurnitureAssembly/FurnitureAssemblyView/FormKomment.Designer.cs generated
View File

@ -1,6 +1,6 @@
namespace FurnitureAssemblyView
{
partial class FormWorkPiece
partial class FormKomment
{
/// <summary>
/// Required designer variable.
@ -39,40 +39,45 @@
// labelName
//
this.labelName.AutoSize = true;
this.labelName.Location = new System.Drawing.Point(30, 24);
this.labelName.Location = new System.Drawing.Point(12, 19);
this.labelName.Name = "labelName";
this.labelName.Size = new System.Drawing.Size(80, 20);
this.labelName.Size = new System.Drawing.Size(117, 15);
this.labelName.TabIndex = 0;
this.labelName.Text = "Название:";
this.labelName.Text = "Текст комментария:";
//
// labelPrice
//
this.labelPrice.AutoSize = true;
this.labelPrice.Location = new System.Drawing.Point(30, 65);
this.labelPrice.Location = new System.Drawing.Point(103, 128);
this.labelPrice.Name = "labelPrice";
this.labelPrice.Size = new System.Drawing.Size(48, 20);
this.labelPrice.Size = new System.Drawing.Size(38, 15);
this.labelPrice.TabIndex = 1;
this.labelPrice.Text = "Цена:";
//
// textBoxName
//
this.textBoxName.Location = new System.Drawing.Point(127, 21);
this.textBoxName.Location = new System.Drawing.Point(135, 16);
this.textBoxName.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.textBoxName.Multiline = true;
this.textBoxName.Name = "textBoxName";
this.textBoxName.Size = new System.Drawing.Size(293, 27);
this.textBoxName.ScrollBars = System.Windows.Forms.ScrollBars.Horizontal;
this.textBoxName.Size = new System.Drawing.Size(314, 105);
this.textBoxName.TabIndex = 2;
//
// textBoxCost
//
this.textBoxCost.Location = new System.Drawing.Point(127, 62);
this.textBoxCost.Location = new System.Drawing.Point(158, 125);
this.textBoxCost.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.textBoxCost.Name = "textBoxCost";
this.textBoxCost.Size = new System.Drawing.Size(179, 27);
this.textBoxCost.Size = new System.Drawing.Size(157, 23);
this.textBoxCost.TabIndex = 3;
//
// buttonCancel
//
this.buttonCancel.Location = new System.Drawing.Point(326, 104);
this.buttonCancel.Location = new System.Drawing.Point(333, 152);
this.buttonCancel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.buttonCancel.Name = "buttonCancel";
this.buttonCancel.Size = new System.Drawing.Size(94, 29);
this.buttonCancel.Size = new System.Drawing.Size(82, 22);
this.buttonCancel.TabIndex = 4;
this.buttonCancel.Text = "Отмена";
this.buttonCancel.UseVisualStyleBackColor = true;
@ -80,27 +85,29 @@
//
// buttonSave
//
this.buttonSave.Location = new System.Drawing.Point(212, 104);
this.buttonSave.Location = new System.Drawing.Point(245, 152);
this.buttonSave.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.buttonSave.Name = "buttonSave";
this.buttonSave.Size = new System.Drawing.Size(94, 29);
this.buttonSave.Size = new System.Drawing.Size(82, 22);
this.buttonSave.TabIndex = 5;
this.buttonSave.Text = "Сохранить";
this.buttonSave.UseVisualStyleBackColor = true;
this.buttonSave.Click += new System.EventHandler(this.ButtonSave_Click);
//
// FormWorkPiece
// FormKomment
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(464, 153);
this.ClientSize = new System.Drawing.Size(474, 185);
this.Controls.Add(this.buttonSave);
this.Controls.Add(this.buttonCancel);
this.Controls.Add(this.textBoxCost);
this.Controls.Add(this.textBoxName);
this.Controls.Add(this.labelPrice);
this.Controls.Add(this.labelName);
this.Name = "FormWorkPiece";
this.Text = "Заготовка";
this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.Name = "FormKomment";
this.Text = "Комментарий";
this.Load += new System.EventHandler(this.FormWorkPiece_Load);
this.ResumeLayout(false);
this.PerformLayout();

4
FurnitureAssembly/FurnitureAssemblyView/FormWorkPiece.cs → FurnitureAssembly/FurnitureAssemblyView/FormKomment.cs
View File

@ -6,7 +6,7 @@ using Microsoft.Extensions.Logging;
namespace FurnitureAssemblyView
{
// Ôîðìà "Çàãîòîâêà"
public partial class FormWorkPiece : Form
public partial class FormKomment : Form
{
private readonly ILogger _logger;
@ -17,7 +17,7 @@ namespace FurnitureAssemblyView
public int Id { set { _id = value; } }
// Êîíñòðóêòîð
public FormWorkPiece(ILogger<FormWorkPiece> logger, IKommentLogic logic)
public FormKomment(ILogger<FormKomment> logger, IKommentLogic logic)
{
InitializeComponent();

0
FurnitureAssembly/FurnitureAssemblyView/FormFurnitureWorkPiece.resx → FurnitureAssembly/FurnitureAssemblyView/FormKomment.resx
View File

121
FurnitureAssembly/FurnitureAssemblyView/FormKomments.Designer.cs generated Normal file
View File

@ -0,0 +1,121 @@
namespace FurnitureAssemblyView
{
partial class FormKomments
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.buttonAdd = new System.Windows.Forms.Button();
this.buttonUpdate = new System.Windows.Forms.Button();
this.buttonDelete = new System.Windows.Forms.Button();
this.buttonRefresh = new System.Windows.Forms.Button();
this.dataGridView = new System.Windows.Forms.DataGridView();
((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
this.SuspendLayout();
//
// buttonAdd
//
this.buttonAdd.Location = new System.Drawing.Point(561, 27);
this.buttonAdd.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.buttonAdd.Name = "buttonAdd";
this.buttonAdd.Size = new System.Drawing.Size(102, 35);
this.buttonAdd.TabIndex = 0;
this.buttonAdd.Text = "Добавить";
this.buttonAdd.UseVisualStyleBackColor = true;
this.buttonAdd.Click += new System.EventHandler(this.ButtonAdd_Click);
//
// buttonUpdate
//
this.buttonUpdate.Location = new System.Drawing.Point(561, 76);
this.buttonUpdate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.buttonUpdate.Name = "buttonUpdate";
this.buttonUpdate.Size = new System.Drawing.Size(102, 35);
this.buttonUpdate.TabIndex = 1;
this.buttonUpdate.Text = "Изменить";
this.buttonUpdate.UseVisualStyleBackColor = true;
this.buttonUpdate.Click += new System.EventHandler(this.ButtonUpdate_Click);
//
// buttonDelete
//
this.buttonDelete.Location = new System.Drawing.Point(561, 126);
this.buttonDelete.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.buttonDelete.Name = "buttonDelete";
this.buttonDelete.Size = new System.Drawing.Size(102, 35);
this.buttonDelete.TabIndex = 2;
this.buttonDelete.Text = "Удалить";
this.buttonDelete.UseVisualStyleBackColor = true;
this.buttonDelete.Click += new System.EventHandler(this.ButtonDelete_Click);
//
// buttonRefresh
//
this.buttonRefresh.Location = new System.Drawing.Point(561, 179);
this.buttonRefresh.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.buttonRefresh.Name = "buttonRefresh";
this.buttonRefresh.Size = new System.Drawing.Size(102, 35);
this.buttonRefresh.TabIndex = 3;
this.buttonRefresh.Text = "Обновить";
this.buttonRefresh.UseVisualStyleBackColor = true;
this.buttonRefresh.Click += new System.EventHandler(this.ButtonRefresh_Click);
//
// dataGridView
//
this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dataGridView.Location = new System.Drawing.Point(10, 9);
this.dataGridView.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.dataGridView.Name = "dataGridView";
this.dataGridView.RowHeadersWidth = 51;
this.dataGridView.RowTemplate.Height = 29;
this.dataGridView.Size = new System.Drawing.Size(545, 320);
this.dataGridView.TabIndex = 4;
//
// FormKomments
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(683, 338);
this.Controls.Add(this.dataGridView);
this.Controls.Add(this.buttonRefresh);
this.Controls.Add(this.buttonDelete);
this.Controls.Add(this.buttonUpdate);
this.Controls.Add(this.buttonAdd);
this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.Name = "FormKomments";
this.Text = "Комментарии";
this.Load += new System.EventHandler(this.FormWorkPiece_Load);
((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
this.ResumeLayout(false);
}
#endregion
private Button buttonAdd;
private Button buttonUpdate;
private Button buttonDelete;
private Button buttonRefresh;
private DataGridView dataGridView;
}
}

12
FurnitureAssembly/FurnitureAssemblyView/FormWorkPieces.cs → FurnitureAssembly/FurnitureAssemblyView/FormKomments.cs
View File

@ -14,13 +14,13 @@ using System.Windows.Forms;
namespace FurnitureAssemblyView
{
// Форма со всеми созданными заготовками
public partial class FormWorkPieces : Form
public partial class FormKomments : Form
{
private readonly ILogger _logger;
private readonly IKommentLogic _logic;
public FormWorkPieces(ILogger<FormWorkPieces> logger, IKommentLogic logic)
public FormKomments(ILogger<FormKomments> logger, IKommentLogic logic)
{
InitializeComponent();
_logger = logger;
@ -59,9 +59,9 @@ namespace FurnitureAssemblyView
private void ButtonAdd_Click(object sender, EventArgs e)
{
var service = Program.ServiceProvider?.GetService(typeof(FormWorkPiece));
var service = Program.ServiceProvider?.GetService(typeof(FormKomment));
if (service is FormWorkPiece form)
if (service is FormKomment form)
{
if (form.ShowDialog() == DialogResult.OK)
{
@ -75,9 +75,9 @@ namespace FurnitureAssemblyView
{
if (dataGridView.SelectedRows.Count == 1)
{
var service = Program.ServiceProvider?.GetService(typeof(FormWorkPiece));
var service = Program.ServiceProvider?.GetService(typeof(FormKomment));
if (service is FormWorkPiece form)
if (service is FormKomment form)
{
form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
if (form.ShowDialog() == DialogResult.OK)

0
FurnitureAssembly/FurnitureAssemblyView/FormFurnitures.resx → FurnitureAssembly/FurnitureAssemblyView/FormKomments.resx
View File

16
FurnitureAssembly/FurnitureAssemblyView/FormMain.Designer.cs generated
View File

@ -50,12 +50,12 @@
this.dataGridView.Name = "dataGridView";
this.dataGridView.RowHeadersWidth = 51;
this.dataGridView.RowTemplate.Height = 29;
this.dataGridView.Size = new System.Drawing.Size(794, 302);
this.dataGridView.Size = new System.Drawing.Size(709, 302);
this.dataGridView.TabIndex = 0;
//
// buttonCreateOrder
//
this.buttonCreateOrder.Location = new System.Drawing.Point(820, 27);
this.buttonCreateOrder.Location = new System.Drawing.Point(725, 27);
this.buttonCreateOrder.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.buttonCreateOrder.Name = "buttonCreateOrder";
this.buttonCreateOrder.Size = new System.Drawing.Size(178, 34);
@ -66,7 +66,7 @@
//
// buttonTakeOrderInWork
//
this.buttonTakeOrderInWork.Location = new System.Drawing.Point(820, 65);
this.buttonTakeOrderInWork.Location = new System.Drawing.Point(725, 65);
this.buttonTakeOrderInWork.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.buttonTakeOrderInWork.Name = "buttonTakeOrderInWork";
this.buttonTakeOrderInWork.Size = new System.Drawing.Size(178, 56);
@ -77,7 +77,7 @@
//
// buttonOrderReady
//
this.buttonOrderReady.Location = new System.Drawing.Point(820, 125);
this.buttonOrderReady.Location = new System.Drawing.Point(725, 125);
this.buttonOrderReady.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.buttonOrderReady.Name = "buttonOrderReady";
this.buttonOrderReady.Size = new System.Drawing.Size(178, 31);
@ -88,7 +88,7 @@
//
// buttonIssuedOrder
//
this.buttonIssuedOrder.Location = new System.Drawing.Point(820, 160);
this.buttonIssuedOrder.Location = new System.Drawing.Point(725, 160);
this.buttonIssuedOrder.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.buttonIssuedOrder.Name = "buttonIssuedOrder";
this.buttonIssuedOrder.Size = new System.Drawing.Size(178, 33);
@ -99,7 +99,7 @@
//
// buttonRefresh
//
this.buttonRefresh.Location = new System.Drawing.Point(820, 197);
this.buttonRefresh.Location = new System.Drawing.Point(725, 197);
this.buttonRefresh.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.buttonRefresh.Name = "buttonRefresh";
this.buttonRefresh.Size = new System.Drawing.Size(178, 29);
@ -116,7 +116,7 @@
this.menuStrip.Location = new System.Drawing.Point(0, 0);
this.menuStrip.Name = "menuStrip";
this.menuStrip.Padding = new System.Windows.Forms.Padding(5, 2, 0, 2);
this.menuStrip.Size = new System.Drawing.Size(1015, 24);
this.menuStrip.Size = new System.Drawing.Size(910, 24);
this.menuStrip.TabIndex = 6;
this.menuStrip.Text = "menuStrip";
//
@ -147,7 +147,7 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1015, 338);
this.ClientSize = new System.Drawing.Size(910, 338);
this.Controls.Add(this.buttonRefresh);
this.Controls.Add(this.buttonIssuedOrder);
this.Controls.Add(this.buttonOrderReady);

12
FurnitureAssembly/FurnitureAssemblyView/FormMain.cs
View File

@ -58,9 +58,9 @@ namespace FurnitureAssemblyView
private void WorkPieceToolStripMenuItem_Click(object sender, EventArgs e)
{
var service = Program.ServiceProvider?.GetService(typeof(FormWorkPieces));
var service = Program.ServiceProvider?.GetService(typeof(FormKomments));
if (service is FormWorkPieces form)
if (service is FormKomments form)
{
form.ShowDialog();
}
@ -68,9 +68,9 @@ namespace FurnitureAssemblyView
private void FurnitureToolStripMenuItem_Click(object sender, EventArgs e)
{
var service = Program.ServiceProvider?.GetService(typeof(FormFurnitures));
var service = Program.ServiceProvider?.GetService(typeof(FormUsers));
if (service is FormFurnitures form)
if (service is FormUsers form)
{
form.ShowDialog();
}
@ -78,9 +78,9 @@ namespace FurnitureAssemblyView
private void ButtonCreateOrder_Click(object sender, EventArgs e)
{
var service = Program.ServiceProvider?.GetService(typeof(FormCreateOrder));
var service = Program.ServiceProvider?.GetService(typeof(FormCreateAd));
if (service is FormCreateOrder form)
if (service is FormCreateAd form)
{
form.ShowDialog();
LoadData();

2
FurnitureAssembly/FurnitureAssemblyView/FormFurniture.Designer.cs → FurnitureAssembly/FurnitureAssemblyView/FormUser.Designer.cs generated
View File

@ -1,6 +1,6 @@
namespace FurnitureAssemblyView
{
partial class FormFurniture
partial class FormUser
{
/// <summary>
/// Required designer variable.

12
FurnitureAssembly/FurnitureAssemblyView/FormFurniture.cs → FurnitureAssembly/FurnitureAssemblyView/FormUser.cs
View File

@ -15,7 +15,7 @@ using System.Windows.Forms;
namespace FurnitureAssemblyView
{
public partial class FormFurniture : Form
public partial class FormUser : Form
{
private readonly ILogger _logger;
@ -27,7 +27,7 @@ namespace FurnitureAssemblyView
public int Id { set { _id = value; } }
public FormFurniture(ILogger<FormFurniture> logger, IUsersLogic logic)
public FormUser(ILogger<FormUser> logger, IUsersLogic logic)
{
InitializeComponent();
@ -89,9 +89,9 @@ namespace FurnitureAssemblyView
private void ButtonAdd_Click(object sender, EventArgs e)
{
var service = Program.ServiceProvider?.GetService(typeof(FormFurnitureWorkPiece));
var service = Program.ServiceProvider?.GetService(typeof(FormUsersKomment));
if (service is FormFurnitureWorkPiece form)
if (service is FormUsersKomment form)
{
if (form.ShowDialog() == DialogResult.OK)
{
@ -120,9 +120,9 @@ namespace FurnitureAssemblyView
{
if (dataGridView.SelectedRows.Count == 1)
{
var service = Program.ServiceProvider?.GetService(typeof(FormFurnitureWorkPiece));
var service = Program.ServiceProvider?.GetService(typeof(FormUsersKomment));
if (service is FormFurnitureWorkPiece form)
if (service is FormUsersKomment form)
{
int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value);
form.Id = id;

9
FurnitureAssembly/FurnitureAssemblyView/FormFurniture.resx → FurnitureAssembly/FurnitureAssemblyView/FormUser.resx
View File

@ -66,4 +66,13 @@
<metadata name="ColumnPrice.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ColumnID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ColumnName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ColumnPrice.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
</root>

2
FurnitureAssembly/FurnitureAssemblyView/FormFurnitures.Designer.cs → FurnitureAssembly/FurnitureAssemblyView/FormUsers.Designer.cs generated
View File

@ -1,6 +1,6 @@
namespace FurnitureAssemblyView
{
partial class FormFurnitures
partial class FormUsers
{
/// <summary>
/// Required designer variable.

12
FurnitureAssembly/FurnitureAssemblyView/FormFurnitures.cs → FurnitureAssembly/FurnitureAssemblyView/FormUsers.cs
View File

@ -13,13 +13,13 @@ using System.Windows.Forms;
namespace FurnitureAssemblyView
{
public partial class FormFurnitures : Form
public partial class FormUsers : Form
{
private readonly ILogger _logger;
private readonly IUsersLogic _logic;
public FormFurnitures(ILogger<FormFurnitures> logger, IUsersLogic logic)
public FormUsers(ILogger<FormUsers> logger, IUsersLogic logic)
{
InitializeComponent();
@ -58,9 +58,9 @@ namespace FurnitureAssemblyView
private void ButtonAdd_Click(object sender, EventArgs e)
{
var service = Program.ServiceProvider?.GetService(typeof(FormFurniture));
var service = Program.ServiceProvider?.GetService(typeof(FormUser));
if (service is FormFurniture form)
if (service is FormUser form)
{
if (form.ShowDialog() == DialogResult.OK)
{
@ -73,9 +73,9 @@ namespace FurnitureAssemblyView
{
if (dataGridView.SelectedRows.Count == 1)
{
var service = Program.ServiceProvider?.GetService(typeof(FormFurniture));
var service = Program.ServiceProvider?.GetService(typeof(FormUser));
if (service is FormFurniture form)
if (service is FormUser form)
{
form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);

0
FurnitureAssembly/FurnitureAssemblyView/FormWorkPiece.resx → FurnitureAssembly/FurnitureAssemblyView/FormUsers.resx
View File

122
FurnitureAssembly/FurnitureAssemblyView/FormUsersKomment.Designer.cs generated Normal file
View File

@ -0,0 +1,122 @@
namespace FurnitureAssemblyView
{
partial class FormUsersKomment
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.labelWorkPiece = new System.Windows.Forms.Label();
this.labelCount = new System.Windows.Forms.Label();
this.comboBoxWorkPiece = new System.Windows.Forms.ComboBox();
this.textBoxCount = new System.Windows.Forms.TextBox();
this.buttonSave = new System.Windows.Forms.Button();
this.buttonCancel = new System.Windows.Forms.Button();
this.SuspendLayout();
//
// labelWorkPiece
//
this.labelWorkPiece.AutoSize = true;
this.labelWorkPiece.Location = new System.Drawing.Point(27, 25);
this.labelWorkPiece.Name = "labelWorkPiece";
this.labelWorkPiece.Size = new System.Drawing.Size(87, 15);
this.labelWorkPiece.TabIndex = 0;
this.labelWorkPiece.Text = "Комментарий:";
//
// labelCount
//
this.labelCount.AutoSize = true;
this.labelCount.Location = new System.Drawing.Point(27, 59);
this.labelCount.Name = "labelCount";
this.labelCount.Size = new System.Drawing.Size(75, 15);
this.labelCount.TabIndex = 1;
this.labelCount.Text = "Количество:";
//
// comboBoxWorkPiece
//
this.comboBoxWorkPiece.FormattingEnabled = true;
this.comboBoxWorkPiece.Location = new System.Drawing.Point(136, 22);
this.comboBoxWorkPiece.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.comboBoxWorkPiece.Name = "comboBoxWorkPiece";
this.comboBoxWorkPiece.Size = new System.Drawing.Size(280, 23);
this.comboBoxWorkPiece.TabIndex = 2;
//
// textBoxCount
//
this.textBoxCount.Location = new System.Drawing.Point(136, 57);
this.textBoxCount.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.textBoxCount.Name = "textBoxCount";
this.textBoxCount.Size = new System.Drawing.Size(280, 23);
this.textBoxCount.TabIndex = 3;
//
// buttonSave
//
this.buttonSave.Location = new System.Drawing.Point(215, 109);
this.buttonSave.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.buttonSave.Name = "buttonSave";
this.buttonSave.Size = new System.Drawing.Size(96, 28);
this.buttonSave.TabIndex = 4;
this.buttonSave.Text = "Сохранить";
this.buttonSave.UseVisualStyleBackColor = true;
//
// buttonCancel
//
this.buttonCancel.Location = new System.Drawing.Point(317, 109);
this.buttonCancel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.buttonCancel.Name = "buttonCancel";
this.buttonCancel.Size = new System.Drawing.Size(99, 28);
this.buttonCancel.TabIndex = 5;
this.buttonCancel.Text = "Отмена";
this.buttonCancel.UseVisualStyleBackColor = true;
//
// FormUsersKomment
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(432, 148);
this.Controls.Add(this.buttonCancel);
this.Controls.Add(this.buttonSave);
this.Controls.Add(this.textBoxCount);
this.Controls.Add(this.comboBoxWorkPiece);
this.Controls.Add(this.labelCount);
this.Controls.Add(this.labelWorkPiece);
this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.Name = "FormUsersKomment";
this.Text = "Пользователи и Комменты";
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
private Label labelWorkPiece;
private Label labelCount;
private ComboBox comboBoxWorkPiece;
private TextBox textBoxCount;
private Button buttonSave;
private Button buttonCancel;
}
}

4
FurnitureAssembly/FurnitureAssemblyView/FormFurnitureWorkPiece.cs → FurnitureAssembly/FurnitureAssemblyView/FormUsersKomment.cs
View File

@ -14,7 +14,7 @@ using System.Windows.Forms;
namespace FurnitureAssemblyView
{
public partial class FormFurnitureWorkPiece : Form
public partial class FormUsersKomment : Form
{
private readonly List<KommentViewModel>? _list;
@ -54,7 +54,7 @@ namespace FurnitureAssemblyView
}
}
public FormFurnitureWorkPiece(IKommentLogic logic)
public FormUsersKomment(IKommentLogic logic)
{
InitializeComponent();

60
FurnitureAssembly/FurnitureAssemblyView/FormUsersKomment.resx Normal file
View File

@ -0,0 +1,60 @@
<root>
<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>

114
FurnitureAssembly/FurnitureAssemblyView/FormWorkPieces.Designer.cs generated
View File

@ -1,114 +0,0 @@
namespace FurnitureAssemblyView
{
partial class FormWorkPieces
{
/// <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()
{
buttonAdd = new Button();
buttonUpdate = new Button();
buttonDelete = new Button();
buttonRefresh = new Button();
dataGridView = new DataGridView();
((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
SuspendLayout();
//
// buttonAdd
//
buttonAdd.Location = new Point(641, 36);
buttonAdd.Name = "buttonAdd";
buttonAdd.Size = new Size(116, 47);
buttonAdd.TabIndex = 0;
buttonAdd.Text = "Добавить";
buttonAdd.UseVisualStyleBackColor = true;
buttonAdd.Click += ButtonAdd_Click;
//
// buttonUpdate
//
buttonUpdate.Location = new Point(641, 102);
buttonUpdate.Name = "buttonUpdate";
buttonUpdate.Size = new Size(116, 47);
buttonUpdate.TabIndex = 1;
buttonUpdate.Text = "Изменить";
buttonUpdate.UseVisualStyleBackColor = true;
buttonUpdate.Click += ButtonUpdate_Click;
//
// buttonDelete
//
buttonDelete.Location = new Point(641, 168);
buttonDelete.Name = "buttonDelete";
buttonDelete.Size = new Size(116, 47);
buttonDelete.TabIndex = 2;
buttonDelete.Text = "Удалить";
buttonDelete.UseVisualStyleBackColor = true;
buttonDelete.Click += ButtonDelete_Click;
//
// buttonRefresh
//
buttonRefresh.Location = new Point(641, 239);
buttonRefresh.Name = "buttonRefresh";
buttonRefresh.Size = new Size(116, 47);
buttonRefresh.TabIndex = 3;
buttonRefresh.Text = "Обновить";
buttonRefresh.UseVisualStyleBackColor = true;
buttonRefresh.Click += ButtonRefresh_Click;
//
// dataGridView
//
dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
dataGridView.Location = new Point(12, 12);
dataGridView.Name = "dataGridView";
dataGridView.RowHeadersWidth = 51;
dataGridView.RowTemplate.Height = 29;
dataGridView.Size = new Size(604, 426);
dataGridView.TabIndex = 4;
//
// FormWorkPieces
//
AutoScaleDimensions = new SizeF(8F, 20F);
AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(781, 450);
Controls.Add(dataGridView);
Controls.Add(buttonRefresh);
Controls.Add(buttonDelete);
Controls.Add(buttonUpdate);
Controls.Add(buttonAdd);
Name = "FormWorkPieces";
Text = "Заготовки";
Load += FormWorkPiece_Load;
((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
ResumeLayout(false);
}
#endregion
private Button buttonAdd;
private Button buttonUpdate;
private Button buttonDelete;
private Button buttonRefresh;
private DataGridView dataGridView;
}
}

120
FurnitureAssembly/FurnitureAssemblyView/FormWorkPieces.resx
View File

@ -1,120 +0,0 @@
<?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>

12
FurnitureAssembly/FurnitureAssemblyView/Program.cs
View File

@ -45,12 +45,12 @@ namespace FurnitureAssemblyView
services.AddTransient<IUsersLogic, UsersLogic>();
services.AddTransient<FormMain>();
services.AddTransient<FormWorkPiece>();
services.AddTransient<FormWorkPieces>();
services.AddTransient<FormCreateOrder>();
services.AddTransient<FormFurniture>();
services.AddTransient<FormFurnitures>();
services.AddTransient<FormFurnitureWorkPiece>();
services.AddTransient<FormKomment>();
services.AddTransient<FormKomments>();
services.AddTransient<FormCreateAd>();
services.AddTransient<FormUser>();
services.AddTransient<FormUsers>();
services.AddTransient<FormUsersKomment>();
}
}
}