malimova/ISEbd-22_Alimova_M.S._Confectionery
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ISEbd-22 Alimova M.S. Lab Work 05 base #6

Closed
malimova wants to merge 26 commits from Lab5_base into Lab4_base
pull from: Lab5_base
merge into: malimova:Lab4_base
Conversation 0 Commits 26 Files Changed 125 +13 -8
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 12b86ef436 - Show all commits

1
Confectionery/ConfectioneryFileImplement/Order.cs
View File

@ -9,6 +9,7 @@ namespace ConfectioneryFileImplement.Models
public class Order : IOrderModel
{
public int Id { get; private set; }
public int ClientId { get; private set; }
public int PastryId { get; private set; }
public int Count { get; private set; }
public double Sum { get; private set; }

1
Confectionery/ConfectioneryListImplement/Order.cs
View File

@ -14,6 +14,7 @@ namespace ConfectioneryListImplement.Models
{
public int Id { get; private set; }
public int PastryId { get; private set; }
public int ClientId { get; private set; }
public int Count { get; private set; }
public double Sum { get; private set; }
public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен;

16
Confectionery/ConfectioneryView/FormMain.Designer.cs generated
View File

@ -53,7 +53,7 @@
dataGridView.Location = new Point(12, 60);
dataGridView.Name = "dataGridView";
dataGridView.RowHeadersWidth = 62;
dataGridView.Size = new Size(1068, 549);
dataGridView.Size = new Size(1374, 549);
dataGridView.TabIndex = 0;
//
// menuStrip
@ -62,7 +62,7 @@
menuStrip.Items.AddRange(new ToolStripItem[] { toolStripMenuItem, отчетыToolStripMenuItem });
menuStrip.Location = new Point(0, 0);
menuStrip.Name = "menuStrip";
menuStrip.Size = new Size(1375, 33);
menuStrip.Size = new Size(1666, 33);
menuStrip.TabIndex = 1;
menuStrip.Text = "menuStrip1";
//
@ -118,7 +118,7 @@
// buttonCreateOrder
//
buttonCreateOrder.Anchor = AnchorStyles.Top | AnchorStyles.Right;
buttonCreateOrder.Location = new Point(1111, 83);
buttonCreateOrder.Location = new Point(1402, 83);
buttonCreateOrder.Name = "buttonCreateOrder";
buttonCreateOrder.Size = new Size(232, 34);
buttonCreateOrder.TabIndex = 2;
@ -129,7 +129,7 @@
// buttonTakeOrderInWork
//
buttonTakeOrderInWork.Anchor = AnchorStyles.Top | AnchorStyles.Right;
buttonTakeOrderInWork.Location = new Point(1111, 143);
buttonTakeOrderInWork.Location = new Point(1402, 143);
buttonTakeOrderInWork.Name = "buttonTakeOrderInWork";
buttonTakeOrderInWork.Size = new Size(232, 34);
buttonTakeOrderInWork.TabIndex = 3;
@ -140,7 +140,7 @@
// buttonOrderReady
//
buttonOrderReady.Anchor = AnchorStyles.Top | AnchorStyles.Right;
buttonOrderReady.Location = new Point(1111, 203);
buttonOrderReady.Location = new Point(1402, 203);
buttonOrderReady.Name = "buttonOrderReady";
buttonOrderReady.Size = new Size(232, 34);
buttonOrderReady.TabIndex = 4;
@ -151,7 +151,7 @@
// buttonIssuedOrder
//
buttonIssuedOrder.Anchor = AnchorStyles.Top | AnchorStyles.Right;
buttonIssuedOrder.Location = new Point(1111, 266);
buttonIssuedOrder.Location = new Point(1402, 266);
buttonIssuedOrder.Name = "buttonIssuedOrder";
buttonIssuedOrder.Size = new Size(232, 34);
buttonIssuedOrder.TabIndex = 5;
@ -162,7 +162,7 @@
// buttonRef
//
buttonRef.Anchor = AnchorStyles.Top | AnchorStyles.Right;
buttonRef.Location = new Point(1111, 329);
buttonRef.Location = new Point(1402, 329);
buttonRef.Name = "buttonRef";
buttonRef.Size = new Size(232, 34);
buttonRef.TabIndex = 6;
@ -174,7 +174,7 @@
//
AutoScaleDimensions = new SizeF(10F, 25F);
AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(1375, 621);
ClientSize = new Size(1666, 621);
Controls.Add(buttonRef);
Controls.Add(buttonIssuedOrder);
Controls.Add(buttonOrderReady);

3
Confectionery/ConfectioneryView/FormMain.resx
View File

@ -120,4 +120,7 @@
<metadata name="menuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>25</value>
</metadata>
</root>