HausDuelken/CustomMitarbeiterstundenkontoBerechnung - Behandlung LT24 und Mehrfachbuchungen
This commit is contained in:
@@ -42,7 +42,7 @@ namespace HausDuelken
|
||||
|
||||
var sum = new ServiceRecordSummary();
|
||||
sum.RecordsImBerichtszeitraum = new List<ServiceRecord>();
|
||||
//base.CorrectOverlappingTimes(groupFilteredRecords);
|
||||
base.CorrectOverlappingTimes(groupFilteredRecords);
|
||||
|
||||
foreach (var item in groupFilteredRecords)
|
||||
{
|
||||
@@ -71,7 +71,7 @@ namespace HausDuelken
|
||||
{
|
||||
arbeitszeit += duration;
|
||||
}
|
||||
else if (item.ServiceDescription.ServiceCategory.IsBillable)
|
||||
else if (item.ServiceDescription.ServiceCategory.IsBillable || item.ServiceDescription.ServiceCategory.Abbreviation.ToLower() == "lt24")
|
||||
{
|
||||
flsGesamt += duration;
|
||||
}
|
||||
@@ -88,6 +88,19 @@ namespace HausDuelken
|
||||
return sum;
|
||||
}
|
||||
|
||||
public override bool CorrectOverlappingTime(ServiceRecord newRecord)
|
||||
{
|
||||
if (newRecord.ServiceDescription != null && newRecord.ServiceDescription.ServiceCategory != null)
|
||||
{
|
||||
if (newRecord.ServiceDescription.ServiceCategory.Abbreviation.ToLower() == "lt24")
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
public override void HandleServiceRecord(MitarbeiterstundenkontoRO.EmployeeDetail emp, ServiceRecord item)
|
||||
{
|
||||
if (item.ServiceDescription != null && item.ServiceDescription.ServiceCategory != null)
|
||||
|
||||
Reference in New Issue
Block a user