Berechnung der Frei/Woche in der Auslastung korrigiert, wenn HP abgelaufen
This commit is contained in:
@@ -297,7 +297,7 @@ namespace BeWo.Report.ReportObjects
|
||||
if (id.HasValue && id.Value == SystemEntryID.EmployeeRoleMainAttendant)
|
||||
isMainAttendant = true;
|
||||
}
|
||||
if (isMainAttendant && e2c.Customer != null)
|
||||
if (isMainAttendant && e2c.Customer != null && (!e2c.StartDate.HasValue || e2c.StartDate.Value.Date < ro.ReportEndDate.Date) && (!e2c.EndDate.HasValue || e2c.EndDate.Value.Date >= ro.ReportStartDate))
|
||||
{
|
||||
if (e2c.Customer.IsActive != ActivationTypeId.Deleted && e2c.Customer.SupportConcepts != null)
|
||||
{
|
||||
@@ -393,7 +393,7 @@ namespace BeWo.Report.ReportObjects
|
||||
var EndDate = DateTime.Now;
|
||||
if (ende < EndDate)
|
||||
{
|
||||
EndDate = ende.AddMilliseconds(-1);
|
||||
EndDate = ende; // ende.AddMilliseconds(-1);
|
||||
}
|
||||
// "Frei pro Woche" aus der Zeiterfassungsstatistik hinzufügen
|
||||
var stats = new ServiceRecordStatisticFactory().CreateSupportConceptStatisticsImpl(cb2sc.Oid.Value, EndDate);
|
||||
|
||||
Reference in New Issue
Block a user