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

MH: SKM Aachen Pause in AZ Erfassung

Browse Source
This commit is contained in:
Marcel Hirschle
2023-10-19 15:10:24 +02:00
parent 9f8b545999
commit cd3061c173
1 changed files with 34 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
ReportImp/SKMAachen/CustomMitarbeiterstundenkontoBerechnung.cs
View File

@@ -17,10 +17,20 @@ namespace SKMAachen
public override MitarbeiterstundenkontoRO.DayDetail CreateDayDetail(DateTime date, MitarbeiterstundenkontoRO.EmployeeDetail ed)
{
var dd = base.CreateDayDetail(date, ed);
dd.MaxHoursUntilBreak = 6;
dd.MaxHoursUntilBreak2 = 9;
dd.BreakMinutes = 30;
dd.BreakMinutes2 = 15;
if (date.Date < new DateTime(2023, 09, 20)) //17.10.
{
dd.MaxHoursUntilBreak = 6;
dd.MaxHoursUntilBreak2 = 9;
dd.BreakMinutes = 30;
dd.BreakMinutes2 = 15;
}
else
{
dd.MaxHoursUntilBreak = null;
dd.MaxHoursUntilBreak2 = null;
dd.BreakMinutes = null;
dd.BreakMinutes2 = null;
}
return dd;
}
@@ -29,11 +39,21 @@ namespace SKMAachen
{
if (item.ServiceDescription != null && item.ServiceDescription.ServiceCategory != null)
{
if (item.ServiceDescription.ServiceCategory.Name == "Arbeitszeit")
if (item.Start.HasValue && item.Start.Value.Date < new DateTime(2023, 09, 20)) //17.10.
{
return true;
if (item.ServiceDescription.ServiceCategory.Name == "Arbeitszeit")
{
return true;
}
}
else
{
if (item.ServiceDescription.ServiceCategory.Name == "Arbeitszeit" && !item.ServiceDescription.Name.Contains("Pause"))
{
return true;
}
}
}
return false;
@@ -73,7 +93,13 @@ namespace SKMAachen
{
if (item.ServiceDescription.ServiceCategory.Name == "Arbeitszeit")
{
arbeitszeit += duration;
if (item.Start.HasValue && item.Start.Value.Date < new DateTime(2023, 09, 20)) //17.10.
arbeitszeit += duration;
else
{
if (!item.ServiceDescription.Name.Contains("Pause"))
arbeitszeit += duration;
}
}
else if (item.ServiceDescription.ServiceCategory.IsBillable)
{