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_01_Hard #6

Closed
chubykina_polina wants to merge 13 commits from LabWork_01_Hard into LabWork_01
pull from: LabWork_01_Hard
merge into: chubykina_polina:LabWork_01
Conversation 0 Commits 13 Files Changed 22 +5 -2
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b6d44d2abd - Show all commits

3
Confectionery/ConfectioneryView/FormSupply.Designer.cs generated
View File

@ -47,6 +47,7 @@
this.buttonCancel.TabIndex = 19;
this.buttonCancel.Text = "Отмена";
this.buttonCancel.UseVisualStyleBackColor = true;
this.buttonCancel.Click += new System.EventHandler(this.ButtonCancel_Click);
//
// buttonSave
//
@ -57,6 +58,7 @@
this.buttonSave.TabIndex = 18;
this.buttonSave.Text = "Сохранить";
this.buttonSave.UseVisualStyleBackColor = true;
this.buttonSave.Click += new System.EventHandler(this.ButtonSave_Click);
//
// textBoxCount
//
@ -131,6 +133,7 @@
this.Controls.Add(this.labelShop);
this.Name = "FormSupply";
this.Text = "Пополнение магазина";
this.Load += new System.EventHandler(this.FormSupply_Load);
this.ResumeLayout(false);
this.PerformLayout();

4
Confectionery/ConfectioneryView/FormSupply.cs
View File

@ -30,7 +30,7 @@ namespace ConfectioneryView
private void FormSupply_Load(object sender, EventArgs e)
{
_logger.LogInformation("Ice creams loading");
_logger.LogInformation("Pastries loading");
try
{
var list = _logicPastry.ReadList(null);
@ -44,7 +44,7 @@ namespace ConfectioneryView
}
catch (Exception ex)
{
_logger.LogError(ex, "Ice creams loading error");
_logger.LogError(ex, "Pastries loading error");
MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
_logger.LogInformation("Shops loading");