From 3c5aa46fc6672c0cb654f5b6871d5bdfa9efe822 Mon Sep 17 00:00:00 2001 From: Alexandra Date: Tue, 12 Jul 2022 11:43:32 +0200 Subject: [PATCH] Domiziel Ansbach --- .../Invoicing/CollectiveInvoiceCreation.cs | 62 +++++++++---------- .../Service/CustomOperationService.cs | 2 +- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/ReportImp/DomizielAnsbach/Invoicing/CollectiveInvoiceCreation.cs b/ReportImp/DomizielAnsbach/Invoicing/CollectiveInvoiceCreation.cs index 75ab9ce08..01e85f985 100644 --- a/ReportImp/DomizielAnsbach/Invoicing/CollectiveInvoiceCreation.cs +++ b/ReportImp/DomizielAnsbach/Invoicing/CollectiveInvoiceCreation.cs @@ -191,48 +191,48 @@ namespace DomizielAnsbach.Invoicing while (start <= ende) { - int tageAbwesendImMonat = 0; + //int tageAbwesendImMonat = 0; - foreach (var at in customer.AbsenceTimes) - { - DateTime? startAbw = at.Start; - DateTime? endMinusEinTag = at.End; - if (at.Start.HasValue && at.End.HasValue && at.End.Value.Date.Subtract(at.Start.Value.Date).TotalDays > 0) - { - endMinusEinTag = at.End.Value.AddDays(-1); - } - if (startAbw.HasValue && startAbw.Value < ende && (!endMinusEinTag.HasValue || endMinusEinTag.Value >= start)) - { - DateTime abwStart = at.Start.Value; - if (start > abwStart) - { - abwStart = start; - } + //foreach (var at in customer.AbsenceTimes) + //{ + // DateTime? startAbw = at.Start; + // DateTime? endMinusEinTag = at.End; + // if (at.Start.HasValue && at.End.HasValue && at.End.Value.Date.Subtract(at.Start.Value.Date).TotalDays > 0) + // { + // endMinusEinTag = at.End.Value.AddDays(-1); + // } + // if (startAbw.HasValue && startAbw.Value < ende && (!endMinusEinTag.HasValue || endMinusEinTag.Value >= start)) + // { + // DateTime abwStart = at.Start.Value; + // if (start > abwStart) + // { + // abwStart = start; + // } - DateTime abwEnd = ende.AddDays(-1); - if (endMinusEinTag.HasValue && endMinusEinTag < ende) - { - abwEnd = endMinusEinTag.Value; - } + // DateTime abwEnd = ende.AddDays(-1); + // if (endMinusEinTag.HasValue && endMinusEinTag < ende) + // { + // abwEnd = endMinusEinTag.Value; + // } - DateTime dt = abwStart; + // DateTime dt = abwStart; - while (dt <= abwEnd) - { - tageAbwesendImMonat++; - dt = dt.AddDays(1); - } - } - } + // while (start <= ende) + // { + // tageAbwesendImMonat++; + // dt = dt.AddDays(1); + // } + // } + //} var ii = new InvoiceItem(); - if (tageAbwesendImMonat == 0 && accountingPeriodStart.Value == start && accountingPeriodEnd.Value == ende) + if (accountingPeriodStart.Value == start && accountingPeriodEnd.Value == ende) { ii.AmountTotal = monatssatz; } else { - ii.UnitCount = tageMonat - tageAbwesendImMonat; + ii.UnitCount = tageMonat; ii.AmountPerUnit = monatssatz; ii.AmountTotal = ii.UnitCount * Convert.ToDecimal(tagessatz); ii.GrossAmountTotal = ii.AmountTotal; diff --git a/ReportImp/DomizielAnsbach/Service/CustomOperationService.cs b/ReportImp/DomizielAnsbach/Service/CustomOperationService.cs index 449fcbd72..3ad070a06 100644 --- a/ReportImp/DomizielAnsbach/Service/CustomOperationService.cs +++ b/ReportImp/DomizielAnsbach/Service/CustomOperationService.cs @@ -50,7 +50,7 @@ namespace DomizielAnsbach.Service { var desc = DAOFactory.SearchDAO.FindServiceDescriptionForCategory(ap.ServiceCategory.Oid.Value); - standardLeistung = desc.Where(a => a.Name == "Arbeitszeit").First(); + standardLeistung = desc.Where(a => a.Name == "Beschäftigungszeit").First(); pausenLeistung = desc.Where(a => a.Name == "Pause").First(); } }