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

Merge branch 'master' of ssh://float.ownsoft.de/git/beyondSoft/BeWo

Browse Source
This commit is contained in:
Alexandra
2024-09-05 13:58:16 +02:00
parent 37a104f59f 7a81ca8c46
commit ff524d4343
24 changed files with 2056 additions and 4380 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
Report/ReportObjects/ServicesOverviewRO.cs
View File

@@ -1209,50 +1209,39 @@ namespace BeWo.Report.ReportObjects
atTemp.End = atDb.End;
atTemp.AbsenceReason = reasonTemp;
bool cont = !(atTemp.Start != null && atTemp.Start > span.EndDateTime);
bool addToList = (
!atTemp.AbsenceReason.Description.ToLower().Contains("urlaub") &&
atTemp.AbsenceReason.BillableMinutes.HasValue && atTemp.AbsenceReason.BillableMinutes.Value > 0);
if (cont && atTemp.End != null && atTemp.End < span.StartDateTime)
if (atTemp.Start.HasValue)
{
cont = false;
}
if (atTemp.AbsenceReason.Description.ToLower().Contains("urlaub"))
{
cont = false;
atTemp.Start = atTemp.Start.Value.AddDays(1);
}
if (cont && atTemp.AbsenceReason.BillableMinutes.HasValue && atTemp.AbsenceReason.BillableMinutes.Value > 0)
if (atTemp.End.HasValue)
{
if (atTemp.Start.HasValue)
{
atTemp.Start = atTemp.Start.Value.AddDays(1);
}
if (atTemp.End.HasValue)
{
atTemp.End = atTemp.End.Value.AddDays(-1);
}
atTemp.End = atTemp.End.Value.AddDays(-1);
}
if (cont)
// Prüfe ob Datum der Abwesenheit innerhalb des ausgewählten Belegzeitraums liegt
if (addToList && ((atTemp.End.HasValue && atTemp.End < span.StartDateTime) || (atTemp.Start.HasValue && atTemp.Start > span.EndDateTime)))
{
addToList = false;
}
if (addToList)
{
if (atTemp.Start.HasValue && atTemp.End.HasValue)
{
var td = atTemp.End.Value.Subtract(atTemp.Start.Value).TotalDays;
if (td < 0)
{
cont = false;
addToList = false;
}
}
}
if (cont)
if (addToList)
{
lResult.Abwesenheiten.Add(atTemp);
if (sb.Length > 0)
{