зафиксировать

This commit is contained in:
Kristina 2024-02-16 11:12:56 +04:00
parent 3a497e7a0b
commit 0c8c16fafa
17 changed files with 217 additions and 93 deletions

View File

@ -44,6 +44,7 @@
ButtonCancel.TabIndex = 0;
ButtonCancel.Text = "Отмена";
ButtonCancel.UseVisualStyleBackColor = true;
ButtonCancel.Click += ButtonCancel_Click;
//
// ButtonSave
//
@ -53,6 +54,7 @@
ButtonSave.TabIndex = 1;
ButtonSave.Text = "Сохранить";
ButtonSave.UseVisualStyleBackColor = true;
ButtonSave.Click += ButtonSave_Click;
//
// textBoxName
//

View File

@ -56,6 +56,7 @@
buttonAdd.TabIndex = 1;
buttonAdd.Text = "Добавить";
buttonAdd.UseVisualStyleBackColor = true;
buttonAdd.Click += buttonAdd_Click;
//
// buttonUpd
//
@ -65,6 +66,7 @@
buttonUpd.TabIndex = 2;
buttonUpd.Text = "Изменить";
buttonUpd.UseVisualStyleBackColor = true;
buttonUpd.Click += buttonUpd_Click;
//
// buttonDel
//
@ -74,6 +76,7 @@
buttonDel.TabIndex = 3;
buttonDel.Text = "Удалить";
buttonDel.UseVisualStyleBackColor = true;
buttonDel.Click += buttonDel_Click;
//
// buttonRef
//
@ -83,6 +86,7 @@
buttonRef.TabIndex = 4;
buttonRef.Text = "Обновить";
buttonRef.UseVisualStyleBackColor = true;
buttonRef.Click += buttonRef_Click;
//
// FormComponents
//
@ -96,6 +100,8 @@
Controls.Add(dataGridView);
Name = "FormComponents";
Text = "Компоненты";
Load += FormComponents_Load;
Click += FormComponents_Load;
((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
ResumeLayout(false);
}

View File

@ -114,5 +114,10 @@ namespace BlacksmithWorkshopView
{
LoadData();
}
private void FormComponents_Load_1(object sender, EventArgs e)
{
}
}
}

View File

@ -126,6 +126,8 @@
Controls.Add(comboBoxManufacture);
Name = "FormCreateOrder";
Text = "Заказ";
Load += FormCreateOrder_Load;
Click += FormCreateOrder_Load;
ResumeLayout(false);
PerformLayout();
}

View File

@ -34,19 +34,25 @@
ButtonOrderReady = new Button();
ButtonIssuedOrder = new Button();
ButtonRef = new Button();
menuStrip = new MenuStrip();
toolStripMenuItem = new ToolStripMenuItem();
КомпонентыToolStripMenuItem = new ToolStripMenuItem();
ИзделияToolStripMenuItem = new ToolStripMenuItem();
((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
menuStrip.SuspendLayout();
SuspendLayout();
//
// dataGridView
//
dataGridView.BackgroundColor = SystemColors.ButtonHighlight;
dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
dataGridView.Location = new Point(1, 0);
dataGridView.Location = new Point(1, 37);
dataGridView.Name = "dataGridView";
dataGridView.RowHeadersWidth = 62;
dataGridView.RowTemplate.Height = 33;
dataGridView.Size = new Size(1003, 485);
dataGridView.Size = new Size(1003, 448);
dataGridView.TabIndex = 0;
dataGridView.CellContentClick += dataGridView_CellContentClick;
//
// ButtonCreateOrder
//
@ -98,6 +104,38 @@
ButtonRef.UseVisualStyleBackColor = true;
ButtonRef.Click += ButtonRef_Click;
//
// menuStrip
//
menuStrip.ImageScalingSize = new Size(24, 24);
menuStrip.Items.AddRange(new ToolStripItem[] { toolStripMenuItem });
menuStrip.Location = new Point(0, 0);
menuStrip.Name = "menuStrip";
menuStrip.Size = new Size(1272, 33);
menuStrip.TabIndex = 6;
menuStrip.Text = "Справочник";
menuStrip.ItemClicked += menuStrip_ItemClicked;
//
// toolStripMenuItem
//
toolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { КомпонентыToolStripMenuItem, ИзделияToolStripMenuItem });
toolStripMenuItem.Name = "toolStripMenuItem";
toolStripMenuItem.Size = new Size(129, 29);
toolStripMenuItem.Text = "Справочник";
//
// КомпонентыToolStripMenuItem
//
КомпонентыToolStripMenuItem.Name = "КомпонентыToolStripMenuItem";
КомпонентыToolStripMenuItem.Size = new Size(218, 34);
КомпонентыToolStripMenuItem.Text = "Компоненты";
КомпонентыToolStripMenuItem.Click += КомпонентыToolStripMenuItem_Click;
//
// ИзделияToolStripMenuItem
//
ИзделияToolStripMenuItem.Name = "ИзделияToolStripMenuItem";
ИзделияToolStripMenuItem.Size = new Size(218, 34);
ИзделияToolStripMenuItem.Text = "Изделия";
ИзделияToolStripMenuItem.Click += ИзделияToolStripMenuItem_Click;
//
// FormMain
//
AutoScaleDimensions = new SizeF(10F, 25F);
@ -109,10 +147,16 @@
Controls.Add(ButtonTakeOrderInWork);
Controls.Add(ButtonCreateOrder);
Controls.Add(dataGridView);
Controls.Add(menuStrip);
MainMenuStrip = menuStrip;
Name = "FormMain";
Text = "Справочники";
Text = "Кузнечная мастерская";
Load += FormMain_Load_1;
((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
menuStrip.ResumeLayout(false);
menuStrip.PerformLayout();
ResumeLayout(false);
PerformLayout();
}
#endregion
@ -123,5 +167,9 @@
private Button ButtonOrderReady;
private Button ButtonIssuedOrder;
private Button ButtonRef;
private MenuStrip menuStrip;
private ToolStripMenuItem toolStripMenuItem;
private ToolStripMenuItem КомпонентыToolStripMenuItem;
private ToolStripMenuItem ИзделияToolStripMenuItem;
}
}

View File

@ -1,7 +1,9 @@
using BlacksmithWorkshop;
using BlacksmithWorkshopContracts.BindingModels;
using BlacksmithWorkshopContracts.BusinessLogicsContracts;
using BlacksmithWorkshopDataModels.Enums;
using Microsoft.Extensions.Logging;
using NLog;
using System;
using System.Collections.Generic;
using System.ComponentModel;
@ -16,7 +18,7 @@ namespace BlacksmithWorkshopView
{
public partial class FormMain : Form
{
private readonly ILogger _logger;
private readonly Microsoft.Extensions.Logging.ILogger _logger;
private readonly IOrderLogic _orderLogic;
public FormMain(ILogger<FormMain> logger, IOrderLogic orderLogic)
{
@ -48,6 +50,7 @@ namespace BlacksmithWorkshopView
MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
private void КомпонентыToolStripMenuItem_Click(object sender, EventArgs e)
{
var service = Program.ServiceProvider?.GetService(typeof(FormComponents));
@ -149,5 +152,48 @@ namespace BlacksmithWorkshopView
{
LoadData();
}
//private OrderBindingModel CreateBindingModel(int id, bool isDone = false)
//{
// return new OrderBindingModel
// {
// Id = id,
// ManufactureId = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["ManufactureId"].Value),
// Status = Enum.Parse<OrderStatus>(dataGridView.SelectedRows[0].Cells["Status"].Value.ToString()),
// Count = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Count"].Value),
// Sum = double.Parse(dataGridView.SelectedRows[0].Cells["Sum"].Value.ToString()),
// DateCreate = DateTime.Parse(dataGridView.SelectedRows[0].Cells["DateCreate"].Value.ToString()),
// };
//}
private void toolStripLabel1_Click(object sender, EventArgs e)
{
}
private void toolStrip1_ItemClicked(object sender, ToolStripItemClickedEventArgs e)
{
}
private void toolStripContainer1_ContentPanel_Load(object sender, EventArgs e)
{
}
private void FormMain_Load_1(object sender, EventArgs e)
{
}
private void menuStrip_ItemClicked(object sender, ToolStripItemClickedEventArgs e)
{
}
private void dataGridView_CellContentClick(object sender, DataGridViewCellEventArgs e)
{
}
}
}

View File

@ -117,4 +117,7 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="menuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
</root>

View File

@ -32,8 +32,6 @@
labelCost = new Label();
groupBoxManufacture = new GroupBox();
dataGridView = new DataGridView();
компоненты = new DataGridViewTextBoxColumn();
колво = new DataGridViewTextBoxColumn();
ButtonRef = new Button();
ButtonDel = new Button();
ButtonUpd = new Button();
@ -42,8 +40,9 @@
ButtonSave = new Button();
textBoxName = new TextBox();
textBoxPrice = new TextBox();
Компонент = new DataGridViewTextBoxColumn();
Количество = new DataGridViewTextBoxColumn();
number_column = new DataGridViewTextBoxColumn();
component_column = new DataGridViewTextBoxColumn();
count_column = new DataGridViewTextBoxColumn();
groupBoxManufacture.SuspendLayout();
((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
SuspendLayout();
@ -84,7 +83,7 @@
//
dataGridView.BackgroundColor = SystemColors.ButtonHighlight;
dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
dataGridView.Columns.AddRange(new DataGridViewColumn[] { компоненты, колво });
dataGridView.Columns.AddRange(new DataGridViewColumn[] { number_column, component_column, count_column });
dataGridView.Enabled = false;
dataGridView.Location = new Point(0, 41);
dataGridView.Name = "dataGridView";
@ -92,21 +91,7 @@
dataGridView.RowTemplate.Height = 33;
dataGridView.Size = new Size(666, 319);
dataGridView.TabIndex = 5;
dataGridView.CellContentClick += dataGridView1_CellContentClick;
//
// компоненты
//
компоненты.HeaderText = "компоненты";
компоненты.MinimumWidth = 8;
компоненты.Name = "компоненты";
компоненты.Width = 400;
//
// колво
//
колво.HeaderText = "колво";
колво.MinimumWidth = 8;
колво.Name = "колво";
колво.Width = 150;
dataGridView.CellContentClick += dataGridView_CellContentClick;
//
// ButtonRef
//
@ -182,17 +167,27 @@
textBoxPrice.Size = new Size(194, 31);
textBoxPrice.TabIndex = 8;
//
// Компонент
// number_column
//
Компонент.MinimumWidth = 8;
Компонент.Name = "Компонент";
Компонент.Width = 150;
number_column.HeaderText = "номер";
number_column.MinimumWidth = 8;
number_column.Name = "number_column";
number_column.Visible = false;
number_column.Width = 150;
//
// Количество
// component_column
//
Количество.MinimumWidth = 8;
Количество.Name = "Количество";
Количество.Width = 150;
component_column.HeaderText = "компоненты";
component_column.MinimumWidth = 8;
component_column.Name = "component_column";
component_column.Width = 450;
//
// count_column
//
count_column.HeaderText = "колво";
count_column.MinimumWidth = 8;
count_column.Name = "count_column";
count_column.Width = 150;
//
// FormManufacture
//
@ -228,11 +223,9 @@
private Button ButtonSave;
private TextBox textBoxName;
private TextBox textBoxPrice;
private DataGridViewTextBoxColumn Id;
private DataGridViewTextBoxColumn Компонент;
private DataGridViewTextBoxColumn Количество;
private DataGridView dataGridView;
private DataGridViewTextBoxColumn компоненты;
private DataGridViewTextBoxColumn колво;
private DataGridViewTextBoxColumn number_column;
private DataGridViewTextBoxColumn component_column;
private DataGridViewTextBoxColumn count_column;
}
}

View File

@ -29,10 +29,11 @@ namespace BlacksmithWorkshopView
InitializeComponent();
_logger = logger;
_logic = logic;
// Id
_manufactureComponents = new Dictionary<int, (IComponentModel, int)>();
}
private void dataGridView1_CellContentClick(object sender, DataGridViewCellEventArgs e)
private void dataGridView_CellContentClick(object sender, DataGridViewCellEventArgs e)
{
}

View File

@ -117,10 +117,13 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="компоненты.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="number_column.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="колво.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="component_column.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="count_column.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Компонент.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

View File

@ -43,6 +43,7 @@
comboBoxComponent.Name = "comboBoxComponent";
comboBoxComponent.Size = new Size(485, 33);
comboBoxComponent.TabIndex = 0;
comboBoxComponent.SelectedIndexChanged += comboBoxComponent_SelectedIndexChanged;
//
// textBoxCount
//
@ -77,6 +78,7 @@
buttonCancel.TabIndex = 4;
buttonCancel.Text = "Отмена";
buttonCancel.UseVisualStyleBackColor = true;
buttonCancel.Click += buttonCancel_Click;
//
// buttonSave
//
@ -86,6 +88,7 @@
buttonSave.TabIndex = 5;
buttonSave.Text = "Сохранить";
buttonSave.UseVisualStyleBackColor = true;
buttonSave.Click += buttonSave_Click;
//
// FormManufactureComponent
//

View File

@ -37,10 +37,10 @@ namespace BlacksmithWorkshopView
}
}
public int Count { get { return Convert.ToInt32(textBoxCount.Text); } set { textBoxCount.Text = value.ToString(); } }
public FormManufactureComponent()
public FormManufactureComponent(IComponentLogic logic)
{
InitializeComponent();
_list = logic.ReadList(null);//!!!!!!
_list = logic.ReadList(null);
if (_list != null)
{
comboBoxComponent.DisplayMember = "ComponentName";
@ -69,5 +69,10 @@ namespace BlacksmithWorkshopView
DialogResult = DialogResult.Cancel;
Close();
}
private void comboBoxComponent_SelectedIndexChanged(object sender, EventArgs e)
{
}
}
}

View File

@ -29,8 +29,8 @@
private void InitializeComponent()
{
dataGridView = new DataGridView();
AddButton = new Button();
UpdateButton = new Button();
ButtonAdd = new Button();
ButtonUpd = new Button();
DeleteButton = new Button();
RefreshButton = new Button();
((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
@ -38,37 +38,39 @@
//
// dataGridView
//
dataGridView.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill;
dataGridView.BackgroundColor = SystemColors.ButtonHighlight;
dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
dataGridView.Location = new Point(0, 0);
dataGridView.Name = "dataGridView";
dataGridView.RowHeadersWidth = 62;
dataGridView.RowTemplate.Height = 33;
dataGridView.Size = new Size(431, 449);
dataGridView.Size = new Size(716, 618);
dataGridView.TabIndex = 0;
//
// AddButton
// ButtonAdd
//
AddButton.Location = new Point(481, 12);
AddButton.Name = "AddButton";
AddButton.Size = new Size(112, 34);
AddButton.TabIndex = 1;
AddButton.Text = "Добавить";
AddButton.UseVisualStyleBackColor = true;
AddButton.Click += AddButton_Click;
ButtonAdd.Location = new Point(770, 34);
ButtonAdd.Name = "ButtonAdd";
ButtonAdd.Size = new Size(112, 34);
ButtonAdd.TabIndex = 1;
ButtonAdd.Text = "Добавить";
ButtonAdd.UseVisualStyleBackColor = true;
ButtonAdd.Click += ButtonAdd_Click;
//
// UpdateButton
// ButtonUpd
//
UpdateButton.Location = new Point(481, 73);
UpdateButton.Name = "UpdateButton";
UpdateButton.Size = new Size(112, 34);
UpdateButton.TabIndex = 2;
UpdateButton.Text = "Изменить";
UpdateButton.UseVisualStyleBackColor = true;
UpdateButton.Click += UpdateButton_Click;
ButtonUpd.Location = new Point(770, 100);
ButtonUpd.Name = "ButtonUpd";
ButtonUpd.Size = new Size(112, 34);
ButtonUpd.TabIndex = 2;
ButtonUpd.Text = "Изменить";
ButtonUpd.UseVisualStyleBackColor = true;
ButtonUpd.Click += ButtonUpd_Click;
//
// DeleteButton
//
DeleteButton.Location = new Point(481, 133);
DeleteButton.Location = new Point(770, 166);
DeleteButton.Name = "DeleteButton";
DeleteButton.Size = new Size(112, 34);
DeleteButton.TabIndex = 3;
@ -78,7 +80,7 @@
//
// RefreshButton
//
RefreshButton.Location = new Point(481, 198);
RefreshButton.Location = new Point(770, 228);
RefreshButton.Name = "RefreshButton";
RefreshButton.Size = new Size(112, 34);
RefreshButton.TabIndex = 4;
@ -90,14 +92,14 @@
//
AutoScaleDimensions = new SizeF(10F, 25F);
AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(800, 450);
ClientSize = new Size(946, 621);
Controls.Add(RefreshButton);
Controls.Add(DeleteButton);
Controls.Add(UpdateButton);
Controls.Add(AddButton);
Controls.Add(ButtonUpd);
Controls.Add(ButtonAdd);
Controls.Add(dataGridView);
Name = "FormManufactures";
Text = "FormManufactures";
Text = "Компоненты";
Load += FormManufactures_Load;
((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
ResumeLayout(false);
@ -106,8 +108,8 @@
#endregion
private DataGridView dataGridView;
private Button AddButton;
private Button UpdateButton;
private Button ButtonAdd;
private Button ButtonUpd;
private Button DeleteButton;
private Button RefreshButton;
}

View File

@ -1,4 +1,10 @@
using System;
using BlacksmithWorkshop;
using BlacksmithWorkshopContracts.BindingModels;
using BlacksmithWorkshopContracts.BusinessLogicsContracts;
using Microsoft.Extensions.Logging;
using Microsoft.VisualBasic.Logging;
using NLog.Extensions.Logging;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
@ -7,13 +13,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using BlacksmithWorkshop;
using BlacksmithWorkshopContracts.BindingModels;
using BlacksmithWorkshopContracts.BusinessLogicsContracts;
using BlacksmithWorkshopContracts.ViewModels;
using BlacksmithWorkshopDataModels.Models;
using Microsoft.Extensions.Logging;
using Microsoft.VisualBasic.Logging;
namespace BlacksmithWorkshopView
{
@ -21,6 +21,7 @@ namespace BlacksmithWorkshopView
{
private readonly ILogger _logger;
private readonly IManufactureLogic _logic;
public FormManufactures(ILogger<FormManufactures> logger, IManufactureLogic logic)
{
InitializeComponent();
@ -32,6 +33,18 @@ namespace BlacksmithWorkshopView
{
LoadData();
}
private void ButtonAdd_Click(object sender, EventArgs e)
{
var service = Program.ServiceProvider?.GetService(typeof(FormManufacture));
if (service is FormManufacture form)
{
if (form.ShowDialog() == DialogResult.OK)
{
LoadData();
}
}
}
private void LoadData()
{
try
@ -43,6 +56,7 @@ namespace BlacksmithWorkshopView
dataGridView.Columns["Id"].Visible = false;
dataGridView.Columns["ManufactureName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
dataGridView.Columns["ManufactureComponents"].Visible = false;
//dataGridView.Columns[3].Visible = false;
}
_logger.LogInformation("Загрузка кузнечных изделий");
}
@ -53,19 +67,7 @@ namespace BlacksmithWorkshopView
}
}
private void AddButton_Click(object sender, EventArgs e)
{
var service = Program.ServiceProvider?.GetService(typeof(FormManufacture));
if (service is FormManufacture form)
{
if (form.ShowDialog() == DialogResult.OK)
{
LoadData();
}
}
}
private void UpdateButton_Click(object sender, EventArgs e)
private void ButtonUpd_Click(object sender, EventArgs e)
{
if (dataGridView.SelectedRows.Count == 1)
{
@ -112,4 +114,6 @@ namespace BlacksmithWorkshopView
LoadData();
}
}
}

View File

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>

View File

@ -1,11 +1,12 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
//using System.ComponentModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using BlacksmithWorkshopListImplement.Models;
namespace BlacksmithWorkshopListImplement
{
public class DataListSingleton

View File

@ -3,7 +3,7 @@ using BlacksmithWorkshopContracts.SearchModels;
using BlacksmithWorkshopContracts.StorageContracts;
using BlacksmithWorkshopContracts.ViewModels;
using BlacksmithWorkshopListImplement.Models;
using System.ComponentModel;
//using System.ComponentModel;
namespace BlacksmithWorkshopListImplement.Implements
{