b0n3l3sS/PIbd-23_Mochalov_D.V._LawFirm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: b0n3l3sS:461ada29fbe2a0b89d5edb1604ec1878ea986baf
Branches Tags
b0n3l3sS:main
b0n3l3sS:LabWork04_Hard
b0n3l3sS:LabWork03_Hard
b0n3l3sS:LabWork08_Hard
b0n3l3sS:LabWork08_Base
b0n3l3sS:LabWork07_Hard
b0n3l3sS:LabWork07_Base
b0n3l3sS:LabWork06_Hard
b0n3l3sS:LabWork06_Base
b0n3l3sS:LabWork05_Hard
b0n3l3sS:LabWork05_Base
b0n3l3sS:LabWork04_Base
b0n3l3sS:LabWork03_Base
b0n3l3sS:LabWork02_Hard
b0n3l3sS:LabWork01_Hard
b0n3l3sS:LabWork02_Base
b0n3l3sS:LabWork01_Base
..
compare: b0n3l3sS:ef3d3d411476f78f0aeef662d52777f209d4369b
Branches Tags
b0n3l3sS:LabWork04_Hard
b0n3l3sS:LabWork03_Hard
b0n3l3sS:LabWork08_Hard
b0n3l3sS:LabWork08_Base
b0n3l3sS:LabWork07_Hard
b0n3l3sS:LabWork07_Base
b0n3l3sS:LabWork06_Hard
b0n3l3sS:LabWork06_Base
b0n3l3sS:LabWork05_Hard
b0n3l3sS:LabWork05_Base
b0n3l3sS:LabWork04_Base
b0n3l3sS:LabWork03_Base
b0n3l3sS:LabWork02_Hard
b0n3l3sS:LabWork01_Hard
b0n3l3sS:LabWork02_Base
b0n3l3sS:LabWork01_Base
b0n3l3sS:main

No commits in common. "461ada29fbe2a0b89d5edb1604ec1878ea986baf" and "ef3d3d411476f78f0aeef662d52777f209d4369b" have entirely different histories.
461ada29fb ... ef3d3d4114

2 changed files with 23 additions and 28 deletions
Show Stats Expand all files Collapse all files

26
LawFirm/LawFirm/FormMain.cs
View File

@ -105,8 +105,14 @@ namespace LawFirmView
try
{
var operationResult = _orderLogic.TakeOrderInWork(new OrderBindingModel
{
Id = id
{ //id,name,count,sum,status,start,end
Id = id,
DocumentId = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["DocumentId"].Value),
DocumentName = dataGridView.SelectedRows[0].Cells["DocumentName"].Value.ToString(),
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()),
});
if (!operationResult)
{
@ -133,7 +139,13 @@ namespace LawFirmView
{
var operationResult = _orderLogic.DeliveryOrder(new OrderBindingModel
{
Id = id
Id = id,
DocumentId = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["DocumentId"].Value),
DocumentName = dataGridView.SelectedRows[0].Cells["DocumentName"].Value.ToString(),
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()),
});
if (!operationResult)
{
@ -159,7 +171,13 @@ namespace LawFirmView
{
var operationResult = _orderLogic.FinishOrder(new OrderBindingModel
{
Id = id
Id = id,
DocumentId = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["DocumentId"].Value),
DocumentName = dataGridView.SelectedRows[0].Cells["DocumentName"].Value.ToString(),
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()),
});
if (!operationResult)
{

25
LawFirm/LawFirmBusinessLogic/BusinessLogics/OrderLogic.cs
View File

@ -42,31 +42,8 @@ namespace LawFirmBusinessLogic.BusinessLogics
return true;
}
public bool StatusUpdate(OrderBindingModel rawModel, OrderStatus newStatus)
public bool StatusUpdate(OrderBindingModel model, OrderStatus newStatus)
{
var viewModel = _orderStorage.GetElement(new OrderSearchModel
{
Id = rawModel.Id
});
if (viewModel == null)
{
_logger.LogWarning("Order model not found");
return false;
}
OrderBindingModel model = new OrderBindingModel
{
Id = viewModel.Id,
DocumentId = viewModel.DocumentId,
DocumentName = viewModel.DocumentName,
Status = viewModel.Status,
DateCreate = viewModel.DateCreate,
DateImplement = viewModel.DateImplement,
Count = viewModel.Count,
Sum = viewModel.Sum
};
CheckModel(model);
if (model.Status + 1 != newStatus)
{