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

BeWoDarmstadt/Zeitzuschlagsbeleg und Teamuebersicht Nacharbeiten

Browse Source
This commit is contained in:
Alexandra
2024-02-27 09:19:11 +01:00
parent 3a59c92a88
commit 557e6d460f
4 changed files with 34 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
ReportImp/BeWoDarmstadt/CustomMitarbeiterstundenkontoBerechnung.cs
View File

@@ -1,5 +1,6 @@
using BeWo.Data.Entities;
using BeWo.Report.ReportObjects;
using BS.Shared.Core;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -40,7 +41,6 @@ namespace BeWoDarmstadt
{
var edTotal = base.BerechneUeberstundenBis(edOrig, records, monat, out ueberstunden, out alteExtraUeberstunden);
edOrig.Custom15 = -fls;
// edOrig.Custom6 = ausgezahlte;
return edTotal;
}
@@ -80,5 +80,31 @@ namespace BeWoDarmstadt
return flsSollImVertragsUndBerichtzeitraum;
}
}
public override void CalculateAbsenceTimesForDay(MitarbeiterstundenkontoRO.DayDetail dd, MitarbeiterstundenkontoRO.EmployeeDetail ed)
{
base.CalculateAbsenceTimesForDay(dd, ed);
if (dd.AbsenceTimes != null)
{
foreach (var at in dd.AbsenceTimes)
{
if (dd.HoursInVacation == 0)
{
if (dd.HoursSick == 0 && !String.IsNullOrEmpty(at.AbsenceReason.Description) && at.AbsenceReason.Description.ToLower().Contains("fortbildung"))
{
dd.Custom6 = "F";
}
else if (!String.IsNullOrEmpty(at.AbsenceReason.Description) && at.AbsenceReason.Description.ToLower().Contains("kindkrank"))
{
dd.Custom6 = "kk";
}
else if (dd.HoursSick == 0)
{
dd.Custom6 = "A";
}
}
}
}
}
}
}

5
ReportImp/BeWoDarmstadt/CustomReportCreator.cs
View File

@@ -96,8 +96,9 @@ namespace BeWoDarmstadt
if (qro.Rows.Count > 0)
{
DateTime start = DateTime.Parse(qro.Rows[0].Field1.ToString());
DateTime end = start.AddMonths(1).AddDays(-1);
DateTime param = DateTime.Parse(qro.Rows[0].Field1.ToString());
DateTime start = new DateTime(param.Year, 1, 1);
DateTime end = param.AddMonths(1).AddDays(-1);
var ro = FinanceRO.Create(start, end);
var druck = new Teamuebersicht();

2
ReportImp/BeWoDarmstadt/Teamuebersicht.designer.cs generated
View File

@@ -304,7 +304,7 @@ namespace BeWoDarmstadt
this.lblTitel.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblTitel.SizeF = new System.Drawing.SizeF(652.9166F, 23F);
this.lblTitel.StylePriority.UseFont = false;
this.lblTitel.Text = "Monatsübersicht je Team für [ReportStartDate!MMMM] [ReportStartDate!yyyy] ";
this.lblTitel.Text = "Monatsübersicht je Team für [ReportEndDate!MMMM] [ReportEndDate!yyyy] ";
//
// DetailReport
//

2
ReportImp/BeWoDarmstadt/Zeitzuschlagsbeleg.cs
View File

@@ -377,6 +377,8 @@ namespace BeWoDarmstadt
AddAbwesenheitToCell(day.Date, "K");
else if (day.HoursInVacation > 0)
AddAbwesenheitToCell(day.Date, "U");
else if (day.Custom6 != null)
AddAbwesenheitToCell(day.Date, day.Custom6);
}
}