Mavrina_Julia/ISEbd-22_Mavrinaa_J.E._RenovationWork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ISEbd-22 Mavrina J.E. Labwork 4 #5

Closed
Mavrina_Julia wants to merge 7 commits from Лаба_4 into Лаб_3
pull from: Лаба_4
merge into: Mavrina_Julia:Лаб_3
Conversation 1 Commits 7 Files Changed 45 +6 -3
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2e52e9fc9d - Show all commits

7
RenovationWork/RenovationWorkDatabaseImplement/Implements/OrderStorage.cs
View File

@ -22,15 +22,18 @@ namespace RenovationWorkDatabaseImplement.Implements
public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
{
using var context = new RenovationWorkDatabase();
using var context = new RenovationWorkDatabase();
if (model.DateFrom.HasValue)
{
return context.Orders.Include(x => x.Repair).Where(x => x.DateCreate >= model.DateFrom && x.DateCreate <= model.DateTo).Select(x => x.GetViewModel).ToList();
}
return context.Orders.Include(x => x.Repair).Where(x => x.Id == model.Id).Select(x => x.GetViewModel).ToList();
//using var context = new RenovationWorkDatabase();
//var result = context.Orders.Include(x => x.Repair).Select(x => x.GetViewModel).ToList();
//return result;
}
public OrderViewModel? GetElement(OrderSearchModel model)
public OrderViewModel? GetElement(OrderSearchModel model)
{
if (!model.Id.HasValue)
{

2
RenovationWork/RenovationWorkDatabaseImplement/RenovationWorkDatabase.cs
View File

@ -14,7 +14,7 @@ namespace RenovationWorkDatabaseImplement
{
if (!optionsBuilder.IsConfigured)
{
optionsBuilder.UseSqlServer(@"Data Source=localhost\SQLEXPRESS;Initial Catalog=RenovationWorkDatabase;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True");
optionsBuilder.UseSqlServer(@"Data Source=localhost\SQLEXPRESS;Initial Catalog=RenovationWorkDatabase_4;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True");
}
base.OnConfiguring(optionsBuilder);
}