diff --git a/CarCenter/CarCenterAdministratorAPP/Controllers/HomeController.cs b/CarCenter/CarCenterAdministratorAPP/Controllers/HomeController.cs index 60a7716..b72cacd 100644 --- a/CarCenter/CarCenterAdministratorAPP/Controllers/HomeController.cs +++ b/CarCenter/CarCenterAdministratorAPP/Controllers/HomeController.cs @@ -126,6 +126,15 @@ namespace ImplementerApp.Controllers return View(); } + public IActionResult CarsPreSaleWorkReport() + { + return View(new List()); + } + public IActionResult EmployeeCompletionsReport() + { + return View(new List()); + } + [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)] public IActionResult Error() { diff --git a/CarCenter/CarCenterAdministratorAPP/Views/Home/CarsPeriodReport.cshtml b/CarCenter/CarCenterAdministratorAPP/Views/Home/CarsPeriodReport.cshtml new file mode 100644 index 0000000..2b760de --- /dev/null +++ b/CarCenter/CarCenterAdministratorAPP/Views/Home/CarsPeriodReport.cshtml @@ -0,0 +1,50 @@ +@using CarCenterContracts.ViewModels + +@model List + +@{ + ViewData["Title"] = "CarsPeriodReport"; +} + +
+

Список машин за период

+
+ +
+ +
+ + + + + + + + + + + + @foreach (var cars in Model) + { + + + + + + } + +
Бренд машиныКомплектацииСотрудники
@cars.CarBrand +
    + @foreach (var completion in cars.Completions) + { +
  • @completion
    • + } +
+ 		+
    + @foreach (var employee in cars.Employees) + { +
  • @employee
    • + } +
+
diff --git a/CarCenter/CarCenterAdministratorAPP/Views/Home/CarsPreSaleWorkReport.cshtml b/CarCenter/CarCenterAdministratorAPP/Views/Home/CarsPreSaleWorkReport.cshtml new file mode 100644 index 0000000..4af6caf --- /dev/null +++ b/CarCenter/CarCenterAdministratorAPP/Views/Home/CarsPreSaleWorkReport.cshtml @@ -0,0 +1,42 @@ +@using CarCenterContracts.ViewModels + +@model List + +@{ + ViewData["Title"] = "CarsPreSaleWorkReport"; +} +
+

Список машин по предпродажным работам

+
+ +
+ +
+
+ +
+ + + + + + + + + + @foreach (var cars in Model) + { + + + + + } + +
Бренд машиныПредпродажная работа
@cars.CarBrand +
    + @foreach (var presalework in cars.PreSaleWork) + { +
  • @presalework
    • + } +
+
diff --git a/CarCenter/CarCenterAdministratorAPP/Views/Home/IndexCompletions.cshtml b/CarCenter/CarCenterAdministratorAPP/Views/Home/IndexCompletions.cshtml index bd8bf9f..7fbdfde 100644 --- a/CarCenter/CarCenterAdministratorAPP/Views/Home/IndexCompletions.cshtml +++ b/CarCenter/CarCenterAdministratorAPP/Views/Home/IndexCompletions.cshtml @@ -19,7 +19,7 @@ return; }

- Создать комплектацию + Создать комплектацию

@@ -61,7 +61,7 @@ @Html.DisplayFor(modelItem => item.СompletionPrice)
- Изменить + Изменить Удалить diff --git a/CarCenter/CarCenterAdministratorAPP/Views/Home/ReportsMenu.cshtml b/CarCenter/CarCenterAdministratorAPP/Views/Home/ReportsMenu.cshtml index 1ff7eea..d6a4042 100644 --- a/CarCenter/CarCenterAdministratorAPP/Views/Home/ReportsMenu.cshtml +++ b/CarCenter/CarCenterAdministratorAPP/Views/Home/ReportsMenu.cshtml @@ -5,8 +5,7 @@

Список создания отчетов

- Продаваемые машины - Комплектации - Осмотры + Отчет по машинам за период + Отчет по машинам и предпродажным работам
diff --git a/CarCenter/CarCenterContracts/ViewModels/CarsPeriodReportViewModel.cs b/CarCenter/CarCenterContracts/ViewModels/CarsPeriodReportViewModel.cs new file mode 100644 index 0000000..f2f2d70 --- /dev/null +++ b/CarCenter/CarCenterContracts/ViewModels/CarsPeriodReportViewModel.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarCenterContracts.ViewModels +{ + public class CarsPeriodReportViewModel + { + public string CarBrand { get; set; } = string.Empty; + public List Completions { get; set; } = new(); + public List Employees { get; set; } = new(); + } +} diff --git a/CarCenter/CarCenterContracts/ViewModels/CarsPreSaleWorkReportViewModel.cs b/CarCenter/CarCenterContracts/ViewModels/CarsPreSaleWorkReportViewModel.cs new file mode 100644 index 0000000..3ede691 --- /dev/null +++ b/CarCenter/CarCenterContracts/ViewModels/CarsPreSaleWorkReportViewModel.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarCenterContracts.ViewModels +{ + public class CarsPreSaleWorkReportViewModel + { + public string CarBrand { get; set; } = string.Empty; + public List PreSaleWork { get; set; } = new(); + } +} diff --git a/CarCenter/CarCenterContracts/ViewModels/SalesInspectionsReportViewModel.cs b/CarCenter/CarCenterContracts/ViewModels/SalesInspectionsReportViewModel.cs new file mode 100644 index 0000000..1df4047 --- /dev/null +++ b/CarCenter/CarCenterContracts/ViewModels/SalesInspectionsReportViewModel.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarCenterContracts.ViewModels +{ + public class SalesInspectionsReportViewModel + { + public string SaleName { get; set; } = string.Empty; + public List Inspections { get; set; } = new(); + } +} diff --git a/CarCenter/CarCenterContracts/ViewModels/SalesPeriodReportViewModel.cs b/CarCenter/CarCenterContracts/ViewModels/SalesPeriodReportViewModel.cs new file mode 100644 index 0000000..2113183 --- /dev/null +++ b/CarCenter/CarCenterContracts/ViewModels/SalesPeriodReportViewModel.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarCenterContracts.ViewModels +{ + public class SalesPeriodReportViewModel + { + public string SaleName { get; set; } = string.Empty; + public List Employee { get; set; } = new(); + public List Completions { get; set; } = new(); + } +} diff --git a/CarCenter/CarCenterManagerAPP/Controllers/HomeController.cs b/CarCenter/CarCenterManagerAPP/Controllers/HomeController.cs index 7bd71a1..e93c9d5 100644 --- a/CarCenter/CarCenterManagerAPP/Controllers/HomeController.cs +++ b/CarCenter/CarCenterManagerAPP/Controllers/HomeController.cs @@ -126,7 +126,16 @@ namespace ImplementerApp.Controllers return View(); } - [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)] + public IActionResult SalesInspectionsReport() + { + return View(new List()); + } + public IActionResult SalesPeriodReport() + { + return View(new List()); + } + + [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)] public IActionResult Error() { return View(new ErrorViewModel { RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier }); diff --git a/CarCenter/CarCenterManagerAPP/Views/Home/CreateEmployee.cshtml b/CarCenter/CarCenterManagerAPP/Views/Home/CreateEmployee.cshtml index ce8db91..7321962 100644 --- a/CarCenter/CarCenterManagerAPP/Views/Home/CreateEmployee.cshtml +++ b/CarCenter/CarCenterManagerAPP/Views/Home/CreateEmployee.cshtml @@ -10,8 +10,16 @@
-
Название:
-
+
ФИО сотрудника:
+
+
+
+
Должность сотрудника:
+
+
+
+
Стоимость продажи:
+
Sales
@@ -37,10 +45,6 @@
-
-
Сумма:
-
-
diff --git a/CarCenter/CarCenterManagerAPP/Views/Home/ReportsMenu.cshtml b/CarCenter/CarCenterManagerAPP/Views/Home/ReportsMenu.cshtml index f2c849e..262e728 100644 --- a/CarCenter/CarCenterManagerAPP/Views/Home/ReportsMenu.cshtml +++ b/CarCenter/CarCenterManagerAPP/Views/Home/ReportsMenu.cshtml @@ -5,6 +5,7 @@

Список создания отчетов

- + Отчет по машинам за период + Отчет по машинам и предпродажным работам
diff --git a/CarCenter/CarCenterManagerAPP/Views/Home/SalesInspectionsReport.cshtml b/CarCenter/CarCenterManagerAPP/Views/Home/SalesInspectionsReport.cshtml new file mode 100644 index 0000000..c81d0e9 --- /dev/null +++ b/CarCenter/CarCenterManagerAPP/Views/Home/SalesInspectionsReport.cshtml @@ -0,0 +1,42 @@ +@using CarCenterContracts.ViewModels + +@model List + +@{ + ViewData["Title"] = "SalesInspectionsReport"; +} +
+

Список осмотров по продажам

+
+ + + + +
+ +
+ + + + + + + + + + @foreach (var sales in Model) + { + + + + + } + +
ПродажаОсмотр
@sales.SaleName +
    + @foreach (var inspections in sales.Inspections) + { +
  • @inspections
    • + } +
+
diff --git a/CarCenter/CarCenterManagerAPP/Views/Home/SalesPeriodReport.cshtml b/CarCenter/CarCenterManagerAPP/Views/Home/SalesPeriodReport.cshtml new file mode 100644 index 0000000..45b9b42 --- /dev/null +++ b/CarCenter/CarCenterManagerAPP/Views/Home/SalesPeriodReport.cshtml @@ -0,0 +1,50 @@ +@using CarCenterContracts.ViewModels + +@model List + +@{ + ViewData["Title"] = "SalesPeriodReport"; +} + +
+

Список продаж за период

+
+ +
+ +
+ + + + + + + + + + + + @foreach (var sales in Model) + { + + + + + + } + +
ПродажаСотрудникиКомплектации
@sales.SaleName +
    + @foreach (var employee in sales.Employee) + { +
  • @employee
    • + } +
+ 		+
    + @foreach (var completion in sales.Completions) + { +
  • @completion
    • + } +
+