AnnZhimol/PIbd-22_Zhimolostnova_A.V._SoftwareInstallation
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

исправления

Browse Source
This commit is contained in:
AnnZhimol 2023-03-25 18:31:28 +04:00
parent 5fcf035db9
commit 280e01e687
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SoftwareInstallation/SoftwareInstallationDataBaseImplement/SoftwareInstallationDataBase.cs
View File

@ -9,7 +9,7 @@ namespace SoftwareInstallationDataBaseImplement
{
if (optionsBuilder.IsConfigured == false)
{
optionsBuilder.UseSqlServer(@"Data Source=COMP-AVZH\SQLEXPRESS;Initial Catalog=SoftwareInstallationDataBaseFull;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True");
optionsBuilder.UseSqlServer(@"Data Source=ANNZHIMOL\SQLEXPRESS;Initial Catalog=SoftwareInstallationDataBaseFull;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True");
}
base.OnConfiguring(optionsBuilder);
}

4
SoftwareInstallation/SoftwareInstallationFileImplement/Implements/OrderStorage.cs
View File

@ -42,12 +42,12 @@ namespace SoftwareInstallationFileImplement.Implements
public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
{
if (!model.Id.HasValue)
if (!model.Id.HasValue && !model.DateFrom.HasValue && !model.DateTo.HasValue)
{
return new();
}
return source.Orders.Where(x => x.Id==model.Id).Select(x => x.GetViewModel).ToList();
return source.Orders.Where(x => x.Id.Equals(model.Id)).Select(x => x.GetViewModel).ToList();
}
public List<OrderViewModel> GetFullList()

2
SoftwareInstallation/SoftwareInstallationListImplement/Implements/OrderStorage.cs
View File

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