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

cb, letzte Bugfixes vor Version

Browse Source
This commit is contained in:
Christian
2020-11-10 02:25:15 +01:00
parent 55afb28b52
commit 514c19ce3d
66 changed files with 815 additions and 830 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
Report/DefaultReportCreator.cs
View File

@@ -396,6 +396,10 @@ namespace BeWo.Report
switch (filterType)
{
case QBFilterEnum.AlleKlienten:
if (!nurFehlende)
{
return CreateServiceOverviewAllCustomersReport(month, year, orgaOid ?? 0, empOid ?? 0, serviceCategoryOid, startDay, endDay);
}
return CreateServiceOverviewAllCustomersReport(month, year, orgaOid ?? 0, empOid ?? 0, serviceCategoryOid, startDay, endDay, nurFehlende);
break;
case QBFilterEnum.NurKlientenMeinesTeams:
@@ -486,28 +490,46 @@ namespace BeWo.Report
teams.AddRange(DAOFactory.SearchDAO.FindTeamsOfEmployee(loggedInUser.Employee.Oid.Value));
}
//1. Mitarbeiter der Teams durchlaufen oder
//foreach (var team in teams)
//{
// foreach (var employee in team.MemberList)
// {
// foreach (var e2c in employee.Employee2CustomerList)
// {
// if (e2c.Customer.IsActive == ActivationTypeId.Active)
// {
// foreach (var v2o in e2c.ValueList)
// {
// if (v2o.Entry.Type == ValueListEntryType.StaffRoleType && v2o.Entry.SystemEntryID.HasValue && v2o.Entry.SystemEntryID.Value == SystemEntryID.EmployeeRoleMainAttendant)
// {
// if (!customerOids.Contains(e2c.Customer.Oid.Value))
// {
// customerOids.Add(e2c.Customer.Oid.Value);
// }
// }
// }
// }
// }
// }
//}
//2. Klienten der Teams durchlaufen oder
foreach (var team in teams)
{
foreach (var employee in team.MemberList)
var customers = DAOFactory.SearchDAO.FindCustomerOfTeam(team.Oid.Value);
foreach (var c in customers)
{
foreach (var e2c in employee.Employee2CustomerList)
if (c.IsActive == ActivationTypeId.Active)
{
if (e2c.Customer.IsActive == ActivationTypeId.Active)
if (!customerOids.Contains(c.Oid.Value))
{
foreach (var v2o in e2c.ValueList)
{
if (v2o.Entry.Type == ValueListEntryType.StaffRoleType && v2o.Entry.SystemEntryID.HasValue && v2o.Entry.SystemEntryID.Value == SystemEntryID.EmployeeRoleMainAttendant)
{
if (!customerOids.Contains(e2c.Customer.Oid.Value))
{
customerOids.Add(e2c.Customer.Oid.Value);
}
}
}
customerOids.Add(c.Oid.Value);
}
}
}
}