diff --git a/AbstractShopBusinessLogic/BusinessLogics/ReportLogic.cs b/AbstractShopBusinessLogic/BusinessLogics/ReportLogic.cs
index 9da3125..8b40a25 100644
--- a/AbstractShopBusinessLogic/BusinessLogics/ReportLogic.cs
+++ b/AbstractShopBusinessLogic/BusinessLogics/ReportLogic.cs
@@ -62,7 +62,7 @@ namespace DinerBusinessLogic.BusinessLogics
}
public void SaveSnacksToWordFile(ReportBindingModel model)
{
- _saveToWord.CreatePizzaDoc(new WordSnackInfo
+ _saveToWord.CreateSnackDoc(new WordSnackInfo
{
FileName = model.FileName,
Title = "Список закуска",
@@ -122,7 +122,7 @@ namespace DinerBusinessLogic.BusinessLogics
public void SaveShopsToExcelFile(ReportBindingModel model)
{
- _saveToExcel.CreateShopPizzasReport(new ExcelShop
+ _saveToExcel.CreateShopSnacksReport(new ExcelShop
{
FileName = model.FileName,
Title = "Наполненость магазинов",
diff --git a/AbstractShopBusinessLogic/OfficePackage/AbstractSaveToExcel.cs b/AbstractShopBusinessLogic/OfficePackage/AbstractSaveToExcel.cs
index 3b96242..b9dc916 100644
--- a/AbstractShopBusinessLogic/OfficePackage/AbstractSaveToExcel.cs
+++ b/AbstractShopBusinessLogic/OfficePackage/AbstractSaveToExcel.cs
@@ -82,7 +82,7 @@ namespace DinerBusinessLogic.OfficePackage
SaveExcel(info);
}
- public void CreateShopPizzasReport(ExcelShop info)
+ public void CreateShopSnacksReport(ExcelShop info)
{
CreateExcel(info);
diff --git a/AbstractShopBusinessLogic/OfficePackage/AbstractSaveToWord.cs b/AbstractShopBusinessLogic/OfficePackage/AbstractSaveToWord.cs
index 11eb6b1..471bcea 100644
--- a/AbstractShopBusinessLogic/OfficePackage/AbstractSaveToWord.cs
+++ b/AbstractShopBusinessLogic/OfficePackage/AbstractSaveToWord.cs
@@ -11,7 +11,7 @@ namespace DinerBusinessLogic.OfficePackage
{
public abstract class AbstractSaveToWord
{
- public void CreatePizzaDoc(WordSnackInfo info)
+ public void CreateSnackDoc(WordSnackInfo info)
{
CreateWord(info);
diff --git a/Diner/Diner/FormReportSnackComponents.Designer.cs b/Diner/Diner/FormReportSnackComponents.Designer.cs
index 7515fbd..5339439 100644
--- a/Diner/Diner/FormReportSnackComponents.Designer.cs
+++ b/Diner/Diner/FormReportSnackComponents.Designer.cs
@@ -20,100 +20,93 @@
base.Dispose(disposing);
}
- #region Windows Form Designer generated code
+ #region Windows Form Designer generated code
- ///
- /// Required method for Designer support - do not modify
- /// the contents of this method with the code editor.
- ///
- private void InitializeComponent()
- {
- this.dataGridView = new System.Windows.Forms.DataGridView();
- this.ColumnPizza = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.ColumnComponent = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.ColumnCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.buttonSaveToExcel = new System.Windows.Forms.Button();
- ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
- this.SuspendLayout();
- //
- // dataGridView
- //
- this.dataGridView.AllowUserToAddRows = false;
- this.dataGridView.AllowUserToDeleteRows = false;
- this.dataGridView.AllowUserToOrderColumns = true;
- this.dataGridView.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
- this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- this.dataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
- this.ColumnPizza,
- this.ColumnComponent,
- this.ColumnCount});
- this.dataGridView.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.dataGridView.Location = new System.Drawing.Point(0, 36);
- this.dataGridView.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
- this.dataGridView.Name = "dataGridView";
- this.dataGridView.ReadOnly = true;
- this.dataGridView.RowHeadersWidth = 51;
- this.dataGridView.RowTemplate.Height = 29;
- this.dataGridView.Size = new System.Drawing.Size(494, 302);
- this.dataGridView.TabIndex = 0;
- //
- // ColumnPizza
- //
- this.ColumnPizza.FillWeight = 130F;
- this.ColumnPizza.HeaderText = "Пицца";
- this.ColumnPizza.MinimumWidth = 6;
- this.ColumnPizza.Name = "ColumnPizza";
- this.ColumnPizza.ReadOnly = true;
- //
- // ColumnComponent
- //
- this.ColumnComponent.FillWeight = 140F;
- this.ColumnComponent.HeaderText = "Ингридиент";
- this.ColumnComponent.MinimumWidth = 6;
- this.ColumnComponent.Name = "ColumnComponent";
- this.ColumnComponent.ReadOnly = true;
- //
- // ColumnCount
- //
- this.ColumnCount.FillWeight = 90F;
- this.ColumnCount.HeaderText = "Количество";
- this.ColumnCount.MinimumWidth = 6;
- this.ColumnCount.Name = "ColumnCount";
- this.ColumnCount.ReadOnly = true;
- //
- // buttonSaveToExcel
- //
- this.buttonSaveToExcel.Location = new System.Drawing.Point(12, 10);
- this.buttonSaveToExcel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
- this.buttonSaveToExcel.Name = "buttonSaveToExcel";
- this.buttonSaveToExcel.Size = new System.Drawing.Size(470, 22);
- this.buttonSaveToExcel.TabIndex = 1;
- this.buttonSaveToExcel.Text = "Сохранить в Excel";
- this.buttonSaveToExcel.UseVisualStyleBackColor = true;
- this.buttonSaveToExcel.Click += new System.EventHandler(this.ButtonSaveToExcel_Click);
- //
- // FromReportPizzaComponents
- //
- this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(494, 338);
- this.Controls.Add(this.buttonSaveToExcel);
- this.Controls.Add(this.dataGridView);
- this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
- this.Name = "FromReportPizzaComponents";
- this.Text = "Пицца с ингридиентами";
- this.Load += new System.EventHandler(this.FormReportSnackComponents_Load);
- ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
- this.ResumeLayout(false);
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ dataGridView = new DataGridView();
+ buttonSaveToExcel = new Button();
+ ColumnSnack = new DataGridViewTextBoxColumn();
+ ColumnComponent = new DataGridViewTextBoxColumn();
+ ColumnCount = new DataGridViewTextBoxColumn();
+ ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
+ SuspendLayout();
+ //
+ // dataGridView
+ //
+ dataGridView.AllowUserToAddRows = false;
+ dataGridView.AllowUserToDeleteRows = false;
+ dataGridView.AllowUserToOrderColumns = true;
+ dataGridView.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill;
+ dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ dataGridView.Columns.AddRange(new DataGridViewColumn[] { ColumnSnack, ColumnComponent, ColumnCount });
+ dataGridView.Dock = DockStyle.Bottom;
+ dataGridView.Location = new Point(0, 48);
+ dataGridView.Name = "dataGridView";
+ dataGridView.ReadOnly = true;
+ dataGridView.RowHeadersWidth = 51;
+ dataGridView.RowTemplate.Height = 29;
+ dataGridView.Size = new Size(565, 403);
+ dataGridView.TabIndex = 0;
+ //
+ // buttonSaveToExcel
+ //
+ buttonSaveToExcel.Location = new Point(14, 13);
+ buttonSaveToExcel.Name = "buttonSaveToExcel";
+ buttonSaveToExcel.Size = new Size(537, 29);
+ buttonSaveToExcel.TabIndex = 1;
+ buttonSaveToExcel.Text = "Сохранить в Excel";
+ buttonSaveToExcel.UseVisualStyleBackColor = true;
+ buttonSaveToExcel.Click += ButtonSaveToExcel_Click;
+ //
+ // ColumnSnack
+ //
+ ColumnSnack.FillWeight = 130F;
+ ColumnSnack.HeaderText = "Закуска";
+ ColumnSnack.MinimumWidth = 6;
+ ColumnSnack.Name = "ColumnSnack";
+ ColumnSnack.ReadOnly = true;
+ //
+ // ColumnComponent
+ //
+ ColumnComponent.FillWeight = 140F;
+ ColumnComponent.HeaderText = "Ингридиент";
+ ColumnComponent.MinimumWidth = 6;
+ ColumnComponent.Name = "ColumnComponent";
+ ColumnComponent.ReadOnly = true;
+ //
+ // ColumnCount
+ //
+ ColumnCount.FillWeight = 90F;
+ ColumnCount.HeaderText = "Количество";
+ ColumnCount.MinimumWidth = 6;
+ ColumnCount.Name = "ColumnCount";
+ ColumnCount.ReadOnly = true;
+ //
+ // FormReportSnackComponents
+ //
+ AutoScaleDimensions = new SizeF(8F, 20F);
+ AutoScaleMode = AutoScaleMode.Font;
+ ClientSize = new Size(565, 451);
+ Controls.Add(buttonSaveToExcel);
+ Controls.Add(dataGridView);
+ Name = "FormReportSnackComponents";
+ Text = "Закуска с ингридиентами";
+ Load += FormReportSnackComponents_Load;
+ ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
+ ResumeLayout(false);
+ }
- }
+ #endregion
- #endregion
-
- private DataGridView dataGridView;
+ private DataGridView dataGridView;
private Button buttonSaveToExcel;
- private DataGridViewTextBoxColumn ColumnPizza;
- private DataGridViewTextBoxColumn ColumnComponent;
- private DataGridViewTextBoxColumn ColumnCount;
- }
+ private DataGridViewTextBoxColumn ColumnSnack;
+ private DataGridViewTextBoxColumn ColumnComponent;
+ private DataGridViewTextBoxColumn ColumnCount;
+ }
}
\ No newline at end of file
diff --git a/Diner/Diner/FormReportSnackComponents.resx b/Diner/Diner/FormReportSnackComponents.resx
index 881bb69..94253e3 100644
--- a/Diner/Diner/FormReportSnackComponents.resx
+++ b/Diner/Diner/FormReportSnackComponents.resx
@@ -1,4 +1,64 @@
-
+
+
+
@@ -57,7 +117,7 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
+
True