august/PIbd-21_Balberova_D.N._SushiBar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: august:777cc9f4add77598bebeffcd582c9121cb4b5f86
Branches Tags
august:main
august:LabWork08Hard
august:LabWork08
august:LabWork07Hard
august:LabWork07
august:LabWork06Hard
august:LabWork05Hard
august:LabWork06
august:LabWork05
august:LabWork04Hard
august:LabWork03Hard
august:LabWork02Hard
august:LabWork04
august:LabWork03
august:LabWork02
august:LabWork01Hard
august:LabWork01
..
compare: august:8841a107259fd8457dfb287d50847d82e77aa2bd
Branches Tags
august:LabWork08Hard
august:LabWork08
august:LabWork07Hard
august:LabWork07
august:LabWork06Hard
august:LabWork05Hard
august:LabWork06
august:LabWork05
august:LabWork04Hard
august:LabWork03Hard
august:LabWork02Hard
august:LabWork04
august:LabWork03
august:LabWork02
august:LabWork01Hard
august:LabWork01
august:main

2 Commits
777cc9f4ad ... 8841a10725

Author SHA1 Message Date
dasha
8841a10725 Merge branch 'LabWork01' into LabWork02 2023-02-14 12:32:37 +04:00
dasha
12ca78bbe5 Исправления 2023-02-14 12:31:20 +04:00
2 changed files with 4 additions and 19 deletions
Show Stats Expand all files Collapse all files

21
SushiBar/SushiBar/FormMain.cs
View File

@ -73,12 +73,7 @@ namespace SushiBarView
{
var operationResult = _orderLogic.TakeOrderInWork(new OrderBindingModel
{
Id = id,
SushiId = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["SushiId"].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()),
Id = id
});
if (!operationResult)
{
@ -103,12 +98,7 @@ namespace SushiBarView
{
var operationResult = _orderLogic.FinishOrder(new OrderBindingModel
{
Id = id,
SushiId = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["SushiId"].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()),
Id = id
});
if (!operationResult)
{
@ -133,12 +123,7 @@ namespace SushiBarView
{
var operationResult = _orderLogic.DeliveryOrder(new OrderBindingModel
{
Id = id,
SushiId = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["SushiId"].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()),
Id = id
});
if (!operationResult)
{

2
SushiBar/SushiBarBusinessLogic/BusinessLogics/OrderLogic.cs
View File

@ -91,7 +91,7 @@ namespace SushiBarBusinessLogic.BusinessLogics
{
model.DateImplement = viewModel.DateImplement;
}
CheckModel(model);
CheckModel(model, false);
if (_orderStorage.Update(model) == null)
{
model.Status--;