cyxaruk/ISEbd-22_Platonov_A.M._ProjectPeopleTransportation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

продолжение

Browse Source
This commit is contained in:
cyxaruk 2024-12-19 18:37:29 +04:00
parent aa3cac0946
commit 19426c8296
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ProjectPeopleTransportation/ProjectPeopleTransportation/Entities/StartingShift.cs
View File

@ -41,7 +41,7 @@ public class StartingShift
Starting_Shift_Date = tempStartingShiftEmployee.Starting_Shift_Date, Starting_Shift_Date = tempStartingShiftEmployee.Starting_Shift_Date,
Route_List_ID = tempStartingShiftEmployee.Route_List_ID, Route_List_ID = tempStartingShiftEmployee.Route_List_ID,
Bus_ID = tempStartingShiftEmployee.Bus_ID, Bus_ID = tempStartingShiftEmployee.Bus_ID,
StartingShiftEmployees = startingShiftEmployees //StartingShiftEmployees = startingShiftEmployee
}; };
} }
} }

2
ProjectPeopleTransportation/ProjectPeopleTransportation/Entities/TempStartingShift_Employee.cs.cs
View File

@ -18,5 +18,5 @@ public class TempStartingShift_Employee
public DateTime Starting_Shift_Date { get; private set; } public DateTime Starting_Shift_Date { get; private set; }
public int Work_time { get; private set; } public int Shift_Duration { get; private set; }
} }

8
ProjectPeopleTransportation/ProjectPeopleTransportation/Reports/ChartReport.cs
View File

@ -25,8 +25,8 @@ internal class ChartReport
try try
{ {
new PdfBuilder(filePath) new PdfBuilder(filePath)
.AddHeader("Починка автобуса") .AddHeader("Тех обслуживание")
.AddPieChart("Починенный автобус", GetData(dateTime)) .AddPieChart("Количество неисправных элементов", GetData(dateTime))
.Build(); .Build();
return true; return true;
} }
@ -41,7 +41,7 @@ internal class ChartReport
return _busCheckRepository return _busCheckRepository
.ReadBusCheck() .ReadBusCheck()
.Where(x => x.Date.Date == dateTime.Date) .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) }) .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(); .Select(x => (x.ID.ToString(), (double)x.Bus_Element_Type)).ToList();
} }
} }

2
ProjectPeopleTransportation/ProjectPeopleTransportation/Reports/TableReport.cs
View File

@ -54,7 +54,7 @@ internal class TableReport
// EmployeeId = (int?)employeeId, // EmployeeId = (int?)employeeId,
// BusId = (int?)null, // BusId = (int?)null,
// x.Starting_Shift_Date, // 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 // Price = (int?)null
// }) // })
// .Union(_busCheckRepository // .Union(_busCheckRepository