ownSoft/BeWoPlaner
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/BeWo

Browse Source 
# Conflicts:
#	Service/Plugins/PluginLoader.cs
#	Service/ServiceImplementations/CustomerServiceImp.cs
This commit is contained in:
Christian
2022-01-07 00:48:33 +01:00
parent 5ad5c5025d a201e2c125
commit 106d0fd7ca
88 changed files with 23450 additions and 2584 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Report/DefaultReportCreator.cs
View File

@@ -1037,7 +1037,9 @@ namespace BeWo.Report
employeeOids.Add(vertretung.EmployeeOid);
}
var employee = MapperFactory.EmployeeDC_Employee.MapToNewDCs(DAOFactory.GenericDAO.GetActiveByIDs<Employee>(employeeOids));
List<EmployeeDC> employee = new List<EmployeeDC>();
foreach (var oid in employeeOids)
employee.Add(MapperFactory.EmployeeDC_Employee.MapToNewDC(DAOFactory.GenericDAO.GetByID<Employee>(oid)));
//report.SetReportDataSource(RosterRO.Create(service.GetDienstEintraege(wOid, dt.Year, dt.Month), service.GetAllDienste(), service2.GetAllActiveWohnheimeCompact().First(x => x.WohnheimOid == wOid), dt.Year, dt.Month));
report.SetReportDataSource(RosterRO.CreateNew(dienstEintraege, vertretungen, employee,
@@ -1068,13 +1070,15 @@ namespace BeWo.Report
employeeOids.Add(vertretung.EmployeeOid);
}
var employee = MapperFactory.EmployeeDC_Employee.MapToNewDCs(DAOFactory.GenericDAO.GetActiveByIDs<Employee>(employeeOids));
List<EmployeeDC> employee = new List<EmployeeDC>();
foreach (var oid in employeeOids)
employee.Add(MapperFactory.EmployeeDC_Employee.MapToNewDC(DAOFactory.GenericDAO.GetByID<Employee>(oid)));
List<AbsenceTimeDC> absences = employeeService.GetMultipleEmployeeAbsenceTimesForMonth(dt.Year, dt.Month, employeeOids);
List<FeiertagDC> feiertageDCs = opertionsService.ErstelleDefaultFeiertage(dt.Year).Where(f => f.Datum.Month == dt.Month).ToList();
Dictionary<long?, decimal> stundenBeiAbwesenheit = new Dictionary<long?, decimal>();
foreach (var emp in employee)
foreach (var emp in employee) // Irgendwo hier drin Fehler
{
ContractDC currentContract = null;
foreach (var c in emp.Contracts)
@@ -1097,7 +1101,11 @@ namespace BeWo.Report
}
}
if (currentContract != null)
{
if (currentContract.WeeklyTotalHours == null || currentContract.WeeklyDays == null)
continue;
stundenBeiAbwesenheit.Add(emp.EmployeeOid, currentContract.WeeklyTotalHours.Value / currentContract.WeeklyDays);
}
}
report.SetReportDataSource(RosterIstRO.Create(dienstEintraege, vertretungen, employee, opertionsService.GetAllDienste(wOid),