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

Diverse Bugfixes, VacationService, Arbeitszeitmodul im Stundenkonto, Spitzabrechnung BfpDus

Browse Source
This commit is contained in:
Christian
2024-07-09 01:04:49 +02:00
parent 69b0f0553f
commit df68d4622b
21 changed files with 901 additions and 1002 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
Report/ReportObjects/MitarbeiterstundenkontoBerechnung.cs
View File

@@ -984,19 +984,14 @@ namespace BeWo.Report.ReportObjects
decimal duration = GetDuration(item, empDetail);
if (item.ServiceDescription != null && item.ServiceDescription.ServiceCategory != null)
{
if (item.ServiceDescription.ServiceCategory.Name == "Arbeitszeit")
{
arbeitszeit += duration;
}
else if (item.ServiceDescription.ServiceCategory.IsBillable)
{
flsGesamt += duration;
}
if (IstArbeitszeit(item))
{
arbeitszeit += duration;
}
else if (item.ServiceDescription != null && item.ServiceDescription.ServiceCategory != null && item.ServiceDescription.ServiceCategory.IsBillable)
{
flsGesamt += duration;
}
}
else if (AddServiceRecordToDuration(item))
{
@@ -2055,19 +2050,25 @@ namespace BeWo.Report.ReportObjects
{
if (Settings.ShowWorktime && Settings.EnableArbeitszeiterfassung)
{
if (item.ServiceDescription != null && item.ServiceDescription.ServiceCategory != null)
{
if (item.ServiceDescription.ServiceCategory.Name == "Arbeitszeit")
{
return true;
}
}
return false;
return IstArbeitszeit(item);
}
return true;
}
public virtual bool IstArbeitszeit(ServiceRecord item)
{
if (item.ServiceDescription != null && item.ServiceDescription.ServiceCategory != null)
{
if (item.ServiceDescription.Name.StartsWith("Arbeitszeit") || item.ServiceDescription.ServiceCategory.Name.StartsWith("Arbeitszeit")) //Arbeitszeit und Arbeitszeiterfassung etc.
{
return true;
}
}
return false;
}
public virtual decimal AddRateFactorToIst()
{
return 1;

18
Report/ReportObjects/MitarbeiterstundenkontoBerechnungTagesansicht.cs
View File

@@ -30,10 +30,20 @@ namespace BeWo.Report.ReportObjects
{
var dd = base.CreateDayDetail(date, ed);
dd.MaxHoursUntilBreak = null;
dd.MaxHoursUntilBreak2 = null;
dd.BreakMinutes = null;
dd.BreakMinutes2 = null;
if (Settings.ShowWorktime && Settings.EnableArbeitszeiterfassung)
{
ConfigurePauseSettings(dd);
}
else
{
//Alter Default
dd.MaxHoursUntilBreak = null;
dd.MaxHoursUntilBreak2 = null;
dd.BreakMinutes = null;
dd.BreakMinutes2 = null;
}
return dd;
}
}