tellsense/ISEbd-22_Baygulov_A.A._SushiBar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ISEbd-22. Baygulov A.A. Lab work 06 #9

Closed
tellsense wants to merge 11 commits from lab6 into lab5
pull from: lab6
merge into: tellsense:lab5
Conversation 0 Commits 11 Files Changed 43 +27 -27
3 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit aaa9486e2e - Show all commits

14
SushiBar/SushiBarContracts/ViewModels/OrderViewModel.cs
View File

@ -13,17 +13,17 @@ namespace SushiBarContracts.ViewModels
{
[DisplayName("Номер")]
public int Id { get; set; }
public int SushiId { get; set; }
public int ClientId { get; set; }
[DisplayName("ФИО клиента")]
public string ClientFIO { get; set; } = string.Empty;
public int? ImplementerId { get; set; }
[DisplayName("Клиент")]
public string ClientFIO { get; set; } = string.Empty;
[DisplayName("Изделие")]
public string SushiName { get; set; } = string.Empty;
[DisplayName("Исполнитель")]
public string? ImplementerFIO { get; set; } = null;
public int SushiId { get; set; }
[DisplayName("Изделие")]
public string SushiName { get; set; } = string.Empty;
[DisplayName("Количество")]
public int Count { get; set; }
[DisplayName("Количество")]
public int Count { get; set; }
[DisplayName("Сумма")]
public double Sum { get; set; }
[DisplayName("Статус")]

37
SushiBar/SushiBarView/FormMain.Designer.cs generated
View File

@ -39,28 +39,29 @@
componentsToolStripMenuItem = new ToolStripMenuItem();
sushiToolStripMenuItem = new ToolStripMenuItem();
clientToolStripMenuItem = new ToolStripMenuItem();
employersToolStripMenuItem = new ToolStripMenuItem();
ReportsToolStripMenuItem = new ToolStripMenuItem();
ComponentsListToolStripMenuItem = new ToolStripMenuItem();
ComponentSushisToolStripMenuItem = new ToolStripMenuItem();
OrdersToolStripMenuItem = new ToolStripMenuItem();
startWorkToolStripMenuItem = new ToolStripMenuItem();
employersToolStripMenuItem = new ToolStripMenuItem();
((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
menuStrip.SuspendLayout();
SuspendLayout();
//
// dataGridView
//
dataGridView.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill;
dataGridView.BackgroundColor = SystemColors.Window;
dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
dataGridView.Location = new Point(1, 29);
dataGridView.Name = "dataGridView";
dataGridView.Size = new Size(1080, 307);
dataGridView.Size = new Size(1206, 307);
dataGridView.TabIndex = 0;
//
// ButtonCreateOrder
//
ButtonCreateOrder.Location = new Point(1087, 41);
ButtonCreateOrder.Location = new Point(1213, 41);
ButtonCreateOrder.Name = "ButtonCreateOrder";
ButtonCreateOrder.Size = new Size(147, 33);
ButtonCreateOrder.TabIndex = 1;
@ -70,7 +71,7 @@
//
// ButtonTakeOrderInWork
//
ButtonTakeOrderInWork.Location = new Point(1087, 80);
ButtonTakeOrderInWork.Location = new Point(1213, 80);
ButtonTakeOrderInWork.Name = "ButtonTakeOrderInWork";
ButtonTakeOrderInWork.Size = new Size(147, 33);
ButtonTakeOrderInWork.TabIndex = 2;
@ -80,7 +81,7 @@
//
// ButtonOrderReady
//
ButtonOrderReady.Location = new Point(1087, 119);
ButtonOrderReady.Location = new Point(1213, 119);
ButtonOrderReady.Name = "ButtonOrderReady";
ButtonOrderReady.Size = new Size(147, 33);
ButtonOrderReady.TabIndex = 3;
@ -90,7 +91,7 @@
//
// ButtonIssuedOrder
//
ButtonIssuedOrder.Location = new Point(1087, 158);
ButtonIssuedOrder.Location = new Point(1213, 158);
ButtonIssuedOrder.Name = "ButtonIssuedOrder";
ButtonIssuedOrder.Size = new Size(147, 33);
ButtonIssuedOrder.TabIndex = 4;
@ -100,7 +101,7 @@
//
// ButtonRef
//
ButtonRef.Location = new Point(1087, 197);
ButtonRef.Location = new Point(1213, 197);
ButtonRef.Name = "ButtonRef";
ButtonRef.Size = new Size(147, 33);
ButtonRef.TabIndex = 5;
@ -113,7 +114,7 @@
menuStrip.Items.AddRange(new ToolStripItem[] { toolStripMenuItem, ReportsToolStripMenuItem, startWorkToolStripMenuItem });
menuStrip.Location = new Point(0, 0);
menuStrip.Name = "menuStrip";
menuStrip.Size = new Size(1265, 24);
menuStrip.Size = new Size(1381, 24);
menuStrip.TabIndex = 6;
menuStrip.Text = "menuStrip1";
//
@ -127,24 +128,30 @@
// componentsToolStripMenuItem
//
componentsToolStripMenuItem.Name = "componentsToolStripMenuItem";
componentsToolStripMenuItem.Size = new Size(180, 22);
componentsToolStripMenuItem.Size = new Size(149, 22);
componentsToolStripMenuItem.Text = "Компоненты";
componentsToolStripMenuItem.Click += componentsToolStripMenuItem_Click;
//
// sushiToolStripMenuItem
//
sushiToolStripMenuItem.Name = "sushiToolStripMenuItem";
sushiToolStripMenuItem.Size = new Size(180, 22);
sushiToolStripMenuItem.Size = new Size(149, 22);
sushiToolStripMenuItem.Text = "Суши";
sushiToolStripMenuItem.Click += sushiToolStripMenuItem_Click;
//
// clientToolStripMenuItem
//
clientToolStripMenuItem.Name = "clientToolStripMenuItem";
clientToolStripMenuItem.Size = new Size(180, 22);
clientToolStripMenuItem.Size = new Size(149, 22);
clientToolStripMenuItem.Text = "Клиент";
clientToolStripMenuItem.Click += clientToolStripMenuItem_Click;
//
// employersToolStripMenuItem
//
employersToolStripMenuItem.Name = "employersToolStripMenuItem";
employersToolStripMenuItem.Size = new Size(149, 22);
employersToolStripMenuItem.Text = "Исполнители";
//
// ReportsToolStripMenuItem
//
ReportsToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { ComponentsListToolStripMenuItem, ComponentSushisToolStripMenuItem, OrdersToolStripMenuItem });
@ -179,17 +186,11 @@
startWorkToolStripMenuItem.Size = new Size(92, 20);
startWorkToolStripMenuItem.Text = "Запуск работ";
//
// employersToolStripMenuItem
//
employersToolStripMenuItem.Name = "employersToolStripMenuItem";
employersToolStripMenuItem.Size = new Size(180, 22);
employersToolStripMenuItem.Text = "Исполнители";
//
// FormMain
//
AutoScaleDimensions = new SizeF(7F, 15F);
AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(1265, 337);
ClientSize = new Size(1381, 337);
Controls.Add(ButtonRef);
Controls.Add(ButtonIssuedOrder);
Controls.Add(ButtonOrderReady);

3
SushiBar/SushiBarView/FormMain.cs
View File

@ -43,8 +43,7 @@ namespace SushiBarView
dataGridView.DataSource = list;
dataGridView.Columns["SushiId"].Visible = false;
dataGridView.Columns["ClientId"].Visible = false;
dataGridView.Columns["SushiName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
dataGridView.Columns["ImplementerId"].Visible = false;
}
_logger.LogInformation("Загрузка заказов");
}