Artyom_Yashin/PIbd-23_Yashin_A_A_ComputersShop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Сделаль

Browse Source
This commit is contained in:
Artyom_Yashin 2024-03-27 11:37:57 +04:00
parent 4dee91c9a9
commit 9fc929886e
7 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ComputersShop/ComputersShop/FormMain.Designer.cs generated
View File

@ -88,7 +88,7 @@
//
списокКомпонентовToolStripMenuItem.Name = "списокКомпонентовToolStripMenuItem";
списокКомпонентовToolStripMenuItem.Size = new Size(306, 26);
списокКомпонентовToolStripMenuItem.Text = "Список компонентов";
списокКомпонентовToolStripMenuItem.Text = "Список компьютеров";
списокКомпонентовToolStripMenuItem.Click += списокКомпонентовToolStripMenuItem_Click;
//
// компонентыПоКомпьютерамToolStripMenuItem

4
ComputersShop/ComputersShop/FormReportComputerComponents.Designer.cs generated
View File

@ -62,13 +62,13 @@
// ComponentColumn
//
ComponentColumn.AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
ComponentColumn.HeaderText = "Компонент";
ComponentColumn.HeaderText = "Компьютер";
ComponentColumn.MinimumWidth = 6;
ComponentColumn.Name = "ComponentColumn";
//
// ComputerColumn
//
ComputerColumn.HeaderText = "Компьютер";
ComputerColumn.HeaderText = "Компонент";
ComputerColumn.MinimumWidth = 6;
ComputerColumn.Name = "ComputerColumn";
ComputerColumn.Width = 200;

4
ComputersShop/ComputersShopBusinessLogic/BusinessLogics/ReportLogic.cs
View File

@ -94,8 +94,8 @@ namespace ComputersShopBusinessLogic.BusinessLogics
{
FileName = model.FileName,
Title = "Список компонент",
Components = _componentStorage.GetFullList()
});
Computers = _ComputerStorage.GetFullList()
}) ;
}
/// <summary>
/// Сохранение компонент с указаеним продуктов в файл-Excel

8
ComputersShop/ComputersShopBusinessLogic/OfficePackage/AbstractSaveToWord.cs
View File

@ -22,15 +22,17 @@ namespace ComputersShopBusinessLogic.OfficePackage
JustificationType = WordJustificationType.Center
}
});
foreach (var component in info.Components)
foreach (var computer in info.Computers)
{
CreateParagraph(new WordParagraph
{
Texts = new List<(string, WordTextProperties)> { (component.ComponentName, new WordTextProperties { Size = "24", }) },
Texts = new List<(string, WordTextProperties)> { (computer.ComputerName, new WordTextProperties { Size = "24", Bold = true}),
(" - цена " + computer.Price.ToString(), new WordTextProperties { Size = "24"})
},
TextProperties = new WordTextProperties
{
Size = "24",
JustificationType = WordJustificationType.Both
JustificationType = WordJustificationType.Both,
}
});
}

2
ComputersShop/ComputersShopBusinessLogic/OfficePackage/HelperModels/WordInfo.cs
View File

@ -11,6 +11,6 @@ namespace ComputersShopBusinessLogic.OfficePackage.HelperModels
{
public string FileName { get; set; } = string.Empty;
public string Title { get; set; } = string.Empty;
public List<ComponentViewModel> Components { get; set; } = new();
public List<ComputerViewModel> Computers { get; set; } = new();
}
}

4
ComputersShop/ComputersShopFileImplement/Implements/OrderStorage.cs
View File

@ -28,10 +28,6 @@ namespace ComputersShopFileImplement.Implements
public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
{
if (!model.Id.HasValue)
{
return new();
}
return source.Orders
.Where(x => (
(!model.Id.HasValue || x.Id == model.Id) &&

8
ComputersShop/ComputersShopListImplement/Implements/OrderStorage.cs
View File

@ -25,13 +25,11 @@ namespace ComputersShopListImplement.Implements
public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
{
var result = new List<OrderViewModel>();
if (!model.Id.HasValue)
{
return result;
}
foreach (var order in _source.Orders)
{
if (order.Id == model.Id && model.DateFrom <= order.DateCreate && model.DateTo >= order.DateCreate)
if ((!model.Id.HasValue || order.Id == model.Id) &&
(!model.DateFrom.HasValue || order.DateCreate >= model.DateFrom) &&
(!model.DateTo.HasValue || order.DateCreate <= model.DateTo))
{
result.Add(AccessComputerStorage(order.GetViewModel));
}