Zhelovanov D.Y. LabWork04 #4

Closed
Zhelovanov_Dmitrii wants to merge 3 commits from LabWork04 into LabWork03
3 changed files with 2 additions and 15 deletions
Showing only changes of commit c44bd13c85 - Show all commits

View File

@ -24,19 +24,6 @@ WordTextProperties { Bold = true, Size = "24", }) },
JustificationType = WordJustificationType.Center
}
});
/* foreach (var component in info.Components)
{
CreateParagraph(new WordParagraph
{
Texts = new List<(string, WordTextProperties)> {
(component.ComponentName, new WordTextProperties { Size = "24"}) },
TextProperties = new WordTextProperties
{
Size = "24",
JustificationType = WordJustificationType.Both
}
});
}*/
foreach (var manufacture in info.Manufactures)
{
CreateParagraph(new WordParagraph

View File

@ -11,7 +11,7 @@ namespace BlacksmithWorkshopBusinessLogic.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<ManufactureViewModel> Manufactures { get; set; } = new();
}
}

View File

@ -59,7 +59,7 @@ namespace BlacksmithWorkshopListImplement.Implements
foreach (var order in _source.Orders)
{
if (order.Id == model.Id )/*|| model.DateFrom <= order.DateCreate && order.DateCreate <= model.DateTo)*/
if (order.Id == model.Id || model.DateFrom <= order.DateCreate && order.DateCreate <= model.DateTo)
{
result.Add(order.GetViewModel);
}