Fixes
This commit is contained in:
commit
fca9722997
2
Pizzeria/Pizzeria/FormCreateSupply.Designer.cs
generated
2
Pizzeria/Pizzeria/FormCreateSupply.Designer.cs
generated
@ -62,7 +62,7 @@
|
||||
this.labelPizza.Name = "labelPizza";
|
||||
this.labelPizza.Size = new System.Drawing.Size(75, 20);
|
||||
this.labelPizza.TabIndex = 2;
|
||||
this.labelPizza.Text = "Изделие: ";
|
||||
this.labelPizza.Text = "Пицца: ";
|
||||
//
|
||||
// comboBoxPizza
|
||||
//
|
||||
|
@ -60,7 +60,7 @@ namespace PizzeriaView
|
||||
}
|
||||
if (comboBoxPizza.SelectedValue == null)
|
||||
{
|
||||
MessageBox.Show("Выберите изделие", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
||||
MessageBox.Show("Выберите пиццу", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
||||
return;
|
||||
}
|
||||
_logger.LogInformation("Создание поставки");
|
||||
|
4
Pizzeria/Pizzeria/FormReportShop.Designer.cs
generated
4
Pizzeria/Pizzeria/FormReportShop.Designer.cs
generated
@ -90,14 +90,14 @@
|
||||
this.ColumnCount.Name = "ColumnCount";
|
||||
this.ColumnCount.ReadOnly = true;
|
||||
//
|
||||
// FormReportShopPizzas
|
||||
// FormReportShop
|
||||
//
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||
this.ClientSize = new System.Drawing.Size(598, 450);
|
||||
this.Controls.Add(this.buttonSaveToExcel);
|
||||
this.Controls.Add(this.dataGridView);
|
||||
this.Name = "FormReportShopPizzas";
|
||||
this.Name = "FormReportShop";
|
||||
this.Text = "Наполненость магазинов";
|
||||
this.Load += new System.EventHandler(this.FormReportShop_Load);
|
||||
((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
|
||||
|
@ -60,7 +60,7 @@
|
||||
<metadata name="ColumnShop.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="ColumnReinforced.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<metadata name="ColumnPizza.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="ColumnCount.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
|
@ -61,7 +61,7 @@ namespace PizzeriaView
|
||||
|
||||
private void LoadData()
|
||||
{
|
||||
_logger.LogInformation("Загрузка изделий в магазине");
|
||||
_logger.LogInformation("Загрузка пиццы в магазине");
|
||||
try
|
||||
{
|
||||
if (_ShopPizzas != null)
|
||||
@ -75,7 +75,7 @@ namespace PizzeriaView
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.LogError(ex, "Ошибка загрузки изделий магазина");
|
||||
_logger.LogError(ex, "Ошибка загрузки пиццы магазина");
|
||||
MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
||||
}
|
||||
}
|
||||
|
@ -122,7 +122,7 @@ namespace PizzeriaBusinessLogic.BusinessLogics
|
||||
|
||||
public void SaveShopsToExcelFile(ReportBindingModel model)
|
||||
{
|
||||
_saveToExcel.CreateShopReinforcedesReport(new ExcelShop
|
||||
_saveToExcel.CreateShopPizzasReport(new ExcelShop
|
||||
{
|
||||
FileName = model.FileName,
|
||||
Title = "Наполненость магазинов",
|
||||
|
@ -90,7 +90,7 @@ namespace PizzeriaBusinessLogic.BusinessLogics
|
||||
}
|
||||
if (model.Count <= 0)
|
||||
{
|
||||
throw new ArgumentException("Количество изделий должно быть больше 0");
|
||||
throw new ArgumentException("Количество пиццы должно быть больше 0");
|
||||
}
|
||||
var shop = _shopStorage.GetElement(new ShopSearchModel
|
||||
{
|
||||
|
@ -82,7 +82,7 @@ namespace PizzeriaBusinessLogic.OfficePackage
|
||||
SaveExcel(info);
|
||||
}
|
||||
|
||||
public void CreateShopReinforcedesReport(ExcelShop info)
|
||||
public void CreateShopPizzasReport(ExcelShop info)
|
||||
{
|
||||
CreateExcel(info);
|
||||
|
||||
|
@ -10,6 +10,6 @@ namespace PizzeriaContracts.ViewModels
|
||||
{
|
||||
public string ShopName { get; set; } = string.Empty;
|
||||
public int TotalCount { get; set; }
|
||||
public List<(string Reinforced, int count)> Pizzas { get; set; } = new();
|
||||
public List<(string Pizza, int count)> Pizzas { get; set; } = new();
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user