diff --git a/ComputersShop/ComputersShop/FormReportShopsComputers.Designer.cs b/ComputersShop/ComputersShop/FormReportShopsComputers.Designer.cs
index ab4455a..066fc3f 100644
--- a/ComputersShop/ComputersShop/FormReportShopsComputers.Designer.cs
+++ b/ComputersShop/ComputersShop/FormReportShopsComputers.Designer.cs
@@ -30,7 +30,7 @@
{
dataGridView = new DataGridView();
ShopColumn = new DataGridViewTextBoxColumn();
- IceCreamColumn = new DataGridViewTextBoxColumn();
+ ComputerColumn = new DataGridViewTextBoxColumn();
CountColumn = new DataGridViewTextBoxColumn();
SaveButton = new Button();
((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
@@ -39,7 +39,7 @@
// dataGridView
//
dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- dataGridView.Columns.AddRange(new DataGridViewColumn[] { ShopColumn, IceCreamColumn, CountColumn });
+ dataGridView.Columns.AddRange(new DataGridViewColumn[] { ShopColumn, ComputerColumn, CountColumn });
dataGridView.Location = new Point(12, 64);
dataGridView.Name = "dataGridView";
dataGridView.RowHeadersWidth = 51;
@@ -54,12 +54,12 @@
ShopColumn.Name = "ShopColumn";
ShopColumn.Width = 250;
//
- // IceCreamColumn
+ // ComputerColumn
//
- IceCreamColumn.HeaderText = "Компьютер";
- IceCreamColumn.MinimumWidth = 6;
- IceCreamColumn.Name = "ComputerColumn";
- IceCreamColumn.Width = 250;
+ ComputerColumn.HeaderText = "Компьютер";
+ ComputerColumn.MinimumWidth = 6;
+ ComputerColumn.Name = "ComputerColumn";
+ ComputerColumn.Width = 250;
//
// CountColumn
//
@@ -97,7 +97,7 @@
private DataGridView dataGridView;
private Button SaveButton;
private DataGridViewTextBoxColumn ShopColumn;
- private DataGridViewTextBoxColumn IceCreamColumn;
+ private DataGridViewTextBoxColumn ComputerColumn;
private DataGridViewTextBoxColumn CountColumn;
}
}
\ No newline at end of file
diff --git a/ComputersShop/ComputersShop/ReportOrdersByDate.rdlc b/ComputersShop/ComputersShop/ReportOrdersByDate.rdlc
index f7156f4..1dc447e 100644
--- a/ComputersShop/ComputersShop/ReportOrdersByDate.rdlc
+++ b/ComputersShop/ComputersShop/ReportOrdersByDate.rdlc
@@ -361,7 +361,7 @@
0
-
+
System.Data.DataSet
/* Local Connection */
@@ -371,7 +371,7 @@
- IceCreamShopContractsViewModels
+ ComputersShopContractsViewModels
/* Local Query */
@@ -389,9 +389,9 @@
- IceCreamShopContracts.ViewModels
+ ComputersShopContracts.ViewModels
ReportDateOrdersViewModel
- IceCreamShopContracts.ViewModels.ReportDateOrdersViewModel, IceCreamShopContracts, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ ComputersShopContracts.ViewModels.ReportDateOrdersViewModel, ComputersShopContracts, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
diff --git a/ComputersShop/ComputersShopBusinessLogic/BusinessLogics/ReportLogic.cs b/ComputersShop/ComputersShopBusinessLogic/BusinessLogics/ReportLogic.cs
index dbb4507..521ed89 100644
--- a/ComputersShop/ComputersShopBusinessLogic/BusinessLogics/ReportLogic.cs
+++ b/ComputersShop/ComputersShopBusinessLogic/BusinessLogics/ReportLogic.cs
@@ -98,12 +98,12 @@ namespace ComputersShopBusinessLogic.BusinessLogics
Computers = new List>(),
TotalCount = 0
};
- foreach (var iceCream in shop.ShopComputers)
+ foreach (var computer in shop.ShopComputers)
{
record.Computers.Add(new Tuple(iceCream.Value.Item1.ComputerName, iceCream.Value.Item2));
+ int>(computer.Value.Item1.ComputerName, computer.Value.Item2));
record.TotalCount +=
- iceCream.Value.Item2;
+ computer.Value.Item2;
}
list.Add(record);
}
diff --git a/ComputersShop/ComputersShopBusinessLogic/OfficePackage/AbstractSaveToExcel.cs b/ComputersShop/ComputersShopBusinessLogic/OfficePackage/AbstractSaveToExcel.cs
index a7659bb..f1f2676 100644
--- a/ComputersShop/ComputersShopBusinessLogic/OfficePackage/AbstractSaveToExcel.cs
+++ b/ComputersShop/ComputersShopBusinessLogic/OfficePackage/AbstractSaveToExcel.cs
@@ -105,13 +105,13 @@ namespace ComputersShopBusinessLogic.OfficePackage
StyleInfo = ExcelStyleInfoType.Text
});
rowIndex++;
- foreach (var iceCream in pc.Computers)
+ foreach (var computer in pc.Computers)
{
InsertCellInWorksheet(new ExcelCellParameters
{
ColumnName = "B",
RowIndex = rowIndex,
- Text = iceCream.Item1,
+ Text = computer.Item1,
StyleInfo =
ExcelStyleInfoType.TextWithBroder
});
@@ -119,7 +119,7 @@ namespace ComputersShopBusinessLogic.OfficePackage
{
ColumnName = "C",
RowIndex = rowIndex,
- Text = iceCream.Item2.ToString(),
+ Text = computer.Item2.ToString(),
StyleInfo =
ExcelStyleInfoType.TextWithBroder
});
diff --git a/ComputersShop/ComputersShopBusinessLogic/OfficePackage/Implements/SaveToWord.cs b/ComputersShop/ComputersShopBusinessLogic/OfficePackage/Implements/SaveToWord.cs
index 1f76b71..9d990fa 100644
--- a/ComputersShop/ComputersShopBusinessLogic/OfficePackage/Implements/SaveToWord.cs
+++ b/ComputersShop/ComputersShopBusinessLogic/OfficePackage/Implements/SaveToWord.cs
@@ -132,36 +132,38 @@ namespace ComputersShopBusinessLogic.OfficePackage.Implements
}
Table docTable = new Table();
TableProperties tableProps = new TableProperties(
- new TopBorder
- {
- Val = new EnumValue(BorderValues.Single),
- Size = 12
- },
- new BottomBorder
- {
- Val = new EnumValue(BorderValues.Single),
- Size = 12
- },
- new LeftBorder
- {
- Val = new EnumValue(BorderValues.Single),
- Size = 12
- },
- new RightBorder
- {
- Val = new EnumValue(BorderValues.Single),
- Size = 12
- },
- new InsideHorizontalBorder
- {
- Val = new EnumValue(BorderValues.Single),
- Size = 12
- },
- new InsideVerticalBorder
- {
- Val = new EnumValue(BorderValues.Single),
- Size = 12
- });
+ new TableBorders(
+ new TopBorder
+ {
+ Val = new EnumValue(BorderValues.Single),
+ Size = 12
+ },
+ new BottomBorder
+ {
+ Val = new EnumValue(BorderValues.Single),
+ Size = 12
+ },
+ new LeftBorder
+ {
+ Val = new EnumValue(BorderValues.Single),
+ Size = 12
+ },
+ new RightBorder
+ {
+ Val = new EnumValue(BorderValues.Single),
+ Size = 12
+ },
+ new InsideHorizontalBorder
+ {
+ Val = new EnumValue(BorderValues.Single),
+ Size = 12
+ },
+ new InsideVerticalBorder
+ {
+ Val = new EnumValue(BorderValues.Single),
+ Size = 12
+ }
+ ));
docTable.AppendChild(tableProps);
TableGrid tableGrid = new TableGrid();
for (int i = 0; i < table.Columns; i++)