PR Conflict LabWork05 #6
@ -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
|
||||
|
@ -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();
|
||||
}
|
||||
}
|
||||
|
@ -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);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user