chubykina_polina/PIbd-22_Chubykina_P.P._Confectionery
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PIbd-22 Chubykina P.P. LabWork_02 #3

Closed
chubykina_polina wants to merge 2 commits from LabWork_02.1 into LabWork_01
pull from: LabWork_02.1
merge into: chubykina_polina:LabWork_01
Conversation 0 Commits 2 Files Changed 14 +8 -8
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0f60538d5f - Show all commits

8
Confectionery/ConfectioneryFileImplement/Implements/PastryStorage.cs
View File

@ -66,14 +66,14 @@ namespace ConfectioneryFileImplement.Implements
public PastryViewModel? Update(PastryBindingModel model)
{
var iceCream = source.Pastries.FirstOrDefault(x => x.Id == model.Id);
if (iceCream == null)
var pastry = source.Pastries.FirstOrDefault(x => x.Id == model.Id);
if (pastry == null)
{
return null;
}
iceCream.Update(model);
pastry.Update(model);
source.SavePastries();
return iceCream.GetViewModel;
return pastry.GetViewModel;
}
public PastryViewModel? Delete(PastryBindingModel model)

4
Confectionery/ConfectioneryView/FormCreateOrder.cs
View File

@ -29,7 +29,7 @@ namespace ConfectioneryView
private void FormCreateOrder_Load(object sender, EventArgs e)
{
_logger.LogInformation("Loading ice cream for order");
_logger.LogInformation("Loading pastry for order");
try
{
var pastryList = _logicP.ReadList(null);
@ -43,7 +43,7 @@ namespace ConfectioneryView
}
catch (Exception ex)
{
_logger.LogError(ex, "Error during loading ice cream for order");
_logger.LogError(ex, "Error during loading pastry for order");
MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}

4
Confectionery/ConfectioneryView/FormPastries.cs
View File

@ -86,7 +86,7 @@ namespace ConfectioneryView
if (MessageBox.Show("Удалить запись?", "Вопрос", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
{
int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
_logger.LogInformation("Deletion of ice cream");
_logger.LogInformation("Deletion of pastry");
try
{
if (!_logic.Delete(new PastryBindingModel { Id = id }))
@ -97,7 +97,7 @@ namespace ConfectioneryView
}
catch (Exception ex)
{
_logger.LogError(ex, "Ice cream deletion error");
_logger.LogError(ex, "Pastry deletion error");
MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}