diff --git a/ProjectPeopleTransportation/ProjectPeopleTransportation/Entities/StartingShift.cs b/ProjectPeopleTransportation/ProjectPeopleTransportation/Entities/StartingShift.cs index 3edb5e1..0e9e909 100644 --- a/ProjectPeopleTransportation/ProjectPeopleTransportation/Entities/StartingShift.cs +++ b/ProjectPeopleTransportation/ProjectPeopleTransportation/Entities/StartingShift.cs @@ -41,7 +41,7 @@ public class StartingShift Starting_Shift_Date = tempStartingShiftEmployee.Starting_Shift_Date, Route_List_ID = tempStartingShiftEmployee.Route_List_ID, Bus_ID = tempStartingShiftEmployee.Bus_ID, - StartingShiftEmployees = startingShiftEmployees + //StartingShiftEmployees = startingShiftEmployee }; } } \ No newline at end of file diff --git a/ProjectPeopleTransportation/ProjectPeopleTransportation/Entities/TempStartingShift_Employee.cs.cs b/ProjectPeopleTransportation/ProjectPeopleTransportation/Entities/TempStartingShift_Employee.cs.cs index 9fc7710..43faef6 100644 --- a/ProjectPeopleTransportation/ProjectPeopleTransportation/Entities/TempStartingShift_Employee.cs.cs +++ b/ProjectPeopleTransportation/ProjectPeopleTransportation/Entities/TempStartingShift_Employee.cs.cs @@ -18,5 +18,5 @@ public class TempStartingShift_Employee public DateTime Starting_Shift_Date { get; private set; } - public int Work_time { get; private set; } + public int Shift_Duration { get; private set; } } diff --git a/ProjectPeopleTransportation/ProjectPeopleTransportation/Reports/ChartReport.cs b/ProjectPeopleTransportation/ProjectPeopleTransportation/Reports/ChartReport.cs index 871302a..f5b4096 100644 --- a/ProjectPeopleTransportation/ProjectPeopleTransportation/Reports/ChartReport.cs +++ b/ProjectPeopleTransportation/ProjectPeopleTransportation/Reports/ChartReport.cs @@ -25,8 +25,8 @@ internal class ChartReport try { new PdfBuilder(filePath) - .AddHeader("Починка автобуса") - .AddPieChart("Починенный автобус", GetData(dateTime)) + .AddHeader("Тех обслуживание") + .AddPieChart("Количество неисправных элементов", GetData(dateTime)) .Build(); return true; } @@ -41,7 +41,7 @@ internal class ChartReport return _busCheckRepository .ReadBusCheck() .Where(x => x.Date.Date == dateTime.Date) - .GroupBy(x => x.Bus_ID, (key, group) => new { Id = key, Bus_element_type = group.Sum(x => x.Price) }) - .Select(x => (x.Id.ToString(), (double)x.Bus_element_type)).ToList(); + .GroupBy(x => x.Bus_ID, (key, group) => new { ID = key, Bus_Element_Type = group.Sum(x => x.Price) }) + .Select(x => (x.ID.ToString(), (double)x.Bus_Element_Type)).ToList(); } } diff --git a/ProjectPeopleTransportation/ProjectPeopleTransportation/Reports/TableReport.cs b/ProjectPeopleTransportation/ProjectPeopleTransportation/Reports/TableReport.cs index e9888b3..3d7c18d 100644 --- a/ProjectPeopleTransportation/ProjectPeopleTransportation/Reports/TableReport.cs +++ b/ProjectPeopleTransportation/ProjectPeopleTransportation/Reports/TableReport.cs @@ -54,7 +54,7 @@ internal class TableReport // EmployeeId = (int?)employeeId, // BusId = (int?)null, // x.Starting_Shift_Date, - // WorkHours = x.StartingShiftEmployees.FirstOrDefault(y => y.Employee_ID == employeeId)?.Work_time, + // Shift_Duration = x.StartingShiftEmployees.FirstOrDefault(y => y.Employee_ID == employeeId)?.Work_time, // Price = (int?)null // }) // .Union(_busCheckRepository