Compare commits

..

No commits in common. "0b14399022a47edbe721cbc956d386bc1ccc2fd0" and "8ecffb665ca4df20a1766b36826b341fedeed029" have entirely different histories.

3 changed files with 23 additions and 28 deletions

View File

@ -89,7 +89,13 @@ namespace LawFirmView
{
var operationResult = _orderLogic.TakeOrderInWork(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)
{
@ -116,7 +122,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)
{
@ -142,7 +154,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)
{

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)
{

View File

@ -63,7 +63,7 @@ namespace LawFirmFileImplement.Models
Count = Convert.ToInt32(element.Element("Count")!.Value),
Status = (OrderStatus)Enum.Parse(typeof(OrderStatus), element.Element("Status")!.Value),
DateCreate = Convert.ToDateTime(element.Element("DateCreate")!.Value),
DateImplement = string.IsNullOrEmpty(element.Element("DateImplement")!.Value) ? null : Convert.ToDateTime(element.Element("DateImplement")!.Value)
DateImplement = Convert.ToDateTime(element.Element("DateCreate")!.Value)
};
}