Фиксы
This commit is contained in:
parent
0c05166def
commit
6306b20430
16
SushiBar/SushiBar/FormMain.Designer.cs
generated
16
SushiBar/SushiBar/FormMain.Designer.cs
generated
@ -64,20 +64,20 @@
|
|||||||
// ингредиентыToolStripMenuItem
|
// ингредиентыToolStripMenuItem
|
||||||
//
|
//
|
||||||
this.ингредиентыToolStripMenuItem.Name = "ингредиентыToolStripMenuItem";
|
this.ингредиентыToolStripMenuItem.Name = "ингредиентыToolStripMenuItem";
|
||||||
this.ингредиентыToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
|
this.ингредиентыToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
|
||||||
this.ингредиентыToolStripMenuItem.Text = "Ингредиенты";
|
this.ингредиентыToolStripMenuItem.Text = "Ингредиенты";
|
||||||
this.ингредиентыToolStripMenuItem.Click += new System.EventHandler(this.IngredientsToolStripMenuItem_Click);
|
this.ингредиентыToolStripMenuItem.Click += new System.EventHandler(this.IngredientsToolStripMenuItem_Click);
|
||||||
//
|
//
|
||||||
// сушиToolStripMenuItem
|
// сушиToolStripMenuItem
|
||||||
//
|
//
|
||||||
this.сушиToolStripMenuItem.Name = "сушиToolStripMenuItem";
|
this.сушиToolStripMenuItem.Name = "сушиToolStripMenuItem";
|
||||||
this.сушиToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
|
this.сушиToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
|
||||||
this.сушиToolStripMenuItem.Text = "Суши";
|
this.сушиToolStripMenuItem.Text = "Суши";
|
||||||
this.сушиToolStripMenuItem.Click += new System.EventHandler(this.SushiToolStripMenuItem_Click);
|
this.сушиToolStripMenuItem.Click += new System.EventHandler(this.SushiToolStripMenuItem_Click);
|
||||||
//
|
//
|
||||||
// buttonUpdate
|
// buttonUpdate
|
||||||
//
|
//
|
||||||
this.buttonUpdate.Location = new System.Drawing.Point(793, 315);
|
this.buttonUpdate.Location = new System.Drawing.Point(780, 314);
|
||||||
this.buttonUpdate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
this.buttonUpdate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
||||||
this.buttonUpdate.Name = "buttonUpdate";
|
this.buttonUpdate.Name = "buttonUpdate";
|
||||||
this.buttonUpdate.Size = new System.Drawing.Size(170, 58);
|
this.buttonUpdate.Size = new System.Drawing.Size(170, 58);
|
||||||
@ -88,7 +88,7 @@
|
|||||||
//
|
//
|
||||||
// buttonSetToFinish
|
// buttonSetToFinish
|
||||||
//
|
//
|
||||||
this.buttonSetToFinish.Location = new System.Drawing.Point(793, 253);
|
this.buttonSetToFinish.Location = new System.Drawing.Point(780, 252);
|
||||||
this.buttonSetToFinish.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
this.buttonSetToFinish.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
||||||
this.buttonSetToFinish.Name = "buttonSetToFinish";
|
this.buttonSetToFinish.Name = "buttonSetToFinish";
|
||||||
this.buttonSetToFinish.Size = new System.Drawing.Size(170, 58);
|
this.buttonSetToFinish.Size = new System.Drawing.Size(170, 58);
|
||||||
@ -99,7 +99,7 @@
|
|||||||
//
|
//
|
||||||
// buttonSetToDone
|
// buttonSetToDone
|
||||||
//
|
//
|
||||||
this.buttonSetToDone.Location = new System.Drawing.Point(793, 191);
|
this.buttonSetToDone.Location = new System.Drawing.Point(780, 190);
|
||||||
this.buttonSetToDone.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
this.buttonSetToDone.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
||||||
this.buttonSetToDone.Name = "buttonSetToDone";
|
this.buttonSetToDone.Name = "buttonSetToDone";
|
||||||
this.buttonSetToDone.Size = new System.Drawing.Size(170, 58);
|
this.buttonSetToDone.Size = new System.Drawing.Size(170, 58);
|
||||||
@ -110,7 +110,7 @@
|
|||||||
//
|
//
|
||||||
// buttonSetToWork
|
// buttonSetToWork
|
||||||
//
|
//
|
||||||
this.buttonSetToWork.Location = new System.Drawing.Point(793, 129);
|
this.buttonSetToWork.Location = new System.Drawing.Point(780, 128);
|
||||||
this.buttonSetToWork.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
this.buttonSetToWork.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
||||||
this.buttonSetToWork.Name = "buttonSetToWork";
|
this.buttonSetToWork.Name = "buttonSetToWork";
|
||||||
this.buttonSetToWork.Size = new System.Drawing.Size(170, 58);
|
this.buttonSetToWork.Size = new System.Drawing.Size(170, 58);
|
||||||
@ -121,7 +121,7 @@
|
|||||||
//
|
//
|
||||||
// buttonCreateOrder
|
// buttonCreateOrder
|
||||||
//
|
//
|
||||||
this.buttonCreateOrder.Location = new System.Drawing.Point(793, 67);
|
this.buttonCreateOrder.Location = new System.Drawing.Point(780, 66);
|
||||||
this.buttonCreateOrder.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
this.buttonCreateOrder.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
||||||
this.buttonCreateOrder.Name = "buttonCreateOrder";
|
this.buttonCreateOrder.Name = "buttonCreateOrder";
|
||||||
this.buttonCreateOrder.Size = new System.Drawing.Size(170, 58);
|
this.buttonCreateOrder.Size = new System.Drawing.Size(170, 58);
|
||||||
@ -139,7 +139,7 @@
|
|||||||
this.dataGridView.Name = "dataGridView";
|
this.dataGridView.Name = "dataGridView";
|
||||||
this.dataGridView.RowHeadersWidth = 51;
|
this.dataGridView.RowHeadersWidth = 51;
|
||||||
this.dataGridView.RowTemplate.Height = 29;
|
this.dataGridView.RowTemplate.Height = 29;
|
||||||
this.dataGridView.Size = new System.Drawing.Size(787, 426);
|
this.dataGridView.Size = new System.Drawing.Size(755, 426);
|
||||||
this.dataGridView.TabIndex = 7;
|
this.dataGridView.TabIndex = 7;
|
||||||
//
|
//
|
||||||
// FormMain
|
// FormMain
|
||||||
|
@ -5,7 +5,6 @@ namespace SushiBarDataModels.Models
|
|||||||
public interface IOrderModel : IId
|
public interface IOrderModel : IId
|
||||||
{
|
{
|
||||||
int SushiId { get; }
|
int SushiId { get; }
|
||||||
string SushiName { get; }
|
|
||||||
int Count { get; }
|
int Count { get; }
|
||||||
double Sum { get; }
|
double Sum { get; }
|
||||||
OrderStatus Status { get; }
|
OrderStatus Status { get; }
|
||||||
|
@ -22,8 +22,7 @@ namespace SushiBarListImplement.Implements
|
|||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
public List<IngredientViewModel> GetFilteredList(IngredientSearchModel
|
public List<IngredientViewModel> GetFilteredList(IngredientSearchModel model)
|
||||||
model)
|
|
||||||
{
|
{
|
||||||
var result = new List<IngredientViewModel>();
|
var result = new List<IngredientViewModel>();
|
||||||
if (string.IsNullOrEmpty(model.IngredientName))
|
if (string.IsNullOrEmpty(model.IngredientName))
|
||||||
|
Loading…
Reference in New Issue
Block a user