ура конфликты

This commit is contained in:
VictoriaPresnyakova 2023-05-22 00:38:19 +04:00
parent cd4d024d4f
commit 59ad8879f3

View File

@ -43,38 +43,38 @@ namespace JewelryStore
}
private void LoadData()
{
try
{
dataGridView.FillandConfigGrid(_orderLogic.ReadList(null));
_logger.LogInformation("Загрузка заказов");
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка загрузки заказов");
MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
MessageBoxIcon.Error);
}
}
try
{
dataGridView.FillandConfigGrid(_orderLogic.ReadList(null));
_logger.LogInformation("Загрузка заказов");
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка загрузки заказов");
MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
MessageBoxIcon.Error);
}
}
private void компонентыToolStripMenuItem_Click(object sender, EventArgs e)
{
var form = DependencyManager.Instance.Resolve<FormComponents>();
var form = DependencyManager.Instance.Resolve<FormComponents>();
form.ShowDialog();
}
private void драгоценностиToolStripMenuItem_Click(object sender, EventArgs e)
{
var form = DependencyManager.Instance.Resolve<FormJewels>();
form.ShowDialog();
}
var form = DependencyManager.Instance.Resolve<FormJewels>();
form.ShowDialog();
}
private void buttonCreate_Click(object sender, EventArgs e)
{
var form = DependencyManager.Instance.Resolve<FormCreateOrder>();
form.ShowDialog();
LoadData();
}
var form = DependencyManager.Instance.Resolve<FormCreateOrder>();
form.ShowDialog();
LoadData();
}
private void buttonToWork_Click(object sender, EventArgs e)
{
@ -86,7 +86,7 @@ namespace JewelryStore
{
var operationResult = _orderLogic.TakeOrderInWork(new OrderBindingModel
{
Id = id
Id = id,
});
if (!operationResult)
{
@ -114,7 +114,7 @@ namespace JewelryStore
{
var operationResult = _orderLogic.FinishOrder(new OrderBindingModel
{
Id = id
Id = id,
});
if (!operationResult)
{
@ -142,7 +142,7 @@ namespace JewelryStore
var operationResult = _orderLogic.DeliveryOrder(new
OrderBindingModel
{
Id = id
Id = id,
});
if (!operationResult)
{
@ -181,40 +181,41 @@ namespace JewelryStore
private void компонентыПоИзделиямToolStripMenuItem_Click(object sender,
EventArgs e)
{
var form = DependencyManager.Instance.Resolve<FormReportJewelComponents>();
form.ShowDialog();
}
var form = DependencyManager.Instance.Resolve<FormReportJewelComponents>();
form.ShowDialog();
}
private void списокЗаказзовToolStripMenuItem_Click(object sender, EventArgs e)
{
var form = DependencyManager.Instance.Resolve<FormReportOrders>();
form.ShowDialog();
}
var form = DependencyManager.Instance.Resolve<FormReportOrders>();
form.ShowDialog();
}
private void клиентыToolStripMenuItem_Click(object sender, EventArgs e)
{
var form = DependencyManager.Instance.Resolve<FormClients>();
form.ShowDialog();
}
var form = DependencyManager.Instance.Resolve<FormClients>();
form.ShowDialog();
}
private void запускРаботToolStripMenuItem_Click(object sender, EventArgs e)
{
{
_workProcess.DoWork(DependencyManager.Instance.Resolve<IImplementerLogic>(), _orderLogic);
MessageBox.Show("Процесс обработки запущен", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
}
_workProcess.DoWork(DependencyManager.Instance.Resolve<IImplementerLogic>(), _orderLogic);
MessageBox.Show("Процесс обработки запущен", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
}
}
private void исполнителиToolStripMenuItem_Click(object sender, EventArgs e)
{
var form = DependencyManager.Instance.Resolve<FormImplementers>();
form.ShowDialog();
}
var form = DependencyManager.Instance.Resolve<FormImplementers>();
form.ShowDialog();
}
private void элПисьмаToolStripMenuItem_Click(object sender, EventArgs e)
{
var form = DependencyManager.Instance.Resolve<FormMails>();
form.ShowDialog();
}
var form = DependencyManager.Instance.Resolve<FormMails>();
form.ShowDialog();
}
private void создатьБекапToolStripMenuItem_Click(object sender, EventArgs e)
{