Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/BeWo
This commit is contained in:
@@ -17,6 +17,86 @@ namespace KetteReports.Invoicing
|
||||
{
|
||||
public class CustomInvoiceCreation : InvoiceCreation
|
||||
{
|
||||
public override IList<InvoiceItem> CreateInvoiceItems(List<ServiceRecordDC> serviceRecordsInPeriod, DateTimeSpan invoicePeriod, SupportConceptApprovalPeriod scap, Calculations calc)
|
||||
{
|
||||
CompactCustomerDC c = new CompactCustomerDC();
|
||||
if (serviceRecordsInPeriod.Count > 0)
|
||||
c = serviceRecordsInPeriod[0].Customer;
|
||||
|
||||
ServiceRecordDC lastSR = null;
|
||||
var list = new List<InvoiceItem>();
|
||||
serviceRecordsInPeriod = serviceRecordsInPeriod.OrderBy(sr => sr.Start).ToList();
|
||||
foreach (ServiceRecordDC iServiceRecord in serviceRecordsInPeriod)
|
||||
{
|
||||
if (iServiceRecord.ServiceDescription.Category.IsBillable)
|
||||
{
|
||||
//Wenn eine Lücke zwischen dem letzten Item und dem aktuellen existiert, ersten und letzten Tag der Lücke setzen und
|
||||
// bei jedem Tag prüfen, ob es eine Abwesenheit für Customer c gibt und wenn ja, ein Item erzeugen, was den 0.75-Faktor hat
|
||||
// Das wird solange gemacht, bis die komplette Lücke geschlossen ist, also bis für jeden Abwesenheitstag ein Eintrag mit Faktor da ist
|
||||
if (lastSR != null && lastSR.Start.Value.Date.AddDays(1) < iServiceRecord.Start.Value.Date && (iServiceRecord.ServiceDescription.Category.Name == "GW" || iServiceRecord.ServiceDescription.Category.Name == "GW BuHi"))
|
||||
{
|
||||
var lueckeStart = lastSR.Start.Value.AddDays(1);
|
||||
var lueckeEnd = iServiceRecord.Start.Value.AddDays(-1);
|
||||
while (lueckeStart <= lueckeEnd)
|
||||
{
|
||||
foreach (var abs in c.AbsenceTimes)
|
||||
{
|
||||
InvoiceItem invoiceItem = CheckForAbsenceTime(abs, lueckeStart, lastSR, scap, calc);
|
||||
if (invoiceItem != null && !list.Any(item => item.ItemPeriodStart.Value.Date == invoiceItem.ItemPeriodStart.Value.Date && item.ServiceRecord.ServiceDescription.ServiceCategory.Name.ToLower().Contains("gw")))
|
||||
list.Add(invoiceItem);
|
||||
lastSR.Start = lueckeStart;
|
||||
lastSR.End = new DateTime(lueckeStart.Year, lueckeStart.Month, lueckeStart.Day, lastSR.End.Value.Hour,
|
||||
lastSR.End.Value.Minute, lastSR.End.Value.Second);
|
||||
}
|
||||
|
||||
lueckeStart = lueckeStart.AddDays(1);
|
||||
}
|
||||
}
|
||||
if (!iServiceRecord.AlreadyAccounted)
|
||||
{
|
||||
if (iServiceRecord.ServiceDescription.Category.Name == "GW" || iServiceRecord.ServiceDescription.Category.Name == "GW BuHi")
|
||||
{
|
||||
var ii = CreateInvoiceItem(iServiceRecord, scap, calc);
|
||||
if (ii != null)
|
||||
{
|
||||
if (!list.Any(item => item.ItemPeriodStart.Value.Date == ii.ItemPeriodStart.Value.Date && item.ServiceRecord.ServiceDescription.ServiceCategory.Name.ToLower().Contains("gw")))
|
||||
{
|
||||
list.Add(ii);
|
||||
iServiceRecord.AlreadyAccounted = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
InvoiceItem invoiceItem = CreateInvoiceItem(iServiceRecord, scap, calc);
|
||||
if (invoiceItem != null)
|
||||
list.Add(invoiceItem);
|
||||
|
||||
iServiceRecord.AlreadyAccounted = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
lastSR = iServiceRecord;
|
||||
}
|
||||
|
||||
return CreateSummaryInvoiceItems(list, invoicePeriod, scap, calc);
|
||||
}
|
||||
|
||||
private InvoiceItem CheckForAbsenceTime(AbsenceTimeDC abs, DateTime datum, ServiceRecordDC lastSR, SupportConceptApprovalPeriod scap, Calculations calc)
|
||||
{
|
||||
if (abs.AbsenceSpan.ContainsDate(datum))
|
||||
{
|
||||
var abwesenheitsSR = lastSR;
|
||||
abwesenheitsSR.Start = datum;
|
||||
abwesenheitsSR.End = new DateTime(datum.Year, datum.Month, datum.Day, lastSR.End.Value.Hour,
|
||||
lastSR.End.Value.Minute, lastSR.End.Value.Second);
|
||||
InvoiceItem invoiceItem = CreateInvoiceItem(abwesenheitsSR, scap, calc);
|
||||
|
||||
return invoiceItem;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
public override InvoiceItem CreateInvoiceItem(ServiceRecordDC iServiceRecord, SupportConceptApprovalPeriod scap, Calculations calc)
|
||||
{
|
||||
var ii = base.CreateInvoiceItem(iServiceRecord, scap, calc);
|
||||
|
||||
Reference in New Issue
Block a user