Fix

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 = "Наполненость магазинов",

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);
 

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);
 

Diner/Diner/FormReportSnackComponents.Designer.cs

@@ -28,91 +28,84 @@
 		/// </summary>
 		private void InitializeComponent()
 		{
-            this.dataGridView = new System.Windows.Forms.DataGridView();
+			dataGridView = new DataGridView();
-            this.ColumnPizza = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			buttonSaveToExcel = new Button();
-            this.ColumnComponent = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			ColumnSnack = new DataGridViewTextBoxColumn();
-            this.ColumnCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			ColumnComponent = new DataGridViewTextBoxColumn();
-            this.buttonSaveToExcel = new System.Windows.Forms.Button();
+			ColumnCount = new DataGridViewTextBoxColumn();
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
-            this.SuspendLayout();
+			SuspendLayout();
 			// 
 			// dataGridView
 			// 
-            this.dataGridView.AllowUserToAddRows = false;
+			dataGridView.AllowUserToAddRows = false;
-            this.dataGridView.AllowUserToDeleteRows = false;
+			dataGridView.AllowUserToDeleteRows = false;
-            this.dataGridView.AllowUserToOrderColumns = true;
+			dataGridView.AllowUserToOrderColumns = true;
-            this.dataGridView.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
+			dataGridView.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill;
-            this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+			dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.dataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+			dataGridView.Columns.AddRange(new DataGridViewColumn[] { ColumnSnack, ColumnComponent, ColumnCount });
-            this.ColumnPizza,
+			dataGridView.Dock = DockStyle.Bottom;
-            this.ColumnComponent,
+			dataGridView.Location = new Point(0, 48);
-            this.ColumnCount});
+			dataGridView.Name = "dataGridView";
-            this.dataGridView.Dock = System.Windows.Forms.DockStyle.Bottom;
+			dataGridView.ReadOnly = true;
-            this.dataGridView.Location = new System.Drawing.Point(0, 36);
+			dataGridView.RowHeadersWidth = 51;
-            this.dataGridView.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+			dataGridView.RowTemplate.Height = 29;
-            this.dataGridView.Name = "dataGridView";
+			dataGridView.Size = new Size(565, 403);
-            this.dataGridView.ReadOnly = true;
+			dataGridView.TabIndex = 0;
-            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);
+			buttonSaveToExcel.Location = new Point(14, 13);
-            this.buttonSaveToExcel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+			buttonSaveToExcel.Name = "buttonSaveToExcel";
-            this.buttonSaveToExcel.Name = "buttonSaveToExcel";
+			buttonSaveToExcel.Size = new Size(537, 29);
-            this.buttonSaveToExcel.Size = new System.Drawing.Size(470, 22);
+			buttonSaveToExcel.TabIndex = 1;
-            this.buttonSaveToExcel.TabIndex = 1;
+			buttonSaveToExcel.Text = "Сохранить в Excel";
-            this.buttonSaveToExcel.Text = "Сохранить в Excel";
+			buttonSaveToExcel.UseVisualStyleBackColor = true;
-            this.buttonSaveToExcel.UseVisualStyleBackColor = true;
+			buttonSaveToExcel.Click += ButtonSaveToExcel_Click;
-            this.buttonSaveToExcel.Click += new System.EventHandler(this.ButtonSaveToExcel_Click);
 			// 
-            // FromReportPizzaComponents
+			// ColumnSnack
 			// 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+			ColumnSnack.FillWeight = 130F;
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			ColumnSnack.HeaderText = "Закуска";
-            this.ClientSize = new System.Drawing.Size(494, 338);
+			ColumnSnack.MinimumWidth = 6;
-            this.Controls.Add(this.buttonSaveToExcel);
+			ColumnSnack.Name = "ColumnSnack";
-            this.Controls.Add(this.dataGridView);
+			ColumnSnack.ReadOnly = true;
-            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+			// 
-            this.Name = "FromReportPizzaComponents";
+			// ColumnComponent
-            this.Text = "Пицца с ингридиентами";
+			// 
-            this.Load += new System.EventHandler(this.FormReportSnackComponents_Load);
+			ColumnComponent.FillWeight = 140F;
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
+			ColumnComponent.HeaderText = "Ингридиент";
-            this.ResumeLayout(false);
+			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
 
 		private DataGridView dataGridView;
         private Button buttonSaveToExcel;
-        private DataGridViewTextBoxColumn ColumnPizza;
+		private DataGridViewTextBoxColumn ColumnSnack;
 		private DataGridViewTextBoxColumn ColumnComponent;
 		private DataGridViewTextBoxColumn ColumnCount;
 	}

Diner/Diner/FormReportSnackComponents.resx

@@ -1,4 +1,64 @@
-<root>
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!--
+    Microsoft ResX Schema 
+
+    Version 2.0
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
+    associated with the data types.
+
+    Example:
+
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+
+    There are any number of "resheader" rows that contain simple
+    name/value pairs.
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
+    mimetype set.
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
+    extensible. For a given mimetype the value must be set accordingly:
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
+    read any of the formats listed below.
+
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
@@ -57,7 +117,7 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="ColumnPizza.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="ColumnSnack.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
   <metadata name="ColumnComponent.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">