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

Domiziel Ansbach

Browse Source
This commit is contained in:
Alexandra
2022-07-12 11:43:32 +02:00
parent 9a2b2f7744
commit 3c5aa46fc6
2 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
ReportImp/DomizielAnsbach/Invoicing/CollectiveInvoiceCreation.cs
View File

@@ -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;

2
ReportImp/DomizielAnsbach/Service/CustomOperationService.cs
View File

@@ -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();
}
}