diff --git a/CarCenter/CarCenterContracts/BindingModels/ReportBindingModel.cs b/CarCenter/CarCenterContracts/BindingModels/ReportBindingModel.cs deleted file mode 100644 index 4d29120..0000000 --- a/CarCenter/CarCenterContracts/BindingModels/ReportBindingModel.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace CarCenterContracts.BindingModels -{ - public class ReportBindingModel - { - public string FileName { get; set; } = string.Empty; - public DateTime? DateFrom { get; set; } - public DateTime? DateTo { get; set; } - } - -} diff --git a/CarCenter/CarCenterContracts/BusinessLogicsContracts/IReportLogic.cs b/CarCenter/CarCenterContracts/BusinessLogicsContracts/IReportLogic.cs new file mode 100644 index 0000000..dbfbcb6 --- /dev/null +++ b/CarCenter/CarCenterContracts/BusinessLogicsContracts/IReportLogic.cs @@ -0,0 +1,20 @@ +using CarCenterContracts.BindingModels; +using CarCenterContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarCenterContracts.BusinessLogicsContracts +{ + public interface IReportLogic + { + + List GetBundligs(ReportBindingModel model); + List GetCars(ReportBindingModel model); + List GetOrders(ReportBindingModel model); + List GetPresales(ReportBindingModel model); + + } +} diff --git a/CarCenter/CarCenterContracts/ViewModels/ReportBundlingViewModel.cs b/CarCenter/CarCenterContracts/ViewModels/ReportBundlingViewModel.cs index 7c9d8f7..d0ea5d7 100644 --- a/CarCenter/CarCenterContracts/ViewModels/ReportBundlingViewModel.cs +++ b/CarCenter/CarCenterContracts/ViewModels/ReportBundlingViewModel.cs @@ -1,4 +1,5 @@ -using System; +using CarCenterDataModels.Models; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -9,7 +10,8 @@ namespace CarCenterContracts.ViewModels public class ReportBundlingViewModel { public int Id { get; set; } - public List<(string, int)> Orders { get; set; } = new(); - public List<(string, int)> Features { get; set; } = new(); + //Пока не ясно что конкретно передавать в отчет, поэтому передается моделька + public List Orders { get; set; } = new(); + public List Features { get; set; } = new(); } } diff --git a/CarCenter/CarCenterContracts/ViewModels/ReportCarViewModel.cs b/CarCenter/CarCenterContracts/ViewModels/ReportCarViewModel.cs index 995f519..559939c 100644 --- a/CarCenter/CarCenterContracts/ViewModels/ReportCarViewModel.cs +++ b/CarCenter/CarCenterContracts/ViewModels/ReportCarViewModel.cs @@ -1,4 +1,5 @@ -using System; +using CarCenterDataModels.Models; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -9,6 +10,7 @@ namespace CarCenterContracts.ViewModels public class ReportCarViewModel { public int Id { get; set; } - public List<(string, int)> Presales { get; set; } = new(); + //Пока не ясно что конкретно передавать в отчет, поэтому передается моделька + public List Presales { get; set; } = new(); } } diff --git a/CarCenter/CarCenterContracts/ViewModels/ReportOrderViewModel.cs b/CarCenter/CarCenterContracts/ViewModels/ReportOrderViewModel.cs index 63a833c..d3a5635 100644 --- a/CarCenter/CarCenterContracts/ViewModels/ReportOrderViewModel.cs +++ b/CarCenter/CarCenterContracts/ViewModels/ReportOrderViewModel.cs @@ -1,4 +1,5 @@ -using System; +using CarCenterDataModels.Models; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -9,7 +10,8 @@ namespace CarCenterContracts.ViewModels public class ReportOrderViewModel { public int Id { get; set; } - public List<(string, int)> Bundlings { get; set; } = new(); - public List<(string, int)> Requests { get; set; } = new(); + //Пока не ясно что конкретно передавать в отчет, поэтому передается моделька + public List Bundlings { get; set; } = new(); + public List Requests { get; set; } = new(); } } diff --git a/CarCenter/CarCenterContracts/ViewModels/ReportPresaleViewModel.cs b/CarCenter/CarCenterContracts/ViewModels/ReportPresaleViewModel.cs index 3304ce9..14d7ec4 100644 --- a/CarCenter/CarCenterContracts/ViewModels/ReportPresaleViewModel.cs +++ b/CarCenter/CarCenterContracts/ViewModels/ReportPresaleViewModel.cs @@ -1,4 +1,5 @@ -using System; +using CarCenterDataModels.Models; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -9,6 +10,7 @@ namespace CarCenterContracts.ViewModels public class ReportPresaleViewModel { public int Id { get; set; } - public List<(string, int)> Cars { get; set; } = new(); + //Пока не ясно что конкретно передавать в отчет, поэтому передается моделька + public List Cars { get; set; } = new(); } } diff --git a/CarCenter/CarCenterDatabaseImplement/Implements/CarStorage.cs b/CarCenter/CarCenterDatabaseImplement/Implements/CarStorage.cs index f17d612..d9a1fbd 100644 --- a/CarCenter/CarCenterDatabaseImplement/Implements/CarStorage.cs +++ b/CarCenter/CarCenterDatabaseImplement/Implements/CarStorage.cs @@ -31,6 +31,7 @@ namespace CarCenterDatabaseImplement.Implements using var context = new CarCenterDatabase(); if (model.DateFrom.HasValue && model.DateTo.HasValue) // Для отчета списка { + //будет применятся в ReportLogic return context.Cars .Include(x => x.Bundlings) .ThenInclude(x => x.Bundling) diff --git a/CarCenter/CarCenterDatabaseImplement/Implements/OrderStorage.cs b/CarCenter/CarCenterDatabaseImplement/Implements/OrderStorage.cs index ca1579a..22a5319 100644 --- a/CarCenter/CarCenterDatabaseImplement/Implements/OrderStorage.cs +++ b/CarCenter/CarCenterDatabaseImplement/Implements/OrderStorage.cs @@ -57,6 +57,7 @@ namespace CarCenterDatabaseImplement.Implements if (model.DateFrom.HasValue && model.DateTo.HasValue) //для списка Сагиров { + //будет применятся в ReportLogic return context.Orders .Include(x => x.Worker) .Include(x => x.Cars) @@ -73,6 +74,7 @@ namespace CarCenterDatabaseImplement.Implements } else if (model.Presales.Count > 0) //для отчета Сагиров { + //будет применятся в ReportLogic return context.Orders .Include(x => x.Worker) .Include(x => x.Cars) @@ -84,6 +86,7 @@ namespace CarCenterDatabaseImplement.Implements } else if (model.Cars.Count > 0) //для отчета Малафеев { + //будет применятся в ReportLogic return context.Orders .Include(x => x.Worker) .Include(x => x.Cars)