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

MitarbeiterstundenkontoBerechnung GetDuration in Report.dll und ein paar Projekten

Browse Source
This commit is contained in:
Alexandra
2023-11-01 16:13:22 +01:00
parent 0f3733a245
commit 25e7646ab1
6 changed files with 179 additions and 403 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ReportImp/SHKService/CustomMitarbeiterstundenkontoBerechnung.cs
View File

@@ -50,7 +50,7 @@ namespace SHKService
{
//if (AddServiceRecordToDuration(item))
//{
var duration = GetDuration(item);
var duration = GetDuration(item, empDetail);
if (item.ServiceDescription != null &&
item.ServiceDescription.ServiceCategory != null)
@@ -96,7 +96,7 @@ namespace SHKService
{
if (sr.Start.HasValue && sr.Start >= berichtStart && sr.Start < berichtEnde && sr.End.HasValue && sr.Start.Value.Day == dd.Date.Day)
{
decimal duration = GetDuration(sr);
decimal duration = GetDuration(sr, ed);
if (sr.ServiceDescription.Name == "Pause")
{
@@ -129,9 +129,9 @@ namespace SHKService
return list;
}
protected override decimal GetDuration(ServiceRecord sr)
protected override decimal GetDuration(ServiceRecord sr, MitarbeiterstundenkontoRO.EmployeeDetail ed)
{
var d = base.GetDuration(sr);
var d = base.GetDuration(sr, ed);
if (sr.ServiceDescription.ServiceCategory.Name == "Arbeitszeit" && sr.ServiceDescription.Name == "Zeitabzug")
{