diff --git a/BeWo/LockedPage.xaml b/BeWo/LockedPage.xaml
index 7d5e0bdff..5927ff440 100644
--- a/BeWo/LockedPage.xaml
+++ b/BeWo/LockedPage.xaml
@@ -44,7 +44,7 @@
-
+
diff --git a/BeWo/View/Detail/MassnahmenTreeViewView.xaml b/BeWo/View/Detail/MassnahmenTreeViewView.xaml
index f13d7832b..a745bd193 100644
--- a/BeWo/View/Detail/MassnahmenTreeViewView.xaml
+++ b/BeWo/View/Detail/MassnahmenTreeViewView.xaml
@@ -82,8 +82,8 @@
-
-
+
+
diff --git a/BeWo/View/Detail/MassnahmenTreeViewView.xaml.cs b/BeWo/View/Detail/MassnahmenTreeViewView.xaml.cs
index 22601de52..704f6ce8a 100644
--- a/BeWo/View/Detail/MassnahmenTreeViewView.xaml.cs
+++ b/BeWo/View/Detail/MassnahmenTreeViewView.xaml.cs
@@ -74,7 +74,7 @@ namespace BeWo.View.Detail
public ObservableSortCollection GoalTree { get; private set; }
public override bool IsDirty => ViewModel != null && ViewModel.IsDirty || (_History?.GotChanges ?? false);
- public static bool IsAllowedToEditGoals => BeWoApp.LoggedOnUser.HasRight(UserRightType.SupportConcept_AllowEditGoals);
+ public static bool IsAllowedToEditGoals => BeWoApp.LoggedOnUser.HasRight(UserRightType.AdministrationView_Edit);
public GenericValueListEntryListVM ViewModel
{
diff --git a/BeWoPlanerMobil/BeWoPlanerMobil.csproj.user b/BeWoPlanerMobil/BeWoPlanerMobil.csproj.user
index 359c270c6..19e97f07a 100644
--- a/BeWoPlanerMobil/BeWoPlanerMobil.csproj.user
+++ b/BeWoPlanerMobil/BeWoPlanerMobil.csproj.user
@@ -8,7 +8,7 @@
- Debug|Any CPU
+ Release|Any CPU
ShowAllFiles
600
MvcControllerEmptyScaffolder
diff --git a/Report/ReportObjects/MitarbeiterstundenkontoBerechnung.cs b/Report/ReportObjects/MitarbeiterstundenkontoBerechnung.cs
index 6b9a606a5..0c1f1461a 100644
--- a/Report/ReportObjects/MitarbeiterstundenkontoBerechnung.cs
+++ b/Report/ReportObjects/MitarbeiterstundenkontoBerechnung.cs
@@ -140,6 +140,7 @@ namespace BeWo.Report.ReportObjects
decimal workdaysTotal = 0;
decimal stundenSollGesamt = 0;
decimal tatSollStdGesamt = 0;
+ decimal azDurchFeiertage = 0;
IList groupFilteredRecords = empDetail.AllServiceRecords;
@@ -301,6 +302,7 @@ namespace BeWo.Report.ReportObjects
}
}
+
var ath2 = GetAbwesenheitenDurchServiceRecords(empDetail, c, groupFilteredRecords, berichtsAnfang, berichtsEnde);
@@ -349,6 +351,13 @@ namespace BeWo.Report.ReportObjects
flsSollGesamt += BerechneFlsSoll(emp, c, berichtsAnfang, berichtsEnde, tatSollStdImVertragsUndBerichtzeitraum, stundenSollProMonat);
+ if (ath.StundenAlsIst > 0)
+ {
+ tatSollStdGesamt += ath.StundenAlsIst;
+ summaryTotal.IstNichtAbrechenbar += ath.StundenAlsIst * 60;
+ }
+
+ azDurchFeiertage += BerechneGesamtArbeitszeitDurchFeiertage(empDetail, berichtsAnfang, berichtsEnde);
berichtsAnfang = berichtsEnde;
@@ -399,6 +408,8 @@ namespace BeWo.Report.ReportObjects
empDetail.StundenGesamtIst -= pause1/60;
empDetail.StundenGesamtIst -= pause2/60;
+ empDetail.StundenGesamtIst += azDurchFeiertage;
+
if (empDetail.FlsSoll != 0)
empDetail.RelationIstSoll = (empDetail.FlsIst/empDetail.FlsSoll)*100m;
@@ -455,6 +466,7 @@ namespace BeWo.Report.ReportObjects
ro.EmployeeDetailList = FilterEmployeeList(ro.EmployeeDetailList);
}
+
#region Ist-Berechnung für Dienstplanung
public decimal BerechneDienstplanIst(MitarbeiterstundenkontoRO.EmployeeDetail empDetail, List eintraege, List vertretungen, DateTime monat, out decimal? ueberstunden, out decimal? alteExtraUeberstunden) // ABCDEF
{
@@ -545,16 +557,19 @@ namespace BeWo.Report.ReportObjects
MitarbeiterstundenkontoRO.EmployeeDetail ed = new MitarbeiterstundenkontoRO.EmployeeDetail();
ed.SollProTag = weeklyTotalHours / arbeitstageProWoche;
+ ed.ArbeitstageProWoche = arbeitstageProWoche;
+ ed.ArbeitstageImBerichtszeitraum = arbeitstage;
+ ed.SollProWoche = BerechneSollProWoche(c, ed);
+ ed.Employee = emp;
+ ed.StundenSollMax = sollMitarbeiter;
+
AktuellBearbeitetesEmployeeDetail = ed;
var ath = GetAbsenceTimeDaysWithWorkWeeks(emp, start, ende, arbeitstageProWoche);
- ed.ArbeitstageProWoche = arbeitstageProWoche;
- ed.ArbeitstageImBerichtszeitraum = arbeitstage;
- ed.SollProWoche = BerechneSollProWoche(c, ed);
+
ed.AbsenceTimeDays = ath;
- ed.Employee = emp;
- ed.StundenSollMax = sollMitarbeiter;
+
if (ath.TageGesamt.HasValue)
{
@@ -987,10 +1002,6 @@ namespace BeWo.Report.ReportObjects
else
sum.IstNichtAbrechenbar += duration;
- if (duration > 0)
- {
- int test2 = 0;
- }
}
sum.RecordsImBerichtszeitraum.Add(item);
}
@@ -1501,6 +1512,32 @@ namespace BeWo.Report.ReportObjects
protected virtual decimal GetDuration(ServiceRecord sr, MitarbeiterstundenkontoRO.EmployeeDetail ed)
{
+ if (!StundenBeiAbwesenheitenBerechnen())
+ {
+ foreach (var at in ed.Employee.AbsenceTimes)
+ {
+ DateTime start = DateTime.MinValue;
+ DateTime end = DateTime.MaxValue;
+
+ if (at.Start.HasValue)
+ {
+ start = at.Start.Value;
+ }
+ if (at.End.HasValue)
+ {
+ end = at.End.Value;
+ if (end.Hour == 0)
+ {
+ end = end.AddDays(1);
+ }
+ }
+
+ if (start <= sr.Start && sr.Start < end)
+ {
+ return 0;
+ }
+ }
+ }
decimal duration = 0;
if (sr.GroupRoundedDuration.HasValue)
@@ -1549,6 +1586,7 @@ namespace BeWo.Report.ReportObjects
return duration;
}
+ //Mit "SpecialHours" sind Sonderzeiten wie Nachtzeiten oder Arbeitszeiten an Sonn und Feiertags gemeint. Da diese gesondert abgerechnet werden können.
public virtual void CalculateSpecialHours(MitarbeiterstundenkontoRO.DayDetail dd, ServiceRecord sr, decimal duration)
{
if (sr.Start.Value.DayOfWeek == DayOfWeek.Sunday)
@@ -1641,7 +1679,7 @@ namespace BeWo.Report.ReportObjects
dd.BreakMinutes = 30;
CalculateAbsenceTimesForDay(dd, ed);
- if (date.Year == 2023 && date.Month == 10 && date.Day == 2)
+ if (date.Year == 2023 && date.Month == 10 && date.Day == 3)
{
int test = 0;
}
@@ -1649,6 +1687,13 @@ namespace BeWo.Report.ReportObjects
BerechneSollStundenFuerDayDetail(ed, dd);
+ if (BerechneFeiertageAlsArbeitszeit())
+ {
+ if (dd.Feiertag != null)
+ {
+ dd.MinutesTotal = dd.SollStunden * 60;
+ }
+ }
return dd;
}
@@ -1674,7 +1719,13 @@ namespace BeWo.Report.ReportObjects
{
decimal sollDiesenTag = 0;
var faktor = GetFeiertagsFaktor(date);
-
+ if (BerechneFeiertageAlsArbeitszeit())
+ {
+ if (faktor == 1)
+ {
+ faktor = 0;
+ }
+ }
if (faktor < 1)
{
//Berechne Soll, entweder aus Vertrag oder Arbeitszeiten
@@ -1818,10 +1869,13 @@ namespace BeWo.Report.ReportObjects
//Dauer der Abwesenheit = Soll an diesem Tag
+ bool istGanztaegig = true;
var abwesenheitsDauer = sollDiesenTag;
if (span.StartDate.Hour > 0 && span.EndDate.Hour > 0)
{
+ istGanztaegig = false;
+
var ts = span.EndDate.Subtract(span.StartDate);
abwesenheitsDauer = (decimal)ts.TotalHours;
if (SchneideZuvieleAbwesenheitsstundenAb() && abwesenheitsDauer > sollDiesenTag)
@@ -1875,21 +1929,26 @@ namespace BeWo.Report.ReportObjects
}
-
- if (IsUrlaubAbsenceTime(absenceTime))
+ if (!AbsenceTimeAufIstStundenAddieren(absenceTime) && IsUrlaubAbsenceTime(absenceTime))
{ // Vermutlich diese Methode in CustomMitarbeiterStundenKontoBerechnung überschreiben und hier Prüfung machen, ob absenceReason ohne Fortzahlung ist
//und wenn ja, HoursSick oder Soll oder so für den Tag auf 0 setzen
dd.HoursInVacation = abwesenheitsDauer;
}
- else if (IsKrankheitAbsenceTime(absenceTime))
+ else if (!AbsenceTimeAufIstStundenAddieren(absenceTime) && IsKrankheitAbsenceTime(absenceTime))
{
dd.HoursSick = abwesenheitsDauer;
}
else
{
+ if (istGanztaegig)
+ {
+ //Bei ganztägigen Abwesenheiten darf nicht noch zusätzlich gearbeitet werden
+ dd.MinutesTotal = 0;
+ }
dd.MinutesTotal += abwesenheitsDauer * 60;
}
+
if (dd.AbsenceTimes == null)
{
dd.AbsenceTimes = new List();
@@ -2061,8 +2120,16 @@ namespace BeWo.Report.ReportObjects
MitarbeiterstundenkontoRO.EmployeeDetail ed = new MitarbeiterstundenkontoRO.EmployeeDetail();
ed.SollProTag = weeklyTotalHours / arbeitstageProWoche;
+ ed.ArbeitstageProWoche = arbeitstageProWoche;
+ ed.ArbeitstageImBerichtszeitraum = arbeitstage;
+ ed.SollProWoche = BerechneSollProWoche(c, ed);
+
+ ed.Employee = emp;
+
AktuellBearbeitetesEmployeeDetail = ed;
var ath = GetAbsenceTimeDaysWithWorkWeeks(emp, start, ende, arbeitstageProWoche);
+ ed.AbsenceTimeDays = ath;
+
decimal? fehlzeit = GetFehlzeiten(records, start, ende);
if (fehlzeit.HasValue)
@@ -2071,13 +2138,6 @@ namespace BeWo.Report.ReportObjects
}
-
-
- ed.ArbeitstageProWoche = arbeitstageProWoche;
- ed.ArbeitstageImBerichtszeitraum = arbeitstage;
- ed.SollProWoche = BerechneSollProWoche(c, ed);
- ed.AbsenceTimeDays = ath;
- ed.Employee = emp;
ed.StundenSollMax = sollMitarbeiter;
@@ -2125,9 +2185,11 @@ namespace BeWo.Report.ReportObjects
}
-
- decimal stundenMonat = minutenMonat/60m;
+ var azDurchFeiertage = BerechneGesamtArbeitszeitDurchFeiertage(ed, start, ende);
+ sollMitarbeiter -= azDurchFeiertage;
+
+ decimal stundenMonat = minutenMonat/60m;
stundenMonat = ((flsIst*AddRateFactorToIst()) + mittelbarIst)/60m;
@@ -2244,10 +2306,10 @@ namespace BeWo.Report.ReportObjects
return BerechneStundenDurchAbwesenheitenAlt(ath, start, ende, c, ed);
}
- if (ath.StundenGesamt.HasValue)
- {
- return ath.StundenGesamt.Value;
- }
+ //if (ath.StundenGesamt.HasValue)
+ //{
+ // return ath.StundenGesamt.Value;
+ //}
decimal stunden = 0;
@@ -2818,7 +2880,17 @@ namespace BeWo.Report.ReportObjects
}
atd.TageProWocheDict = new Dictionary();
- foreach (var week in weeks)
+ atd.StundenProTagDict = new Dictionary();
+
+ DateTime idt = start;
+ while (idt < end)
+ {
+ atd.StundenProTagDict.Add(idt.Date, 0);
+
+ idt = idt.AddDays(1);
+ }
+
+ foreach (var week in weeks)
{
atd.TageProWocheDict.Add(week, 0);
}
@@ -2910,6 +2982,11 @@ namespace BeWo.Report.ReportObjects
stunden += std;
+ if (AbsenceTimeAufIstStundenAddieren(item))
+ {
+ atd.TageAlsIst += tag;
+ atd.StundenAlsIst += sollAmTag ?? 0;
+ }
if (IsKrankheitAbsenceTime(item))
{
if (!atd.TageKrankheit.HasValue)
@@ -2959,9 +3036,153 @@ namespace BeWo.Report.ReportObjects
return atd;
}
-
- public virtual AbsenceTimeDays GetAbsenceTimeDays(IList absenceTimes, DateTime start, DateTime end)
+ public virtual AbsenceTimeDays GetAbsenceTimeDaysWithWorkWeeksAlt(IList absenceTimes, DateTime start, DateTime end, int arbeitstageProWoche)
+ {
+ var atd = new AbsenceTimeDays();
+ var totalSpan = new DateTimeSpan();
+ totalSpan.StartDate = start;
+ totalSpan.EndDate = end.AddDays(-1);
+
+ var weeks = totalSpan.GetWeeks(true, false);
+ if (BerechneAlteAbwesenheitsStunden(start))
+ {
+ totalSpan.EndDate = end;
+
+ weeks = totalSpan.GetWholeWeeks();
+ }
+
+ atd.TageProWocheDict = new Dictionary();
+ foreach (var week in weeks)
+ {
+ atd.TageProWocheDict.Add(week, 0);
+ }
+ decimal? tage = null;
+ if (absenceTimes != null)
+ {
+ foreach (var item in absenceTimes)
+ {
+ if (IstAnrechenbareAbsenceTime(item))
+ {
+ DateTimeSpan span = new DateTimeSpan();
+
+ span.StartDate = start;
+
+ if (item.Start.HasValue && item.Start.Value > span.StartDate)
+ {
+ span.StartDate = item.Start.Value;
+ }
+
+ span.EndDate = end;
+ if (item.End.HasValue && item.End.Value.Date.AddDays(1) < span.EndDate)
+ {
+ span.EndDate = item.End.Value.Date.AddDays(1);
+ }
+
+ if (span.EndDate >= start && span.StartDate < end)
+ {
+ DateTime day = span.StartDate;
+ while (day < end && day < span.EndDate)
+ {
+
+
+ var faktor = GetFeiertagsFaktor(day);
+ bool istWochenende =
+ day.DayOfWeek == DayOfWeek.Saturday || day.DayOfWeek == DayOfWeek.Sunday;
+ if (arbeitstageProWoche == 6)
+ {
+ istWochenende = day.DayOfWeek == DayOfWeek.Sunday;
+ }
+ else if (arbeitstageProWoche > 6)
+ {
+ istWochenende = false;
+ }
+
+ if (faktor < 1 && !istWochenende)
+ {
+
+ if (!tage.HasValue)
+ tage = 0;
+
+ var tag = 1m;
+ var std = 24m;
+
+ if (item.Start.HasValue && item.End.HasValue && item.Start.Value.Date == item.End.Value.Date &&
+ item.Start.Value.Hour > 0)
+ {
+ if (AktuellBearbeitetesEmployeeDetail != null)
+ {
+ faktor = 1;
+ decimal hours = (decimal)item.End.Value.Subtract(item.Start.Value).TotalHours;
+
+ var sollAmTag = AktuellBearbeitetesEmployeeDetail.SollProTag;
+
+ if (SchneideZuvieleAbwesenheitsstundenAb() && hours > sollAmTag)
+ {
+ hours = sollAmTag;
+ }
+
+ if (sollAmTag > 0)
+ {
+ tag = hours / sollAmTag;
+ std = tag * 24;
+ }
+ }
+
+ }
+
+
+ if (faktor != 0)
+ {
+ tag *= faktor;
+ std *= faktor;
+ }
+
+
+ tage += std;
+
+ if (IsKrankheitAbsenceTime(item))
+ {
+ if (!atd.TageKrankheit.HasValue)
+ atd.TageKrankheit = 0;
+
+ atd.TageKrankheit += tag;
+ }
+
+ if (IsUrlaubAbsenceTime(item))
+ {
+ if (!atd.TageUrlaub.HasValue)
+ atd.TageUrlaub = 0;
+
+ atd.TageUrlaub += tag;
+ }
+
+ foreach (var week in weeks)
+ {
+ if (day >= week.StartDate && day <= week.EndDate)
+ {
+ if (atd.TageProWocheDict.ContainsKey(week))
+ {
+ atd.TageProWocheDict[week] += 1;
+ }
+ }
+ }
+ }
+
+ day = day.AddDays(1);
+ }
+
+ }
+ }
+ }
+ }
+ if (tage.HasValue)
+ tage /= 24;
+ atd.TageGesamt = tage;
+ return atd;
+ }
+
+ public virtual AbsenceTimeDays GetAbsenceTimeDays(IList absenceTimes, DateTime start, DateTime end)
{
return GetAbsenceTimeDaysWithWorkWeeks(absenceTimes, start, end, ANZ_WOCHENTAGE);
}
@@ -3073,9 +3294,10 @@ namespace BeWo.Report.ReportObjects
}
else
{
- maxDays -= GetFeiertagsFaktor(start);
- //if (IstFeiertag(start))
- // maxDays--;
+ if (!BerechneFeiertageAlsArbeitszeit())
+ {
+ maxDays -= GetFeiertagsFaktor(start);
+ }
}
start = start.AddDays(1);
}
@@ -3132,6 +3354,7 @@ namespace BeWo.Report.ReportObjects
protected DateTime GetOsterSonntag(int year)
{
return VacationService.GetOsterSonntag(year);
+ return VacationService.GetOsterSonntag(year);
}
public virtual bool IsServiceRecordFehlzeit(ServiceRecord sr)
@@ -3140,6 +3363,39 @@ namespace BeWo.Report.ReportObjects
return true;
return false;
}
+
+ public virtual bool BerechneFeiertageAlsArbeitszeit()
+ {
+ return false;
+ }
+
+ public virtual bool AbsenceTimeAufIstStundenAddieren(AbsenceTime at)
+ {
+ return false;
+ }
+
+ public virtual bool StundenBeiAbwesenheitenBerechnen()
+ {
+ return true;
+ }
+
+ public virtual decimal BerechneGesamtArbeitszeitDurchFeiertage(MitarbeiterstundenkontoRO.EmployeeDetail ed, DateTime start, DateTime ende)
+ {
+ decimal az = 0;
+ if (BerechneFeiertageAlsArbeitszeit() && ed.Employee.IsActive == ActivationTypeId.Active)
+ {
+ DateTime dt = start;
+ while (dt <= ende)
+ {
+ if (GetFeiertagsFaktor(dt) > 0)
+ {
+ az += BerechneSollStundenFuerTag(ed, dt);
+ }
+ dt = dt.AddDays(1);
+ }
+ }
+ return az;
+ }
}
public class AbsenceTimeDays
@@ -3147,12 +3403,15 @@ namespace BeWo.Report.ReportObjects
public decimal? TageUrlaub;
public decimal? TageKrankheit;
public decimal? TageGesamt;
+ public decimal TageAlsIst;
public decimal? StundenUrlaub;
public decimal? StundenKrankheit;
public decimal? StundenGesamt;
+ public decimal StundenAlsIst;
public Dictionary TageProWocheDict;
- public Dictionary RestStundenProWocheDict;
+ public Dictionary StundenProTagDict;
+ public Dictionary RestStundenProWocheDict;
}
public class AbsenceTimeHours
diff --git a/ReportImp/AkggMid/CustomMitarbeiterstundenkontoBerechnung.cs b/ReportImp/AkggMid/CustomMitarbeiterstundenkontoBerechnung.cs
index 7e108d129..1ded2fbc8 100644
--- a/ReportImp/AkggMid/CustomMitarbeiterstundenkontoBerechnung.cs
+++ b/ReportImp/AkggMid/CustomMitarbeiterstundenkontoBerechnung.cs
@@ -118,7 +118,10 @@ namespace AkggMid
decimal dec = 0;
if (varFieldValue != null && Decimal.TryParse(varFieldValue.ToString(), out dec))
{
- return dec / 5;
+ if (dec > 0)
+ {
+ return dec / 5;
+ }
}
}
}
@@ -206,5 +209,20 @@ namespace AkggMid
// }
//return ed;
}
- }
+
+ public override decimal BerechneStundenDurchAbwesenheiten(AbsenceTimeDays ath, DateTime start, DateTime ende, Contract c, MitarbeiterstundenkontoRO.EmployeeDetail ed)
+ {
+
+ if (ath.StundenGesamt.HasValue)
+ {
+ return ath.StundenGesamt.Value;
+ }
+ return base.BerechneStundenDurchAbwesenheiten(ath, start, ende, c, ed);
+ }
+
+ public override bool StundenBeiAbwesenheitenBerechnen()
+ {
+ return false;
+ }
+ }
}
diff --git a/ReportImp/AkggMid/Invoicing/CustomInvoiceCreation.cs b/ReportImp/AkggMid/Invoicing/CustomInvoiceCreation.cs
index fee510822..e45bd7540 100644
--- a/ReportImp/AkggMid/Invoicing/CustomInvoiceCreation.cs
+++ b/ReportImp/AkggMid/Invoicing/CustomInvoiceCreation.cs
@@ -1,11 +1,14 @@
using System;
using System.Collections.Generic;
using System.Linq;
+using BeWo.Data.Access;
using BeWo.Data.Entities;
+using BeWo.Report.ReportObjects;
using BeWo.Service.DCEntityMapper;
using BS.Shared;
using BS.Shared.Core;
using BS.Shared.DataContracts;
+using BS.Shared.Extensions;
using BS.Shared.Services;
using Service.Invoicing;
@@ -22,23 +25,39 @@ namespace AkggMid.Invoicing
public override IList CreateSbdInvoiceItems(Customer customer, List serviceRecordsInPeriod, DateTimeSpan invoicePeriod, SupportConceptApprovalPeriod scap, Calculations calc)
{
//Klassisch nur ohne StundenplanItems
+ DateTime monat = new DateTime(invoicePeriod.StartDate.Year, invoicePeriod.StartDate.Month, 1);
+
+ var ro = ServicesOverviewRO.Create(customer.Oid.Value, monat.Month, monat.Year, false, 0, 0, 1, DateTime.DaysInMonth(monat.Year, monat.Month), null);
+ var helper = new LeistungsnachweisHelper(ro, true);
+ ro.Services = helper.ErstelleDummyRecords(ro);
+
IList result = new List();
IList srList = new List();
- foreach (ServiceRecordDC iServiceRecord in serviceRecordsInPeriod)
- {
- if (iServiceRecord.ServiceDescription.Category.IsBillable)
- {
- if (!iServiceRecord.AlreadyAccounted)
- {
- var invoiceItem = CreateInvoiceItem(iServiceRecord, scap, calc);
- srList.Add(invoiceItem);
-
- iServiceRecord.AlreadyAccounted = true;
- }
+ var c2sDc = MapperFactory.SupportConceptCostBearerRelDC_CostBearer2SupportConcept.MapToNewDC(scap.CostBearer2SupportConcept);
+ foreach (var s in ro.Services)
+ {
+ if (s.Minutes > 0 && s.StartDate > DateTime.MinValue)
+ {
+ var ii = CreateInvoiceItem(s, scap, calc, c2sDc);
+ srList.Add(ii);
}
- }
+ }
+
+ //foreach (ServiceRecordDC iServiceRecord in serviceRecordsInPeriod)
+ //{
+ // if (iServiceRecord.ServiceDescription.Category.IsBillable)
+ // {
+ // if (!iServiceRecord.AlreadyAccounted)
+ // {
+ // var invoiceItem = CreateInvoiceItem(iServiceRecord, scap, calc);
+ // srList.Add(invoiceItem);
+
+ // iServiceRecord.AlreadyAccounted = true;
+ // }
+ // }
+ //}
Dictionary dayDict = new Dictionary();
foreach (var item in srList)
@@ -57,8 +76,7 @@ namespace AkggMid.Invoicing
return CreateSummaryInvoiceItems(newList, invoicePeriod, scap, calc);
}
-
- public override IList CreateAllInvoiceItems(CostBearer2SupportConcept c2s, List serviceRecordsInPeriod, DateTimeSpan invoicePeriod, SupportConceptApprovalPeriod scap, Calculations calc)
+ public override IList CreateAllInvoiceItems(CostBearer2SupportConcept c2s, List serviceRecordsInPeriod, DateTimeSpan invoicePeriod, SupportConceptApprovalPeriod scap, Calculations calc)
{
var items = CreateSbdInvoiceItems(c2s.SupportConcept.Customer, serviceRecordsInPeriod, invoicePeriod, scap, calc);
@@ -112,20 +130,57 @@ namespace AkggMid.Invoicing
return key;
}
- public override InvoiceItem CreateInvoiceItem(ServiceRecordDC iServiceRecord, SupportConceptApprovalPeriod scap, Calculations calc)
- {
- var ii = base.CreateInvoiceItem(iServiceRecord, scap, calc);
- if (iServiceRecord.ServiceDescription.CategoryName.Contains("Klassenfahrt"))
- {
- ii.ItemDescription = "Klassenfahrt";
+ private InvoiceItem CreateInvoiceItem(ServicesOverviewRO.ServiceDetail s, SupportConceptApprovalPeriod scap, Calculations calc, SupportConceptCostBearerRelDC c2sDc)
+ {
+ var ii = new InvoiceItem();
+ ii.ItemDescription = "Betreuungsstunden - Schulassistenz";
+ if (s.ServiceRecordOid > 0)
+ {
+ var record = DAOFactory.GenericDAO.LoadByID(s.ServiceRecordOid);
+ var recordDc = MapperFactory.ServiceRecordDC_ServiceRecord.MapToNewDC(record);
+
+ BillingData bd = calc.GetBillingData(recordDc);
+
+ ii.ServiceRecord = record;
+
+ ii.AmountPerUnit = bd.AmountPerUnit;
+ ii.UnitCount = bd.UnitCount;
+ ii.AmountTotal = bd.AmountTotal;
+ ii.ItemPeriodStart = bd.BillingPeriodStart;
+ ii.ItemPeriodEnd = bd.BillingPeriodEnd;
+ ii.RateFactor = bd.RateFactor;
+ ii.GrossAmountTotal = bd.GrossAmountTotal;
+ ii.AccountingInterval = bd.AccountingInterval;
+
+ if (recordDc.ServiceDescription.CategoryName.Contains("Klassenfahrt"))
+ {
+ ii.ItemDescription = "Klassenfahrt";
+ }
+
}
else
- {
- ii.ItemDescription = "Betreuungsstunden - Schulassistenz";
+ {
+ var stundensatz = c2sDc.CostBearer.CostRatePeriods.GetCostRatePeriodForDate(CostRatePeriodType.HourlyRate, s.StartDate);
+ if (stundensatz != null && stundensatz.CostRateValue.HasValue)
+ {
+ ii.AmountPerUnit = stundensatz.CostRateValue.Value;
+ ii.UnitCount = (decimal)s.Minutes / 60;
+ ii.AmountTotal = ii.AmountPerUnit * ii.UnitCount;
+ ii.ItemPeriodStart = s.StartDate;
+ ii.ItemPeriodEnd = s.StartDate;
+ ii.RateFactor = 0;
+ ii.GrossAmountTotal = ii.AmountTotal;
+ ii.AccountingInterval = AccountingIntervalType.Hourly;
+ }
}
+ if (scap != null)
+ ii.SupportConceptApprovalPeriodOid = scap.Oid;
+
+
return ii;
}
+
}
}
diff --git a/ReportImp/AkggMid/Mitarbeiterarbeitszeitkonto.cs b/ReportImp/AkggMid/Mitarbeiterarbeitszeitkonto.cs
index 764757a05..516da03d9 100644
--- a/ReportImp/AkggMid/Mitarbeiterarbeitszeitkonto.cs
+++ b/ReportImp/AkggMid/Mitarbeiterarbeitszeitkonto.cs
@@ -56,6 +56,7 @@ namespace AkggMid
{
var hours = day.HoursSick + day.HoursInVacation;
empDetail.StundenGesamtIst += hours;
+ day.ServiceRecords = null;
}
if (day.ServiceRecords != null && day.ServiceRecords.Count > 0)
diff --git a/ReportImp/AsbRuhr/Export/FibuNetDatensatz.cs b/ReportImp/AsbRuhr/Export/FibuNetDatensatz.cs
index 376f3237d..b7903ab96 100644
--- a/ReportImp/AsbRuhr/Export/FibuNetDatensatz.cs
+++ b/ReportImp/AsbRuhr/Export/FibuNetDatensatz.cs
@@ -14,6 +14,7 @@ namespace AsbRuhr.Export
public String Belegdatum { get; set; }
public String Erloeskonto { get; set; }
public String Buchungstext { get; set; }
+ public String Kategorie { get; set; }
public decimal Betrag { get; set; }
diff --git a/ReportImp/AsbRuhr/Export/FibuNetExporter.cs b/ReportImp/AsbRuhr/Export/FibuNetExporter.cs
index c6686d858..8b914de8e 100644
--- a/ReportImp/AsbRuhr/Export/FibuNetExporter.cs
+++ b/ReportImp/AsbRuhr/Export/FibuNetExporter.cs
@@ -186,28 +186,34 @@ Alternativ wäre der 1120er Satz mit einzubauen (ab Seite 61)
foreach (DataRow row in dt.Rows)
{
var ds = ErstelleFibuNetDatensatz(row);
- Erstelle1100Satz(sb, ds);
- sb.AppendLine();
- Erstelle1110Satz(sb, ds);
- sb.AppendLine();
- Erstelle1120Satz(sb, ds);
- sb.AppendLine();
+ if (ds.Betrag != 0)
+ {
+ Erstelle1100Satz(sb, ds);
+ sb.AppendLine();
+ Erstelle1110Satz(sb, ds);
+ sb.AppendLine();
+ Erstelle1120Satz(sb, ds);
+ sb.AppendLine();
- rowIndex++;
+ rowIndex++;
+ }
}
dt = ExecuteQuery(GetSpitzabrechnungSql(date), date);
foreach (DataRow row in dt.Rows)
{
var ds = ErstelleFibuNetDatensatz(row);
- Erstelle1100Satz(sb, ds);
- sb.AppendLine();
- Erstelle1110Satz(sb, ds);
- sb.AppendLine();
- Erstelle1120Satz(sb, ds);
- sb.AppendLine();
+ if (ds.Betrag != 0)
+ {
+ Erstelle1100Satz(sb, ds);
+ sb.AppendLine();
+ Erstelle1110Satz(sb, ds);
+ sb.AppendLine();
+ Erstelle1120Satz(sb, ds);
+ sb.AppendLine();
- rowIndex++;
+ rowIndex++;
+ }
}
sb.AppendLine(String.Format("( ):5;"));
@@ -235,19 +241,24 @@ Alternativ wäre der 1120er Satz mit einzubauen (ab Seite 61)
if (!String.IsNullOrEmpty(row[3].ToString()))
{
var ds = ErstelleFibuNetDatensatz(row);
- String nextInvoiceNumber = ApplyPattern(invoiceNumber.Pattern, number++);
- ds.Belegnr = nextInvoiceNumber;
- Erstelle1100Satz(sb, ds);
- sb.AppendLine();
- Erstelle1110Satz(sb, ds);
- sb.AppendLine();
- Erstelle1120Satz(sb, ds);
- sb.AppendLine();
+ if (ds.Betrag != 0 && (String.IsNullOrEmpty(ds.Kategorie) || !ds.Kategorie.Contains("Assistenz")))
+ {
+ String nextInvoiceNumber = ApplyPattern(invoiceNumber.Pattern, number++);
+ ds.Belegnr = nextInvoiceNumber;
+ Erstelle1100Satz(sb, ds);
+ sb.AppendLine();
+ Erstelle1110Satz(sb, ds);
+ sb.AppendLine();
+ Erstelle1120Satz(sb, ds);
+ sb.AppendLine();
+
+ rowIndex++;
+ }
}
- rowIndex++;
+
}
-
+ invoiceNumber.CurrentNumber = number;
DAOFactory.GenericDAO.Update(invoiceNumber);
sb.AppendLine(String.Format("( ):5;"));
@@ -307,6 +318,7 @@ Alternativ wäre der 1120er Satz mit einzubauen (ab Seite 61)
blg1 = "123456";
ds.Belegnr = blg1;
ds.Belegdatum = row[0].ToString();
+ ds.Kategorie = row[7].ToString();
ds.Erloeskonto = GetErloeskonto(row[7].ToString());
ds.Buchungstext = row[4].ToString();
ds.Kostenstelle = "4102";
diff --git a/ReportImp/BeWoAmrath/CustomMitarbeiterstundenkontoBerechnung.cs b/ReportImp/BeWoAmrath/CustomMitarbeiterstundenkontoBerechnung.cs
index 8d6e7e778..67b77a6f5 100644
--- a/ReportImp/BeWoAmrath/CustomMitarbeiterstundenkontoBerechnung.cs
+++ b/ReportImp/BeWoAmrath/CustomMitarbeiterstundenkontoBerechnung.cs
@@ -215,7 +215,7 @@ namespace BeWo.BeWoAmrath
tatsaechlicheSollStdGesamt -= fehlZeiten.Value;
}
-
+ AktuellBearbeitetesEmployeeDetail = empDetail;
var ath = GetAbsenceTimeDays(emp.AbsenceTimes, berichtsAnfang, berichtsEnde);
if (ath.TageUrlaub.HasValue)
diff --git a/ReportImp/DiePerspektive/Export/FibuNetDatensatz.cs b/ReportImp/DiePerspektive/Export/FibuNetDatensatz.cs
index d7f2a97ba..b4034ea1d 100644
--- a/ReportImp/DiePerspektive/Export/FibuNetDatensatz.cs
+++ b/ReportImp/DiePerspektive/Export/FibuNetDatensatz.cs
@@ -14,6 +14,7 @@ namespace DiePerspektive.Export
public String Belegdatum { get; set; }
public String Erloeskonto { get; set; }
public String Buchungstext { get; set; }
+ public String Kategorie { get; set; }
public decimal Betrag { get; set; }
diff --git a/ReportImp/DiePerspektive/Export/FibuNetExporter.cs b/ReportImp/DiePerspektive/Export/FibuNetExporter.cs
index 77529f10f..817be7b79 100644
--- a/ReportImp/DiePerspektive/Export/FibuNetExporter.cs
+++ b/ReportImp/DiePerspektive/Export/FibuNetExporter.cs
@@ -186,28 +186,34 @@ Alternativ wäre der 1120er Satz mit einzubauen (ab Seite 61)
foreach (DataRow row in dt.Rows)
{
var ds = ErstelleFibuNetDatensatz(row);
- Erstelle1100Satz(sb, ds);
- sb.AppendLine();
- Erstelle1110Satz(sb, ds);
- sb.AppendLine();
- Erstelle1120Satz(sb, ds);
- sb.AppendLine();
+ if (ds.Betrag != 0)
+ {
+ Erstelle1100Satz(sb, ds);
+ sb.AppendLine();
+ Erstelle1110Satz(sb, ds);
+ sb.AppendLine();
+ Erstelle1120Satz(sb, ds);
+ sb.AppendLine();
- rowIndex++;
+ rowIndex++;
+ }
}
dt = ExecuteQuery(GetSpitzabrechnungSql(date), date);
foreach (DataRow row in dt.Rows)
{
var ds = ErstelleFibuNetDatensatz(row);
- Erstelle1100Satz(sb, ds);
- sb.AppendLine();
- Erstelle1110Satz(sb, ds);
- sb.AppendLine();
- Erstelle1120Satz(sb, ds);
- sb.AppendLine();
+ if (ds.Betrag != 0)
+ {
+ Erstelle1100Satz(sb, ds);
+ sb.AppendLine();
+ Erstelle1110Satz(sb, ds);
+ sb.AppendLine();
+ Erstelle1120Satz(sb, ds);
+ sb.AppendLine();
- rowIndex++;
+ rowIndex++;
+ }
}
sb.AppendLine(String.Format("( ):0005;"));
@@ -234,17 +240,22 @@ Alternativ wäre der 1120er Satz mit einzubauen (ab Seite 61)
if (!String.IsNullOrEmpty(row[3].ToString()))
{
var ds = ErstelleFibuNetDatensatz(row);
- String nextInvoiceNumber = ApplyPattern(invoiceNumber.Pattern, number++);
- ds.Belegnr = nextInvoiceNumber;
- Erstelle1100Satz(sb, ds);
- sb.AppendLine();
- Erstelle1110Satz(sb, ds);
- sb.AppendLine();
- Erstelle1120Satz(sb, ds);
- sb.AppendLine();
+ if (ds.Betrag != 0 && (String.IsNullOrEmpty(ds.Kategorie) || !ds.Kategorie.Contains("Assistenz")))
+ {
+ String nextInvoiceNumber = ApplyPattern(invoiceNumber.Pattern, number++);
+ ds.Belegnr = nextInvoiceNumber;
+ Erstelle1100Satz(sb, ds);
+ sb.AppendLine();
+ Erstelle1110Satz(sb, ds);
+ sb.AppendLine();
+ Erstelle1120Satz(sb, ds);
+ sb.AppendLine();
+
+ rowIndex++;
+ }
}
- rowIndex++;
+
}
invoiceNumber.CurrentNumber = number;
@@ -307,6 +318,7 @@ Alternativ wäre der 1120er Satz mit einzubauen (ab Seite 61)
blg1 = "123456";
ds.Belegnr = blg1;
ds.Belegdatum = row[0].ToString();
+ ds.Kategorie = row[7].ToString();
ds.Erloeskonto = GetErloeskonto(row[7].ToString());
ds.Buchungstext = row[4].ToString();
ds.Kostenstelle = "4102";
diff --git a/ReportImp/Fortis/Fortis.csproj b/ReportImp/Fortis/Fortis.csproj
index fbcab458e..cf665bdb7 100644
--- a/ReportImp/Fortis/Fortis.csproj
+++ b/ReportImp/Fortis/Fortis.csproj
@@ -71,6 +71,12 @@
CustomerDataReport.cs
+
+ Component
+
+
+ ZeitdokumentationPlanIst.cs
+
Component
@@ -105,6 +111,9 @@
Designer
+
+ ZeitdokumentationPlanIst.cs
+
Quittierungsbeleg.cs
diff --git a/ReportImp/Fortis/ZeitdokumentationPlanIst.Designer.cs b/ReportImp/Fortis/ZeitdokumentationPlanIst.Designer.cs
new file mode 100644
index 000000000..ca3dc4594
--- /dev/null
+++ b/ReportImp/Fortis/ZeitdokumentationPlanIst.Designer.cs
@@ -0,0 +1,1363 @@
+using BeWo.Report.ReportObjects;
+namespace Fortis
+{
+ partial class ZeitdokumentationPlanIst
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components;
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Designer generated code
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ this.components = new System.ComponentModel.Container();
+ DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary();
+ DevExpress.XtraReports.UI.XRSummary xrSummary2 = new DevExpress.XtraReports.UI.XRSummary();
+ DevExpress.XtraReports.UI.XRSummary xrSummary3 = new DevExpress.XtraReports.UI.XRSummary();
+ DevExpress.XtraReports.UI.XRSummary xrSummary4 = new DevExpress.XtraReports.UI.XRSummary();
+ DevExpress.XtraReports.UI.XRSummary xrSummary5 = new DevExpress.XtraReports.UI.XRSummary();
+ DevExpress.XtraReports.UI.XRSummary xrSummary6 = new DevExpress.XtraReports.UI.XRSummary();
+ DevExpress.XtraReports.UI.XRSummary xrSummary7 = new DevExpress.XtraReports.UI.XRSummary();
+ DevExpress.XtraReports.UI.XRSummary xrSummary8 = new DevExpress.XtraReports.UI.XRSummary();
+ DevExpress.XtraReports.UI.XRSummary xrSummary9 = new DevExpress.XtraReports.UI.XRSummary();
+ DevExpress.XtraReports.UI.XRSummary xrSummary10 = new DevExpress.XtraReports.UI.XRSummary();
+ DevExpress.XtraReports.UI.XRSummary xrSummary11 = new DevExpress.XtraReports.UI.XRSummary();
+ this.Detail = new DevExpress.XtraReports.UI.DetailBand();
+ this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
+ this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
+ this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
+ this.xrTableRow6 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell34 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell41 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell42 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell40 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell45 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell44 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell50 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+ this.xrTableServiceRecords1 = new DevExpress.XtraReports.UI.XRTable();
+ this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell32 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell33 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell36 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell39 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell37 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell38 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell43 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell49 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule();
+ this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
+ this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
+ this.formattingRuleServiceDesc = new DevExpress.XtraReports.UI.FormattingRule();
+ this.formattingRuleCostBearer = new DevExpress.XtraReports.UI.FormattingRule();
+ this.formattingRuleEmployeeName = new DevExpress.XtraReports.UI.FormattingRule();
+ this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
+ this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
+ this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
+ this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
+ this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell46 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell51 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell52 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell53 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell54 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell55 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.fieldKontaktArt = new DevExpress.XtraReports.UI.CalculatedField();
+ this.Dauer = new DevExpress.XtraReports.UI.CalculatedField();
+ this.True = new DevExpress.XtraReports.UI.FormattingRule();
+ this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
+ //
+ // Detail
+ //
+ this.Detail.Expanded = false;
+ this.Detail.HeightF = 0F;
+ this.Detail.Name = "Detail";
+ this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+ this.Detail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+ //
+ // DetailReport
+ //
+ this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+ this.Detail1,
+ this.GroupHeader1});
+ this.DetailReport.DataMember = "Services";
+ this.DetailReport.DataSource = this.bindingSource1;
+ this.DetailReport.Level = 0;
+ this.DetailReport.Name = "DetailReport";
+ this.DetailReport.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+ this.DetailReport.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+ //
+ // Detail1
+ //
+ this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrTable3});
+ this.Detail1.HeightF = 18F;
+ this.Detail1.Name = "Detail1";
+ this.Detail1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+ this.Detail1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+ //
+ // xrTable3
+ //
+ this.xrTable3.BorderColor = System.Drawing.Color.Black;
+ this.xrTable3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTable3.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+ this.xrTable3.Name = "xrTable3";
+ this.xrTable3.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+ this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+ this.xrTableRow6});
+ this.xrTable3.SizeF = new System.Drawing.SizeF(740F, 18F);
+ this.xrTable3.StylePriority.UseFont = false;
+ this.xrTable3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+ //
+ // xrTableRow6
+ //
+ this.xrTableRow6.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell34,
+ this.xrTableCell13,
+ this.xrTableCell14,
+ this.xrTableCell10,
+ this.xrTableCell2,
+ this.xrTableCell15,
+ this.xrTableCell12,
+ this.xrTableCell41,
+ this.xrTableCell42,
+ this.xrTableCell40,
+ this.xrTableCell45,
+ this.xrTableCell44,
+ this.xrTableCell18,
+ this.xrTableCell17,
+ this.xrTableCell50});
+ this.xrTableRow6.Font = new System.Drawing.Font("Arial", 9F);
+ this.xrTableRow6.Name = "xrTableRow6";
+ this.xrTableRow6.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+ this.xrTableRow6.StylePriority.UseFont = false;
+ this.xrTableRow6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+ this.xrTableRow6.Weight = 0.9D;
+ //
+ // xrTableCell34
+ //
+ this.xrTableCell34.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(217)))), ((int)(((byte)(217)))), ((int)(((byte)(217)))));
+ this.xrTableCell34.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.StartDate")});
+ this.xrTableCell34.Font = new System.Drawing.Font("Arial", 9F);
+ this.xrTableCell34.Name = "xrTableCell34";
+ this.xrTableCell34.StylePriority.UseBackColor = false;
+ this.xrTableCell34.StylePriority.UseFont = false;
+ this.xrTableCell34.StylePriority.UseTextAlignment = false;
+ xrSummary1.FormatString = "{0:0}";
+ xrSummary1.Func = DevExpress.XtraReports.UI.SummaryFunc.RecordNumber;
+ xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+ this.xrTableCell34.Summary = xrSummary1;
+ this.xrTableCell34.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell34.Weight = 0.063131311769635892D;
+ //
+ // xrTableCell13
+ //
+ this.xrTableCell13.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(226)))), ((int)(((byte)(240)))), ((int)(((byte)(217)))));
+ this.xrTableCell13.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.StartDate", "{0:dd/MM/yyyy}")});
+ this.xrTableCell13.Font = new System.Drawing.Font("Arial", 9F);
+ this.xrTableCell13.Name = "xrTableCell13";
+ this.xrTableCell13.StylePriority.UseBackColor = false;
+ this.xrTableCell13.StylePriority.UseBorders = false;
+ this.xrTableCell13.StylePriority.UseFont = false;
+ this.xrTableCell13.StylePriority.UsePadding = false;
+ this.xrTableCell13.StylePriority.UseTextAlignment = false;
+ this.xrTableCell13.Text = "xrTableCell13";
+ this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell13.Weight = 0.12626262563884849D;
+ //
+ // xrTableCell14
+ //
+ this.xrTableCell14.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(226)))), ((int)(((byte)(240)))), ((int)(((byte)(217)))));
+ this.xrTableCell14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice", "{0:HH:mm}")});
+ this.xrTableCell14.Font = new System.Drawing.Font("Arial", 9F);
+ this.xrTableCell14.Name = "xrTableCell14";
+ this.xrTableCell14.StylePriority.UseBackColor = false;
+ this.xrTableCell14.StylePriority.UseBorders = false;
+ this.xrTableCell14.StylePriority.UseFont = false;
+ this.xrTableCell14.StylePriority.UsePadding = false;
+ this.xrTableCell14.StylePriority.UseTextAlignment = false;
+ this.xrTableCell14.Text = "xrTableCell14";
+ this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell14.Weight = 0.05555561495598664D;
+ //
+ // xrTableCell10
+ //
+ this.xrTableCell10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(226)))), ((int)(((byte)(240)))), ((int)(((byte)(217)))));
+ this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice2", "{0:HH:mm}")});
+ this.xrTableCell10.Font = new System.Drawing.Font("Arial", 9F);
+ this.xrTableCell10.Name = "xrTableCell10";
+ this.xrTableCell10.StylePriority.UseBackColor = false;
+ this.xrTableCell10.StylePriority.UseBorders = false;
+ this.xrTableCell10.StylePriority.UseFont = false;
+ this.xrTableCell10.StylePriority.UsePadding = false;
+ this.xrTableCell10.StylePriority.UseTextAlignment = false;
+ this.xrTableCell10.Text = "xrTableCell10";
+ this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell10.Weight = 0.055555595689839164D;
+ //
+ // xrTableCell2
+ //
+ this.xrTableCell2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(226)))), ((int)(((byte)(240)))), ((int)(((byte)(217)))));
+ this.xrTableCell2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice3")});
+ this.xrTableCell2.Font = new System.Drawing.Font("Arial", 9F);
+ this.xrTableCell2.Name = "xrTableCell2";
+ this.xrTableCell2.StylePriority.UseBackColor = false;
+ this.xrTableCell2.StylePriority.UseFont = false;
+ this.xrTableCell2.StylePriority.UsePadding = false;
+ this.xrTableCell2.StylePriority.UseTextAlignment = false;
+ this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell2.Weight = 0.055555341324839372D;
+ //
+ // xrTableCell15
+ //
+ this.xrTableCell15.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(226)))), ((int)(((byte)(240)))), ((int)(((byte)(217)))));
+ this.xrTableCell15.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice4", "{0:0}")});
+ this.xrTableCell15.Font = new System.Drawing.Font("Arial", 9F);
+ this.xrTableCell15.Name = "xrTableCell15";
+ this.xrTableCell15.StylePriority.UseBackColor = false;
+ this.xrTableCell15.StylePriority.UseBorders = false;
+ this.xrTableCell15.StylePriority.UseFont = false;
+ this.xrTableCell15.StylePriority.UsePadding = false;
+ this.xrTableCell15.StylePriority.UseTextAlignment = false;
+ this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell15.Weight = 0.055555630317059845D;
+ //
+ // xrTableCell12
+ //
+ this.xrTableCell12.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(226)))), ((int)(((byte)(240)))), ((int)(((byte)(217)))));
+ this.xrTableCell12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice5")});
+ this.xrTableCell12.Font = new System.Drawing.Font("Arial", 10F);
+ this.xrTableCell12.Name = "xrTableCell12";
+ this.xrTableCell12.StylePriority.UseBackColor = false;
+ this.xrTableCell12.StylePriority.UseBorders = false;
+ this.xrTableCell12.StylePriority.UseFont = false;
+ this.xrTableCell12.StylePriority.UsePadding = false;
+ this.xrTableCell12.StylePriority.UseTextAlignment = false;
+ this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell12.Weight = 0.055555594097297781D;
+ //
+ // xrTableCell41
+ //
+ this.xrTableCell41.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(226)))), ((int)(((byte)(240)))), ((int)(((byte)(217)))));
+ this.xrTableCell41.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.ServiceCategory")});
+ this.xrTableCell41.Name = "xrTableCell41";
+ this.xrTableCell41.StylePriority.UseBackColor = false;
+ this.xrTableCell41.StylePriority.UseTextAlignment = false;
+ this.xrTableCell41.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell41.Weight = 0.055555595016214182D;
+ //
+ // xrTableCell42
+ //
+ this.xrTableCell42.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(226)))), ((int)(((byte)(240)))), ((int)(((byte)(217)))));
+ this.xrTableCell42.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.EmployeeCount", "{0:0}")});
+ this.xrTableCell42.Name = "xrTableCell42";
+ this.xrTableCell42.StylePriority.UseBackColor = false;
+ this.xrTableCell42.StylePriority.UseTextAlignment = false;
+ this.xrTableCell42.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell42.Weight = 0.055555632806937594D;
+ //
+ // xrTableCell40
+ //
+ this.xrTableCell40.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(169)))), ((int)(((byte)(209)))), ((int)(((byte)(142)))));
+ this.xrTableCell40.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.GefahreneKilometer")});
+ this.xrTableCell40.Name = "xrTableCell40";
+ this.xrTableCell40.StylePriority.UseBackColor = false;
+ this.xrTableCell40.StylePriority.UseTextAlignment = false;
+ this.xrTableCell40.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell40.Weight = 0.055555325752703361D;
+ //
+ // xrTableCell45
+ //
+ this.xrTableCell45.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(169)))), ((int)(((byte)(209)))), ((int)(((byte)(142)))));
+ this.xrTableCell45.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.CustomerCount")});
+ this.xrTableCell45.Name = "xrTableCell45";
+ this.xrTableCell45.StylePriority.UseBackColor = false;
+ this.xrTableCell45.StylePriority.UseTextAlignment = false;
+ this.xrTableCell45.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell45.Weight = 0.055555593812079931D;
+ //
+ // xrTableCell44
+ //
+ this.xrTableCell44.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(251)))), ((int)(((byte)(229)))), ((int)(((byte)(214)))));
+ this.xrTableCell44.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.TimeRangeString")});
+ this.xrTableCell44.Name = "xrTableCell44";
+ this.xrTableCell44.StylePriority.UseBackColor = false;
+ this.xrTableCell44.StylePriority.UseBorders = false;
+ this.xrTableCell44.StylePriority.UseFont = false;
+ this.xrTableCell44.StylePriority.UsePadding = false;
+ this.xrTableCell44.StylePriority.UseTextAlignment = false;
+ this.xrTableCell44.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell44.Weight = 0.055555634752644537D;
+ //
+ // xrTableCell18
+ //
+ this.xrTableCell18.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(226)))), ((int)(((byte)(240)))), ((int)(((byte)(217)))));
+ this.xrTableCell18.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.EmployeeFirstName")});
+ this.xrTableCell18.Font = new System.Drawing.Font("Arial", 9F);
+ this.xrTableCell18.Name = "xrTableCell18";
+ this.xrTableCell18.StylePriority.UseBackColor = false;
+ this.xrTableCell18.StylePriority.UseFont = false;
+ this.xrTableCell18.StylePriority.UseTextAlignment = false;
+ this.xrTableCell18.Text = "xrTableCell18";
+ this.xrTableCell18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell18.Weight = 0.063131315799868082D;
+ //
+ // xrTableCell17
+ //
+ this.xrTableCell17.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(226)))), ((int)(((byte)(240)))), ((int)(((byte)(217)))));
+ this.xrTableCell17.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.EmployeeFullname")});
+ this.xrTableCell17.Font = new System.Drawing.Font("Arial", 9F);
+ this.xrTableCell17.Name = "xrTableCell17";
+ this.xrTableCell17.StylePriority.UseBackColor = false;
+ this.xrTableCell17.StylePriority.UseFont = false;
+ this.xrTableCell17.StylePriority.UseTextAlignment = false;
+ this.xrTableCell17.Text = "xrTableCell17";
+ this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell17.Weight = 0.063131313391599567D;
+ //
+ // xrTableCell50
+ //
+ this.xrTableCell50.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(251)))), ((int)(((byte)(229)))), ((int)(((byte)(214)))));
+ this.xrTableCell50.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.EmployeeLastName")});
+ this.xrTableCell50.Font = new System.Drawing.Font("Arial", 9F);
+ this.xrTableCell50.Name = "xrTableCell50";
+ this.xrTableCell50.StylePriority.UseBackColor = false;
+ this.xrTableCell50.StylePriority.UseBorders = false;
+ this.xrTableCell50.StylePriority.UseFont = false;
+ this.xrTableCell50.StylePriority.UsePadding = false;
+ this.xrTableCell50.StylePriority.UseTextAlignment = false;
+ this.xrTableCell50.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell50.Weight = 0.063131320138792066D;
+ //
+ // GroupHeader1
+ //
+ this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrTableServiceRecords1});
+ this.GroupHeader1.HeightF = 60F;
+ this.GroupHeader1.Name = "GroupHeader1";
+ this.GroupHeader1.RepeatEveryPage = true;
+ //
+ // xrTableServiceRecords1
+ //
+ this.xrTableServiceRecords1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(191)))), ((int)(((byte)(191)))), ((int)(((byte)(191)))));
+ this.xrTableServiceRecords1.Borders = DevExpress.XtraPrinting.BorderSide.None;
+ this.xrTableServiceRecords1.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.xrTableServiceRecords1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+ this.xrTableServiceRecords1.Name = "xrTableServiceRecords1";
+ this.xrTableServiceRecords1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+ this.xrTableServiceRecords1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+ this.xrTableRow2,
+ this.xrTableRow3,
+ this.xrTableRow1});
+ this.xrTableServiceRecords1.SizeF = new System.Drawing.SizeF(740F, 60F);
+ this.xrTableServiceRecords1.StylePriority.UseBackColor = false;
+ this.xrTableServiceRecords1.StylePriority.UseBorders = false;
+ this.xrTableServiceRecords1.StylePriority.UseFont = false;
+ this.xrTableServiceRecords1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+ //
+ // xrTableRow2
+ //
+ this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell32,
+ this.xrTableCell3,
+ this.xrTableCell28,
+ this.xrTableCell48});
+ this.xrTableRow2.Name = "xrTableRow2";
+ this.xrTableRow2.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+ this.xrTableRow2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+ this.xrTableRow2.Weight = 0.48945783132530124D;
+ //
+ // xrTableCell32
+ //
+ this.xrTableCell32.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
+ | DevExpress.XtraPrinting.BorderSide.Right)));
+ this.xrTableCell32.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.xrTableCell32.Name = "xrTableCell32";
+ this.xrTableCell32.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
+ this.xrTableCell32.StylePriority.UseBorders = false;
+ this.xrTableCell32.StylePriority.UseFont = false;
+ this.xrTableCell32.StylePriority.UsePadding = false;
+ this.xrTableCell32.StylePriority.UseTextAlignment = false;
+ this.xrTableCell32.Text = "Lfd.Nr.";
+ this.xrTableCell32.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
+ this.xrTableCell32.Weight = 0.13966479192903827D;
+ //
+ // xrTableCell3
+ //
+ this.xrTableCell3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
+ | DevExpress.XtraPrinting.BorderSide.Right)));
+ this.xrTableCell3.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.xrTableCell3.Name = "xrTableCell3";
+ this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
+ this.xrTableCell3.StylePriority.UseBorders = false;
+ this.xrTableCell3.StylePriority.UseFont = false;
+ this.xrTableCell3.StylePriority.UsePadding = false;
+ this.xrTableCell3.StylePriority.UseTextAlignment = false;
+ this.xrTableCell3.Text = "Datum";
+ this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
+ this.xrTableCell3.Weight = 0.27932957581202328D;
+ //
+ // xrTableCell28
+ //
+ this.xrTableCell28.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
+ | DevExpress.XtraPrinting.BorderSide.Right)));
+ this.xrTableCell28.Font = new System.Drawing.Font("Arial", 10F);
+ this.xrTableCell28.Name = "xrTableCell28";
+ this.xrTableCell28.StylePriority.UseBorders = false;
+ this.xrTableCell28.StylePriority.UseFont = false;
+ this.xrTableCell28.StylePriority.UseTextAlignment = false;
+ this.xrTableCell28.Text = "Personenbezogene Leistungen";
+ this.xrTableCell28.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
+ this.xrTableCell28.Weight = 1.2290501965495329D;
+ //
+ // xrTableCell48
+ //
+ this.xrTableCell48.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
+ | DevExpress.XtraPrinting.BorderSide.Right)));
+ this.xrTableCell48.Font = new System.Drawing.Font("Arial", 10F);
+ this.xrTableCell48.Multiline = true;
+ this.xrTableCell48.Name = "xrTableCell48";
+ this.xrTableCell48.StylePriority.UseBorders = false;
+ this.xrTableCell48.StylePriority.UseFont = false;
+ this.xrTableCell48.StylePriority.UseTextAlignment = false;
+ this.xrTableCell48.Text = "Kurzfristig abgesagt";
+ this.xrTableCell48.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
+ this.xrTableCell48.Weight = 0.41899437020563141D;
+ //
+ // xrTableRow3
+ //
+ this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell4,
+ this.xrTableCell5,
+ this.xrTableCell6,
+ this.xrTableCell19,
+ this.xrTableCell20,
+ this.xrTableCell7});
+ this.xrTableRow3.Name = "xrTableRow3";
+ this.xrTableRow3.Weight = 0.48945783132530124D;
+ //
+ // xrTableCell4
+ //
+ this.xrTableCell4.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)));
+ this.xrTableCell4.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.xrTableCell4.Name = "xrTableCell4";
+ this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
+ this.xrTableCell4.StylePriority.UseBorders = false;
+ this.xrTableCell4.StylePriority.UseFont = false;
+ this.xrTableCell4.StylePriority.UsePadding = false;
+ this.xrTableCell4.StylePriority.UseTextAlignment = false;
+ this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
+ this.xrTableCell4.Weight = 0.13966479192903827D;
+ //
+ // xrTableCell5
+ //
+ this.xrTableCell5.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)));
+ this.xrTableCell5.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.xrTableCell5.Name = "xrTableCell5";
+ this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
+ this.xrTableCell5.StylePriority.UseBorders = false;
+ this.xrTableCell5.StylePriority.UseFont = false;
+ this.xrTableCell5.StylePriority.UsePadding = false;
+ this.xrTableCell5.StylePriority.UseTextAlignment = false;
+ this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
+ this.xrTableCell5.Weight = 0.27932957581202328D;
+ //
+ // xrTableCell6
+ //
+ this.xrTableCell6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(217)))), ((int)(((byte)(217)))), ((int)(((byte)(217)))));
+ this.xrTableCell6.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
+ | DevExpress.XtraPrinting.BorderSide.Right)));
+ this.xrTableCell6.Font = new System.Drawing.Font("Arial", 10F);
+ this.xrTableCell6.Name = "xrTableCell6";
+ this.xrTableCell6.StylePriority.UseBackColor = false;
+ this.xrTableCell6.StylePriority.UseBorders = false;
+ this.xrTableCell6.StylePriority.UseFont = false;
+ this.xrTableCell6.StylePriority.UseTextAlignment = false;
+ this.xrTableCell6.Text = "Direkt";
+ this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
+ this.xrTableCell6.Weight = 1.2290501965495329D;
+ //
+ // xrTableCell19
+ //
+ this.xrTableCell19.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(217)))), ((int)(((byte)(217)))), ((int)(((byte)(217)))));
+ this.xrTableCell19.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
+ | DevExpress.XtraPrinting.BorderSide.Right)));
+ this.xrTableCell19.Font = new System.Drawing.Font("Arial", 10F);
+ this.xrTableCell19.Name = "xrTableCell19";
+ this.xrTableCell19.StylePriority.UseBackColor = false;
+ this.xrTableCell19.StylePriority.UseBorders = false;
+ this.xrTableCell19.StylePriority.UseFont = false;
+ this.xrTableCell19.StylePriority.UseTextAlignment = false;
+ this.xrTableCell19.Text = "Beginn";
+ this.xrTableCell19.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
+ this.xrTableCell19.Weight = 0.13966478866713239D;
+ //
+ // xrTableCell20
+ //
+ this.xrTableCell20.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(217)))), ((int)(((byte)(217)))), ((int)(((byte)(217)))));
+ this.xrTableCell20.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
+ | DevExpress.XtraPrinting.BorderSide.Right)));
+ this.xrTableCell20.Font = new System.Drawing.Font("Arial", 10F);
+ this.xrTableCell20.Name = "xrTableCell20";
+ this.xrTableCell20.StylePriority.UseBackColor = false;
+ this.xrTableCell20.StylePriority.UseBorders = false;
+ this.xrTableCell20.StylePriority.UseFont = false;
+ this.xrTableCell20.StylePriority.UseTextAlignment = false;
+ this.xrTableCell20.Text = "Ende";
+ this.xrTableCell20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
+ this.xrTableCell20.Weight = 0.13966479076924954D;
+ //
+ // xrTableCell7
+ //
+ this.xrTableCell7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(217)))), ((int)(((byte)(217)))), ((int)(((byte)(217)))));
+ this.xrTableCell7.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
+ | DevExpress.XtraPrinting.BorderSide.Right)));
+ this.xrTableCell7.Font = new System.Drawing.Font("Arial", 10F);
+ this.xrTableCell7.Name = "xrTableCell7";
+ this.xrTableCell7.StylePriority.UseBackColor = false;
+ this.xrTableCell7.StylePriority.UseBorders = false;
+ this.xrTableCell7.StylePriority.UseFont = false;
+ this.xrTableCell7.StylePriority.UseTextAlignment = false;
+ this.xrTableCell7.Text = "∑";
+ this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
+ this.xrTableCell7.Weight = 0.13966479076924948D;
+ //
+ // xrTableRow1
+ //
+ this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell33,
+ this.xrTableCell1,
+ this.xrTableCell35,
+ this.xrTableCell36,
+ this.xrTableCell39,
+ this.xrTableCell37,
+ this.xrTableCell38,
+ this.xrTableCell9,
+ this.xrTableCell8,
+ this.xrTableCell11,
+ this.xrTableCell16,
+ this.xrTableCell43,
+ this.xrTableCell21,
+ this.xrTableCell22,
+ this.xrTableCell49});
+ this.xrTableRow1.Name = "xrTableRow1";
+ this.xrTableRow1.Weight = 0.48945783132530118D;
+ //
+ // xrTableCell33
+ //
+ this.xrTableCell33.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableCell33.Name = "xrTableCell33";
+ this.xrTableCell33.StylePriority.UseBorders = false;
+ this.xrTableCell33.Weight = 0.1396647919290383D;
+ //
+ // xrTableCell1
+ //
+ this.xrTableCell1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableCell1.Name = "xrTableCell1";
+ this.xrTableCell1.StylePriority.UseBorders = false;
+ this.xrTableCell1.Weight = 0.27932957581202683D;
+ //
+ // xrTableCell35
+ //
+ this.xrTableCell35.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(242)))), ((int)(((byte)(242)))), ((int)(((byte)(242)))));
+ this.xrTableCell35.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
+ | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableCell35.Font = new System.Drawing.Font("Arial", 10F);
+ this.xrTableCell35.Name = "xrTableCell35";
+ this.xrTableCell35.StylePriority.UseBackColor = false;
+ this.xrTableCell35.StylePriority.UseBorders = false;
+ this.xrTableCell35.StylePriority.UseFont = false;
+ this.xrTableCell35.StylePriority.UseTextAlignment = false;
+ this.xrTableCell35.Text = "H";
+ this.xrTableCell35.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell35.Weight = 0.12290505063585377D;
+ //
+ // xrTableCell36
+ //
+ this.xrTableCell36.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(242)))), ((int)(((byte)(242)))), ((int)(((byte)(242)))));
+ this.xrTableCell36.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
+ | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableCell36.Font = new System.Drawing.Font("Arial", 10F);
+ this.xrTableCell36.Name = "xrTableCell36";
+ this.xrTableCell36.StylePriority.UseBackColor = false;
+ this.xrTableCell36.StylePriority.UseBorders = false;
+ this.xrTableCell36.StylePriority.UseFont = false;
+ this.xrTableCell36.StylePriority.UseTextAlignment = false;
+ this.xrTableCell36.Text = "B";
+ this.xrTableCell36.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell36.Weight = 0.12290502352575639D;
+ //
+ // xrTableCell39
+ //
+ this.xrTableCell39.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(242)))), ((int)(((byte)(242)))), ((int)(((byte)(242)))));
+ this.xrTableCell39.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
+ | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableCell39.Font = new System.Drawing.Font("Arial", 10F);
+ this.xrTableCell39.Name = "xrTableCell39";
+ this.xrTableCell39.StylePriority.UseBackColor = false;
+ this.xrTableCell39.StylePriority.UseBorders = false;
+ this.xrTableCell39.StylePriority.UseFont = false;
+ this.xrTableCell39.StylePriority.UseTextAlignment = false;
+ this.xrTableCell39.Text = "T";
+ this.xrTableCell39.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell39.Weight = 0.12290502352575616D;
+ //
+ // xrTableCell37
+ //
+ this.xrTableCell37.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(242)))), ((int)(((byte)(242)))), ((int)(((byte)(242)))));
+ this.xrTableCell37.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
+ | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableCell37.Font = new System.Drawing.Font("Arial", 10F);
+ this.xrTableCell37.Name = "xrTableCell37";
+ this.xrTableCell37.StylePriority.UseBackColor = false;
+ this.xrTableCell37.StylePriority.UseBorders = false;
+ this.xrTableCell37.StylePriority.UseFont = false;
+ this.xrTableCell37.StylePriority.UseTextAlignment = false;
+ this.xrTableCell37.Text = "GD";
+ this.xrTableCell37.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell37.Weight = 0.12290502352575616D;
+ //
+ // xrTableCell38
+ //
+ this.xrTableCell38.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(242)))), ((int)(((byte)(242)))), ((int)(((byte)(242)))));
+ this.xrTableCell38.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
+ | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableCell38.Font = new System.Drawing.Font("Arial", 10F);
+ this.xrTableCell38.Name = "xrTableCell38";
+ this.xrTableCell38.StylePriority.UseBackColor = false;
+ this.xrTableCell38.StylePriority.UseBorders = false;
+ this.xrTableCell38.StylePriority.UseFont = false;
+ this.xrTableCell38.StylePriority.UseTextAlignment = false;
+ this.xrTableCell38.Text = "KL";
+ this.xrTableCell38.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell38.Weight = 0.12290502352575627D;
+ //
+ // xrTableCell9
+ //
+ this.xrTableCell9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(242)))), ((int)(((byte)(242)))), ((int)(((byte)(242)))));
+ this.xrTableCell9.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
+ | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableCell9.Font = new System.Drawing.Font("Arial", 10F);
+ this.xrTableCell9.Name = "xrTableCell9";
+ this.xrTableCell9.StylePriority.UseBackColor = false;
+ this.xrTableCell9.StylePriority.UseBorders = false;
+ this.xrTableCell9.StylePriority.UseFont = false;
+ this.xrTableCell9.StylePriority.UseTextAlignment = false;
+ this.xrTableCell9.Text = "AK";
+ this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell9.Weight = 0.12290501917654102D;
+ //
+ // xrTableCell8
+ //
+ this.xrTableCell8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(242)))), ((int)(((byte)(242)))), ((int)(((byte)(242)))));
+ this.xrTableCell8.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
+ | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableCell8.Font = new System.Drawing.Font("Arial", 10F);
+ this.xrTableCell8.Name = "xrTableCell8";
+ this.xrTableCell8.StylePriority.UseBackColor = false;
+ this.xrTableCell8.StylePriority.UseBorders = false;
+ this.xrTableCell8.StylePriority.UseFont = false;
+ this.xrTableCell8.StylePriority.UseTextAlignment = false;
+ this.xrTableCell8.Text = "MA";
+ this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell8.Weight = 0.12290501917654104D;
+ //
+ // xrTableCell11
+ //
+ this.xrTableCell11.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(169)))), ((int)(((byte)(209)))), ((int)(((byte)(142)))));
+ this.xrTableCell11.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
+ | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableCell11.Font = new System.Drawing.Font("Arial", 10F);
+ this.xrTableCell11.Name = "xrTableCell11";
+ this.xrTableCell11.StylePriority.UseBackColor = false;
+ this.xrTableCell11.StylePriority.UseBorders = false;
+ this.xrTableCell11.StylePriority.UseFont = false;
+ this.xrTableCell11.StylePriority.UseTextAlignment = false;
+ this.xrTableCell11.Text = "GI";
+ this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell11.Weight = 0.12290501917654102D;
+ //
+ // xrTableCell16
+ //
+ this.xrTableCell16.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(169)))), ((int)(((byte)(209)))), ((int)(((byte)(142)))));
+ this.xrTableCell16.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
+ | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableCell16.CanGrow = false;
+ this.xrTableCell16.Font = new System.Drawing.Font("Arial", 10F);
+ this.xrTableCell16.Name = "xrTableCell16";
+ this.xrTableCell16.StylePriority.UseBackColor = false;
+ this.xrTableCell16.StylePriority.UseBorders = false;
+ this.xrTableCell16.StylePriority.UseFont = false;
+ this.xrTableCell16.StylePriority.UseTextAlignment = false;
+ this.xrTableCell16.Text = "Größe";
+ this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell16.Weight = 0.12290501845167182D;
+ //
+ // xrTableCell43
+ //
+ this.xrTableCell43.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(242)))), ((int)(((byte)(242)))), ((int)(((byte)(242)))));
+ this.xrTableCell43.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
+ | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableCell43.Font = new System.Drawing.Font("Arial", 10F);
+ this.xrTableCell43.Name = "xrTableCell43";
+ this.xrTableCell43.StylePriority.UseBackColor = false;
+ this.xrTableCell43.StylePriority.UseBorders = false;
+ this.xrTableCell43.StylePriority.UseFont = false;
+ this.xrTableCell43.StylePriority.UseTextAlignment = false;
+ this.xrTableCell43.Text = "∑";
+ this.xrTableCell43.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell43.Weight = 0.12290501845167183D;
+ //
+ // xrTableCell21
+ //
+ this.xrTableCell21.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(217)))), ((int)(((byte)(217)))), ((int)(((byte)(217)))));
+ this.xrTableCell21.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableCell21.Font = new System.Drawing.Font("Arial", 10F);
+ this.xrTableCell21.Name = "xrTableCell21";
+ this.xrTableCell21.StylePriority.UseBackColor = false;
+ this.xrTableCell21.StylePriority.UseBorders = false;
+ this.xrTableCell21.StylePriority.UseFont = false;
+ this.xrTableCell21.StylePriority.UseTextAlignment = false;
+ this.xrTableCell21.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
+ this.xrTableCell21.Weight = 0.13966478866713056D;
+ //
+ // xrTableCell22
+ //
+ this.xrTableCell22.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(217)))), ((int)(((byte)(217)))), ((int)(((byte)(217)))));
+ this.xrTableCell22.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableCell22.Font = new System.Drawing.Font("Arial", 10F);
+ this.xrTableCell22.Name = "xrTableCell22";
+ this.xrTableCell22.StylePriority.UseBackColor = false;
+ this.xrTableCell22.StylePriority.UseBorders = false;
+ this.xrTableCell22.StylePriority.UseFont = false;
+ this.xrTableCell22.StylePriority.UseTextAlignment = false;
+ this.xrTableCell22.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
+ this.xrTableCell22.Weight = 0.13966479076924862D;
+ //
+ // xrTableCell49
+ //
+ this.xrTableCell49.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(217)))), ((int)(((byte)(217)))), ((int)(((byte)(217)))));
+ this.xrTableCell49.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableCell49.Font = new System.Drawing.Font("Arial", 10F);
+ this.xrTableCell49.Multiline = true;
+ this.xrTableCell49.Name = "xrTableCell49";
+ this.xrTableCell49.StylePriority.UseBackColor = false;
+ this.xrTableCell49.StylePriority.UseBorders = false;
+ this.xrTableCell49.StylePriority.UseFont = false;
+ this.xrTableCell49.StylePriority.UseTextAlignment = false;
+ this.xrTableCell49.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
+ this.xrTableCell49.Weight = 0.13966474814693633D;
+ //
+ // formattingRuleStartDate
+ //
+ this.formattingRuleStartDate.Condition = "[StartDate2] < [StartDate]";
+ this.formattingRuleStartDate.DataMember = "ServicesDouble";
+ this.formattingRuleStartDate.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
+ this.formattingRuleStartDate.Name = "formattingRuleStartDate";
+ //
+ // ReportHeader
+ //
+ this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrLabel3,
+ this.xrLabel2,
+ this.xrLabel1,
+ this.xrLabel4});
+ this.ReportHeader.HeightF = 74.33334F;
+ this.ReportHeader.Name = "ReportHeader";
+ //
+ // xrLabel3
+ //
+ this.xrLabel3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(251)))), ((int)(((byte)(229)))), ((int)(((byte)(214)))));
+ this.xrLabel3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrLabel3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "EndDate", "{0:dd.MM.yyyy}")});
+ this.xrLabel3.Font = new System.Drawing.Font("Arial", 10F);
+ this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(50F, 30.50003F);
+ this.xrLabel3.Name = "xrLabel3";
+ this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
+ this.xrLabel3.SizeF = new System.Drawing.SizeF(100F, 30.50003F);
+ this.xrLabel3.StylePriority.UseBackColor = false;
+ this.xrLabel3.StylePriority.UseBorders = false;
+ this.xrLabel3.StylePriority.UseFont = false;
+ this.xrLabel3.StylePriority.UsePadding = false;
+ this.xrLabel3.StylePriority.UseTextAlignment = false;
+ this.xrLabel3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+ //
+ // xrLabel2
+ //
+ this.xrLabel2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(251)))), ((int)(((byte)(229)))), ((int)(((byte)(214)))));
+ this.xrLabel2.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
+ | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrLabel2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "StartDate", "{0:dd.MM.yyyy}")});
+ this.xrLabel2.Font = new System.Drawing.Font("Arial", 10F);
+ this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(50F, 0F);
+ this.xrLabel2.Name = "xrLabel2";
+ this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
+ this.xrLabel2.SizeF = new System.Drawing.SizeF(100F, 30.50003F);
+ this.xrLabel2.StylePriority.UseBackColor = false;
+ this.xrLabel2.StylePriority.UseBorders = false;
+ this.xrLabel2.StylePriority.UseFont = false;
+ this.xrLabel2.StylePriority.UsePadding = false;
+ this.xrLabel2.StylePriority.UseTextAlignment = false;
+ this.xrLabel2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+ //
+ // xrLabel1
+ //
+ this.xrLabel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(191)))), ((int)(((byte)(191)))), ((int)(((byte)(191)))));
+ this.xrLabel1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrLabel1.Font = new System.Drawing.Font("Arial", 10F);
+ this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 30.50003F);
+ this.xrLabel1.Name = "xrLabel1";
+ this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
+ this.xrLabel1.SizeF = new System.Drawing.SizeF(50F, 30.50003F);
+ this.xrLabel1.StylePriority.UseBackColor = false;
+ this.xrLabel1.StylePriority.UseBorders = false;
+ this.xrLabel1.StylePriority.UseFont = false;
+ this.xrLabel1.StylePriority.UsePadding = false;
+ this.xrLabel1.StylePriority.UseTextAlignment = false;
+ this.xrLabel1.Text = "Bis";
+ this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+ //
+ // xrLabel4
+ //
+ this.xrLabel4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(191)))), ((int)(((byte)(191)))), ((int)(((byte)(191)))));
+ this.xrLabel4.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
+ | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrLabel4.Font = new System.Drawing.Font("Arial", 10F);
+ this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+ this.xrLabel4.Name = "xrLabel4";
+ this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
+ this.xrLabel4.SizeF = new System.Drawing.SizeF(50F, 30.50003F);
+ this.xrLabel4.StylePriority.UseBackColor = false;
+ this.xrLabel4.StylePriority.UseBorders = false;
+ this.xrLabel4.StylePriority.UseFont = false;
+ this.xrLabel4.StylePriority.UsePadding = false;
+ this.xrLabel4.StylePriority.UseTextAlignment = false;
+ this.xrLabel4.Text = "Von";
+ this.xrLabel4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+ //
+ // formattingRuleServiceDesc
+ //
+ this.formattingRuleServiceDesc.Condition = "[StartDate2] < [StartDate]";
+ this.formattingRuleServiceDesc.DataMember = "ServicesDouble";
+ this.formattingRuleServiceDesc.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
+ this.formattingRuleServiceDesc.Name = "formattingRuleServiceDesc";
+ //
+ // formattingRuleCostBearer
+ //
+ this.formattingRuleCostBearer.Condition = "[StartDate2] < [StartDate]";
+ this.formattingRuleCostBearer.DataMember = "ServicesDouble";
+ this.formattingRuleCostBearer.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
+ this.formattingRuleCostBearer.Name = "formattingRuleCostBearer";
+ //
+ // formattingRuleEmployeeName
+ //
+ this.formattingRuleEmployeeName.Condition = "[StartDate2] < [StartDate]";
+ this.formattingRuleEmployeeName.DataMember = "ServicesDouble";
+ this.formattingRuleEmployeeName.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
+ this.formattingRuleEmployeeName.Name = "formattingRuleEmployeeName";
+ //
+ // topMarginBand1
+ //
+ this.topMarginBand1.HeightF = 30.20833F;
+ this.topMarginBand1.Name = "topMarginBand1";
+ //
+ // bottomMarginBand1
+ //
+ this.bottomMarginBand1.HeightF = 30F;
+ this.bottomMarginBand1.Name = "bottomMarginBand1";
+ //
+ // GroupFooter1
+ //
+ this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrTable1});
+ this.GroupFooter1.HeightF = 18F;
+ this.GroupFooter1.KeepTogether = true;
+ this.GroupFooter1.Name = "GroupFooter1";
+ //
+ // xrTable1
+ //
+ this.xrTable1.BorderColor = System.Drawing.Color.Black;
+ this.xrTable1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTable1.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+ this.xrTable1.Name = "xrTable1";
+ this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+ this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+ this.xrTableRow4});
+ this.xrTable1.SizeF = new System.Drawing.SizeF(740F, 18F);
+ this.xrTable1.StylePriority.UseFont = false;
+ this.xrTable1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+ //
+ // xrTableRow4
+ //
+ this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell23,
+ this.xrTableCell24,
+ this.xrTableCell25,
+ this.xrTableCell26,
+ this.xrTableCell27,
+ this.xrTableCell29,
+ this.xrTableCell30,
+ this.xrTableCell31,
+ this.xrTableCell46,
+ this.xrTableCell47,
+ this.xrTableCell51,
+ this.xrTableCell52,
+ this.xrTableCell53,
+ this.xrTableCell54,
+ this.xrTableCell55});
+ this.xrTableRow4.Font = new System.Drawing.Font("Arial", 9F);
+ this.xrTableRow4.Name = "xrTableRow4";
+ this.xrTableRow4.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+ this.xrTableRow4.StylePriority.UseFont = false;
+ this.xrTableRow4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+ this.xrTableRow4.Weight = 0.9D;
+ //
+ // xrTableCell23
+ //
+ this.xrTableCell23.Font = new System.Drawing.Font("Arial", 9F);
+ this.xrTableCell23.Name = "xrTableCell23";
+ this.xrTableCell23.StylePriority.UseBackColor = false;
+ this.xrTableCell23.StylePriority.UseFont = false;
+ this.xrTableCell23.StylePriority.UseTextAlignment = false;
+ xrSummary2.FormatString = "{0:0}";
+ xrSummary2.Func = DevExpress.XtraReports.UI.SummaryFunc.RecordNumber;
+ this.xrTableCell23.Summary = xrSummary2;
+ this.xrTableCell23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell23.Weight = 0.063131311769635892D;
+ //
+ // xrTableCell24
+ //
+ this.xrTableCell24.Font = new System.Drawing.Font("Arial", 9F);
+ this.xrTableCell24.Name = "xrTableCell24";
+ this.xrTableCell24.StylePriority.UseBackColor = false;
+ this.xrTableCell24.StylePriority.UseBorders = false;
+ this.xrTableCell24.StylePriority.UseFont = false;
+ this.xrTableCell24.StylePriority.UsePadding = false;
+ this.xrTableCell24.StylePriority.UseTextAlignment = false;
+ this.xrTableCell24.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell24.Weight = 0.12626262563884849D;
+ //
+ // xrTableCell25
+ //
+ this.xrTableCell25.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice")});
+ this.xrTableCell25.Font = new System.Drawing.Font("Arial", 9F);
+ this.xrTableCell25.Name = "xrTableCell25";
+ this.xrTableCell25.StylePriority.UseBackColor = false;
+ this.xrTableCell25.StylePriority.UseBorders = false;
+ this.xrTableCell25.StylePriority.UseFont = false;
+ this.xrTableCell25.StylePriority.UsePadding = false;
+ this.xrTableCell25.StylePriority.UseTextAlignment = false;
+ xrSummary3.FormatString = "{0:0}";
+ xrSummary3.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+ this.xrTableCell25.Summary = xrSummary3;
+ this.xrTableCell25.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell25.Weight = 0.05555561495598664D;
+ //
+ // xrTableCell26
+ //
+ this.xrTableCell26.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice2")});
+ this.xrTableCell26.Font = new System.Drawing.Font("Arial", 9F);
+ this.xrTableCell26.Name = "xrTableCell26";
+ this.xrTableCell26.StylePriority.UseBackColor = false;
+ this.xrTableCell26.StylePriority.UseBorders = false;
+ this.xrTableCell26.StylePriority.UseFont = false;
+ this.xrTableCell26.StylePriority.UsePadding = false;
+ this.xrTableCell26.StylePriority.UseTextAlignment = false;
+ xrSummary4.FormatString = "{0:0}";
+ xrSummary4.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+ this.xrTableCell26.Summary = xrSummary4;
+ this.xrTableCell26.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell26.Weight = 0.055555595689839164D;
+ //
+ // xrTableCell27
+ //
+ this.xrTableCell27.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice3")});
+ this.xrTableCell27.Font = new System.Drawing.Font("Arial", 9F);
+ this.xrTableCell27.Name = "xrTableCell27";
+ this.xrTableCell27.StylePriority.UseBackColor = false;
+ this.xrTableCell27.StylePriority.UseFont = false;
+ this.xrTableCell27.StylePriority.UsePadding = false;
+ this.xrTableCell27.StylePriority.UseTextAlignment = false;
+ xrSummary5.FormatString = "{0:0}";
+ xrSummary5.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+ this.xrTableCell27.Summary = xrSummary5;
+ this.xrTableCell27.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell27.Weight = 0.055555341324839372D;
+ //
+ // xrTableCell29
+ //
+ this.xrTableCell29.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice4")});
+ this.xrTableCell29.Font = new System.Drawing.Font("Arial", 9F);
+ this.xrTableCell29.Name = "xrTableCell29";
+ this.xrTableCell29.StylePriority.UseBackColor = false;
+ this.xrTableCell29.StylePriority.UseBorders = false;
+ this.xrTableCell29.StylePriority.UseFont = false;
+ this.xrTableCell29.StylePriority.UsePadding = false;
+ this.xrTableCell29.StylePriority.UseTextAlignment = false;
+ xrSummary6.FormatString = "{0:0}";
+ xrSummary6.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+ this.xrTableCell29.Summary = xrSummary6;
+ this.xrTableCell29.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell29.Weight = 0.055555630317059845D;
+ //
+ // xrTableCell30
+ //
+ this.xrTableCell30.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice5")});
+ this.xrTableCell30.Font = new System.Drawing.Font("Arial", 10F);
+ this.xrTableCell30.Name = "xrTableCell30";
+ this.xrTableCell30.StylePriority.UseBackColor = false;
+ this.xrTableCell30.StylePriority.UseBorders = false;
+ this.xrTableCell30.StylePriority.UseFont = false;
+ this.xrTableCell30.StylePriority.UsePadding = false;
+ this.xrTableCell30.StylePriority.UseTextAlignment = false;
+ xrSummary7.FormatString = "{0:0}";
+ xrSummary7.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+ this.xrTableCell30.Summary = xrSummary7;
+ this.xrTableCell30.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell30.Weight = 0.055555594097297781D;
+ //
+ // xrTableCell31
+ //
+ this.xrTableCell31.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.ServiceCategory")});
+ this.xrTableCell31.Name = "xrTableCell31";
+ this.xrTableCell31.StylePriority.UseBackColor = false;
+ this.xrTableCell31.StylePriority.UseTextAlignment = false;
+ xrSummary8.FormatString = "{0:0}";
+ xrSummary8.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+ this.xrTableCell31.Summary = xrSummary8;
+ this.xrTableCell31.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell31.Weight = 0.055555595016214182D;
+ //
+ // xrTableCell46
+ //
+ this.xrTableCell46.Name = "xrTableCell46";
+ this.xrTableCell46.StylePriority.UseBackColor = false;
+ this.xrTableCell46.StylePriority.UseTextAlignment = false;
+ this.xrTableCell46.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell46.Weight = 0.055555632806937594D;
+ //
+ // xrTableCell47
+ //
+ this.xrTableCell47.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.GefahreneKilometer")});
+ this.xrTableCell47.Name = "xrTableCell47";
+ this.xrTableCell47.StylePriority.UseBackColor = false;
+ this.xrTableCell47.StylePriority.UseTextAlignment = false;
+ xrSummary9.FormatString = "{0:0}";
+ xrSummary9.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+ this.xrTableCell47.Summary = xrSummary9;
+ this.xrTableCell47.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell47.Weight = 0.055555325752703361D;
+ //
+ // xrTableCell51
+ //
+ this.xrTableCell51.Name = "xrTableCell51";
+ this.xrTableCell51.StylePriority.UseBackColor = false;
+ this.xrTableCell51.StylePriority.UseTextAlignment = false;
+ this.xrTableCell51.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell51.Weight = 0.055555593812079931D;
+ //
+ // xrTableCell52
+ //
+ this.xrTableCell52.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.TimeRangeString")});
+ this.xrTableCell52.Name = "xrTableCell52";
+ this.xrTableCell52.StylePriority.UseBackColor = false;
+ this.xrTableCell52.StylePriority.UseBorders = false;
+ this.xrTableCell52.StylePriority.UseFont = false;
+ this.xrTableCell52.StylePriority.UsePadding = false;
+ this.xrTableCell52.StylePriority.UseTextAlignment = false;
+ xrSummary10.FormatString = "{0:0}";
+ xrSummary10.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+ this.xrTableCell52.Summary = xrSummary10;
+ this.xrTableCell52.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell52.Weight = 0.055555634752644537D;
+ //
+ // xrTableCell53
+ //
+ this.xrTableCell53.Font = new System.Drawing.Font("Arial", 9F);
+ this.xrTableCell53.Name = "xrTableCell53";
+ this.xrTableCell53.StylePriority.UseBackColor = false;
+ this.xrTableCell53.StylePriority.UseFont = false;
+ this.xrTableCell53.StylePriority.UseTextAlignment = false;
+ this.xrTableCell53.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+ this.xrTableCell53.Weight = 0.063131315799868082D;
+ //
+ // xrTableCell54
+ //
+ this.xrTableCell54.Font = new System.Drawing.Font("Arial", 9F);
+ this.xrTableCell54.Name = "xrTableCell54";
+ this.xrTableCell54.StylePriority.UseBackColor = false;
+ this.xrTableCell54.StylePriority.UseFont = false;
+ this.xrTableCell54.StylePriority.UseTextAlignment = false;
+ this.xrTableCell54.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+ this.xrTableCell54.Weight = 0.063131313391599567D;
+ //
+ // xrTableCell55
+ //
+ this.xrTableCell55.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.EmployeeLastName")});
+ this.xrTableCell55.Font = new System.Drawing.Font("Arial", 9F);
+ this.xrTableCell55.Name = "xrTableCell55";
+ this.xrTableCell55.StylePriority.UseBackColor = false;
+ this.xrTableCell55.StylePriority.UseBorders = false;
+ this.xrTableCell55.StylePriority.UseFont = false;
+ this.xrTableCell55.StylePriority.UsePadding = false;
+ this.xrTableCell55.StylePriority.UseTextAlignment = false;
+ xrSummary11.FormatString = "{0:0}";
+ xrSummary11.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+ this.xrTableCell55.Summary = xrSummary11;
+ this.xrTableCell55.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell55.Weight = 0.063131320138792066D;
+ //
+ // fieldKontaktArt
+ //
+ this.fieldKontaktArt.DataMember = "Services";
+ this.fieldKontaktArt.Expression = "Iif([IsGroup], \'GR\', \'E\')";
+ this.fieldKontaktArt.FieldType = DevExpress.XtraReports.UI.FieldType.String;
+ this.fieldKontaktArt.Name = "fieldKontaktArt";
+ //
+ // Dauer
+ //
+ this.Dauer.DataMember = "Services";
+ this.Dauer.Expression = "Iif(IsNullOrEmpty([Minutes]-[GroupMinutes]),null,[Minutes]-[GroupMinutes])";
+ this.Dauer.FieldType = DevExpress.XtraReports.UI.FieldType.String;
+ this.Dauer.Name = "Dauer";
+ //
+ // True
+ //
+ this.True.Name = "True";
+ //
+ // bindingSource1
+ //
+ this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
+ //
+ // Quittierungsbeleg
+ //
+ this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+ this.Detail,
+ this.DetailReport,
+ this.ReportHeader,
+ this.topMarginBand1,
+ this.bottomMarginBand1,
+ this.GroupFooter1});
+ this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] {
+ this.fieldKontaktArt,
+ this.Dauer});
+ this.DataSource = this.bindingSource1;
+ this.Font = new System.Drawing.Font("Arial", 10F);
+ this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
+ this.formattingRuleStartDate,
+ this.formattingRuleServiceDesc,
+ this.formattingRuleCostBearer,
+ this.formattingRuleEmployeeName,
+ this.True});
+ this.Margins = new System.Drawing.Printing.Margins(50, 30, 30, 30);
+ this.PageHeight = 1169;
+ this.PageWidth = 827;
+ this.PaperKind = System.Drawing.Printing.PaperKind.A4;
+ this.Version = "17.1";
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
+
+ }
+
+ #endregion
+
+ private DevExpress.XtraReports.UI.DetailBand Detail;
+ private System.Windows.Forms.BindingSource bindingSource1;
+ private DevExpress.XtraReports.UI.DetailReportBand DetailReport;
+ private DevExpress.XtraReports.UI.DetailBand Detail1;
+ private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader;
+ private DevExpress.XtraReports.UI.FormattingRule formattingRuleStartDate;
+ private DevExpress.XtraReports.UI.FormattingRule formattingRuleServiceDesc;
+ private DevExpress.XtraReports.UI.FormattingRule formattingRuleCostBearer;
+ private DevExpress.XtraReports.UI.FormattingRule formattingRuleEmployeeName;
+ private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1;
+ private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1;
+ private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader1;
+ private DevExpress.XtraReports.UI.XRTable xrTableServiceRecords1;
+ private DevExpress.XtraReports.UI.XRTableRow xrTableRow2;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell3;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell28;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell48;
+ private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell43;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell49;
+ private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel4;
+ private DevExpress.XtraReports.UI.XRTable xrTable3;
+ private DevExpress.XtraReports.UI.XRTableRow xrTableRow6;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell13;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell14;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell15;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell12;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell44;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell50;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
+ private DevExpress.XtraReports.UI.CalculatedField fieldKontaktArt;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell34;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell41;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell42;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell40;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell45;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell32;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell33;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell35;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell36;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell39;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell37;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell38;
+ private DevExpress.XtraReports.UI.CalculatedField Dauer;
+ private DevExpress.XtraReports.UI.FormattingRule True;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell18;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell17;
+ private DevExpress.XtraReports.UI.XRTableRow xrTableRow3;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell4;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell5;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell6;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell7;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell11;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell16;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell19;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell20;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell21;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell22;
+ private DevExpress.XtraReports.UI.XRTable xrTable1;
+ private DevExpress.XtraReports.UI.XRTableRow xrTableRow4;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell23;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell24;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell25;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell26;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell27;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell29;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell30;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell31;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell46;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell47;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell51;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell52;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell53;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell54;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell55;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel1;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel3;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel2;
+ }
+}
diff --git a/ReportImp/Fortis/ZeitdokumentationPlanIst.cs b/ReportImp/Fortis/ZeitdokumentationPlanIst.cs
new file mode 100644
index 000000000..ec77fcec7
--- /dev/null
+++ b/ReportImp/Fortis/ZeitdokumentationPlanIst.cs
@@ -0,0 +1,162 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using BeWo.Data.Access;
+using BeWo.Data.Entities;
+using BeWo.Report;
+using BeWo.Report.ReportObjects;
+using DevExpress.XtraReports.UI;
+
+namespace Fortis
+{
+ public partial class ZeitdokumentationPlanIst : XtraReport
+ {
+
+ public ZeitdokumentationPlanIst()
+ {
+ InitializeComponent();
+ }
+
+ public void SetReportDataSource(ServicesOverviewRO pRO)
+ {
+ if (pRO.Services != null)
+ {
+ Dictionary tag2Details = new Dictionary();
+
+ foreach (var sr in pRO.Services)
+ {
+ FortisServiceRecord fsr = null;
+ if (!tag2Details.ContainsKey(sr.StartDate.Day))
+ {
+ fsr = new FortisServiceRecord();
+ tag2Details.Add(sr.StartDate.Day, fsr);
+ }
+ else
+ {
+ fsr = tag2Details[sr.StartDate.Day];
+ }
+
+ if (sr.ServiceDescription.Contains("Wohnraum"))
+
+ {
+ fsr.MinutenH += sr.Minutes;
+ }
+ else if (sr.ServiceDescription.Contains("Sozialraum"))
+
+ {
+ fsr.MinutenB += sr.Minutes;
+ }
+ else if (sr.ServiceDescription.Contains("Telefon"))
+
+ {
+ fsr.MinutenT += sr.Minutes;
+ }
+ else if (sr.ServiceDescription.Contains("Dienststelle"))
+
+ {
+ fsr.MinutenGD += sr.Minutes;
+ }
+ else if (sr.ServiceDescription.Contains("pool"))
+
+ {
+ fsr.MinutenGI += sr.Minutes;
+ }
+ else if (sr.ServiceDescription.Contains("Kompensatorisch"))
+
+ {
+ fsr.MinutenKL += sr.Minutes;
+ }
+ else if (sr.ServiceDescription.Contains("Krankenhaus"))
+
+ {
+ fsr.MinutenAK += sr.Minutes;
+ }
+ else if (sr.ServiceDescription.Contains("abgesagt"))
+ {
+ fsr.FehlkontaktBeginn = sr.StartDate;
+ fsr.FehlkontaktEnde = sr.EndDate;
+ }
+ fsr.AnzahlMA += sr.EmployeeCount;
+ fsr.Groesse += sr.CustomerCount;
+ }
+
+ List newServices = new List();
+
+
+ for (int i = pRO.StartDate.Day; i <= pRO.EndDate.Day; i++)
+ {
+ if (tag2Details.ContainsKey(i))
+ {
+ var fsr = tag2Details[i];
+
+ var sr = new ServicesOverviewRO.ServiceDetail();
+ sr.StartDate = new DateTime(pRO.StartDate.Year, pRO.StartDate.Month, i);
+
+ //H Hausbesuch = Notice
+ //B Begleitung im Sozialraum = Notice2
+ //T Kontakt per Telefon etc. = Notice3
+ //GD Kontakt mit Leistungsberechtigten in der Dienststelle = Notice4
+ //KL Kompensatorische Leistung ohne LB = Notice5
+ //AK Assistenz im Krankenhaus = ServiceCategory
+ //MA Anzahl Mitarbeitende = ServiceCategoryAbbr (EmployeeCount)
+ //GI Gemeinsame Inanspruchnahme = GefahreneKilometer
+
+ //Größe = StartDateString (CustomerCount)
+ //Summe1 = TimeRangeString
+ //Beginn = EmployeeFirstName
+ //Ende = EmployeeFullname
+ //Summe2 = EmployeeLastname
+ if (fsr.MinutenH > 0)
+ {
+ sr.Notice = String.Format("{0:0}", fsr.MinutenH);
+ }
+ if (fsr.MinutenB > 0)
+ {
+ sr.Notice2 = String.Format("{0:0}", fsr.MinutenB);
+ }
+ if (fsr.MinutenT > 0)
+ {
+ sr.Notice3 = String.Format("{0:0}", fsr.MinutenT);
+ }
+ if (fsr.MinutenGD > 0)
+ {
+ sr.Notice4 = String.Format("{0:0}", fsr.MinutenGD);
+ }
+ if (fsr.MinutenKL > 0)
+ {
+ sr.Notice5 = String.Format("{0:0}", fsr.MinutenKL);
+ }
+ if (fsr.MinutenAK > 0)
+ {
+ sr.ServiceCategory = String.Format("{0:0}", fsr.MinutenAK);
+ }
+ if (fsr.MinutenGI > 0)
+ {
+ sr.GefahreneKilometer = String.Format("{0:0}", fsr.MinutenGI);
+ }
+
+ sr.EmployeeCount = fsr.AnzahlMA;
+ sr.CustomerCount = fsr.Groesse;
+
+ sr.TimeRangeString = String.Format("{0:0}", fsr.MinutenH + fsr.MinutenB + fsr.MinutenT + fsr.MinutenGD + fsr.MinutenKL + fsr.MinutenAK + fsr.MinutenGI);
+
+ if (fsr.FehlkontaktBeginn.HasValue && fsr.FehlkontaktEnde.HasValue)
+ {
+ sr.EmployeeFirstName = String.Format("{0:HH:mm}", fsr.FehlkontaktBeginn);
+ sr.EmployeeFullname = String.Format("{0:HH:mm}", fsr.FehlkontaktEnde);
+ sr.EmployeeLastName = String.Format("{0:0}", fsr.FehlkontaktEnde.Value.Subtract(fsr.FehlkontaktBeginn.Value).TotalMinutes);
+ }
+
+ newServices.Add(sr);
+ }
+ }
+ pRO.Services = newServices;
+
+
+ }
+ bindingSource1.DataSource = pRO;
+ }
+
+
+ }
+}
diff --git a/ReportImp/Fortis/ZeitdokumentationPlanIst.resx b/ReportImp/Fortis/ZeitdokumentationPlanIst.resx
new file mode 100644
index 000000000..19e908bd3
--- /dev/null
+++ b/ReportImp/Fortis/ZeitdokumentationPlanIst.resx
@@ -0,0 +1,123 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ 21, 17
+
+
\ No newline at end of file
diff --git a/ReportImp/PerspektivenEV/Service/CustomServiceRecordStatisticFactory.cs b/ReportImp/PerspektivenEV/Service/CustomServiceRecordStatisticFactory.cs
index 508b275e9..9b770bc2d 100644
--- a/ReportImp/PerspektivenEV/Service/CustomServiceRecordStatisticFactory.cs
+++ b/ReportImp/PerspektivenEV/Service/CustomServiceRecordStatisticFactory.cs
@@ -14,8 +14,8 @@ namespace PerspektivenEV.Service
{
// Ausblenden der Fahrtzeit und Gesondert vorgehaltenen Flächen
var stat = base.CreateSupportConceptStatisticsImpl(costBearer2SupportConceptOid, statisticsDate, ignoreServiceRecordOid);
- stat.PeriodStatistics = stat.PeriodStatistics.Where(p => p.SupportConceptApprovalPeriod.ServiceCategory == null ||
- (p.SupportConceptApprovalPeriod.ServiceCategory != null && !p.SupportConceptApprovalPeriod.ServiceCategory.Abbreviation.Contains("GVF")
+ stat.PeriodStatistics = stat.PeriodStatistics.Where(p => p.SupportConceptApprovalPeriod.ServiceCategory == null || String.IsNullOrEmpty(p.SupportConceptApprovalPeriod.ServiceCategory.Abbreviation) ||
+ (!p.SupportConceptApprovalPeriod.ServiceCategory.Abbreviation.Contains("GVF")
&& !p.SupportConceptApprovalPeriod.ServiceCategory.Abbreviation.Contains("AFZ"))).ToList();
return stat;
diff --git a/ReportImp/SHKService/CustomMitarbeiterstundenkontoBerechnung.cs b/ReportImp/SHKService/CustomMitarbeiterstundenkontoBerechnung.cs
index f4a3ebea4..1a48a4320 100644
--- a/ReportImp/SHKService/CustomMitarbeiterstundenkontoBerechnung.cs
+++ b/ReportImp/SHKService/CustomMitarbeiterstundenkontoBerechnung.cs
@@ -9,6 +9,11 @@ namespace SHKService
{
public class CustomMitarbeiterstundenkontoBerechnung : MitarbeiterstundenkontoBerechnung
{
+ protected override void StarteBerechnung(DateTime berichtsAnfang, DateTime berichtsEnde, MitarbeiterstundenkontoRO.EmployeeDetail empDetail)
+ {
+ this.vacationService.Bundesland = "Hessen";
+ }
+
public override bool AddServiceRecordToDuration(ServiceRecord item)
{
if (item.ServiceDescription != null && item.ServiceDescription.ServiceCategory != null)
@@ -125,23 +130,66 @@ namespace SHKService
dd.MinutesTotal = 0;
}
}
+
+ if (dd.MinutesTotal == 0 && dd.Feiertag != null && dd.SollStunden > 0)
+ {
+ dd.MinutesTotal = dd.SollStunden * 60;
+ }
+
+ if (dd.AbsenceTimes != null)
+ {
+ foreach (var at in dd.AbsenceTimes)
+ {
+ if (at.AbsenceReason.Description == "Krankengeld" || at.AbsenceReason.Description == "Unbezahlten Urlaub")
+ {
+ dd.Custom1 = "x"; // String.Format("{0:0.00}", ed.SollProTag * 60);
+ }
+ if (AbsenceTimeAufIstStundenAddieren(at))
+ {
+ dd.MinutesTotal = dd.SollStunden * 60;
+ }
+ }
+ }
}
return list;
}
+
protected override decimal GetDuration(ServiceRecord sr, MitarbeiterstundenkontoRO.EmployeeDetail ed)
{
var d = base.GetDuration(sr, ed);
if (sr.ServiceDescription.ServiceCategory.Name == "Arbeitszeit" && sr.ServiceDescription.Name == "Zeitabzug")
{
-
d *= -1;
}
return d;
}
+ public override bool IstAnrechenbareAbsenceTime(AbsenceTime item)
+ {
+ if (item.AbsenceReason.Description == "Freizeitausgleich")
+ {
+ return false;
+ }
+ return base.IstAnrechenbareAbsenceTime(item);
+ }
+
+ public override bool IsKrankheitAbsenceTime(AbsenceTime absenceTime)
+ {
+ return !IsUrlaubAbsenceTime(absenceTime);
+ }
+
+ public override bool AbsenceTimeAufIstStundenAddieren(AbsenceTime at)
+ {
+ if (at.AbsenceReason.Description == "Mutterschutz")
+ {
+ return true;
+ }
+ return base.AbsenceTimeAufIstStundenAddieren(at);
+ }
+
public override bool SollPauseBerechnen()
{
return true;
@@ -188,5 +236,10 @@ namespace SHKService
}
return pausenZeit;
}
+
+ public override bool BerechneFeiertageAlsArbeitszeit()
+ {
+ return true;
+ }
}
}
\ No newline at end of file
diff --git a/ReportImp/SHKService/Mitarbeiterarbeitszeitkonto.designer.cs b/ReportImp/SHKService/Mitarbeiterarbeitszeitkonto.designer.cs
index c92ffa1e2..f18e7667e 100644
--- a/ReportImp/SHKService/Mitarbeiterarbeitszeitkonto.designer.cs
+++ b/ReportImp/SHKService/Mitarbeiterarbeitszeitkonto.designer.cs
@@ -45,6 +45,7 @@ namespace SHKService
this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell67 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell32 = new DevExpress.XtraReports.UI.XRTableCell();
this.ruleIstFeiertagOderWE = new DevExpress.XtraReports.UI.FormattingRule();
this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
this.DetailReport1 = new DevExpress.XtraReports.UI.DetailReportBand();
@@ -58,15 +59,19 @@ namespace SHKService
this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell();
this.GroupHeader3 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.lblMonat = new DevExpress.XtraReports.UI.XRLabel();
this.xrTable2 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow8 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
this.cellRegelarbeitszeit = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -80,6 +85,7 @@ namespace SHKService
this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
this.cellSumHoursSickDecimal = new DevExpress.XtraReports.UI.XRTableCell();
this.cellSumHoursInVacationDecimal = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell33 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell46 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -118,9 +124,7 @@ namespace SHKService
this.fieldSumHoliday2 = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldIstArbeitszeit = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldUeberstundenGesamt = new DevExpress.XtraReports.UI.CalculatedField();
- this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.fieldPause = new DevExpress.XtraReports.UI.CalculatedField();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit();
@@ -154,7 +158,7 @@ namespace SHKService
this.xrTableDetail.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableDetail.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRowDetail});
- this.xrTableDetail.SizeF = new System.Drawing.SizeF(680.0001F, 22F);
+ this.xrTableDetail.SizeF = new System.Drawing.SizeF(735F, 22F);
this.xrTableDetail.StylePriority.UseBorders = false;
this.xrTableDetail.StylePriority.UseFont = false;
this.xrTableDetail.StylePriority.UsePadding = false;
@@ -169,7 +173,8 @@ namespace SHKService
this.xrTableCell31,
this.xrTableCell12,
this.xrTableCell67,
- this.xrTableCell27});
+ this.xrTableCell27,
+ this.xrTableCell32});
this.xrTableRowDetail.FormattingRules.Add(this.ruleIstFeiertagOderWE);
this.xrTableRowDetail.Name = "xrTableRowDetail";
this.xrTableRowDetail.Weight = 0.88D;
@@ -184,7 +189,7 @@ namespace SHKService
this.xrTableCell3.StylePriority.UsePadding = false;
this.xrTableCell3.StylePriority.UseTextAlignment = false;
this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
- this.xrTableCell3.Weight = 0.090171325518485154D;
+ this.xrTableCell3.Weight = 0.081154186862521918D;
this.xrTableCell3.XlsxFormatString = "ddd. dd.MM.yyyy";
//
// xrTableCell20
@@ -193,7 +198,7 @@ namespace SHKService
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Days.ZeitraeumeString", "{0:HH:mm}")});
this.xrTableCell20.Name = "xrTableCell20";
this.xrTableCell20.Text = "xrTableCell20";
- this.xrTableCell20.Weight = 0.27051398343498156D;
+ this.xrTableCell20.Weight = 0.24346256746709186D;
//
// xrTableCell31
//
@@ -203,16 +208,16 @@ namespace SHKService
this.xrTableCell31.StylePriority.UseTextAlignment = false;
this.xrTableCell31.Text = "xrTableCell31";
this.xrTableCell31.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
- this.xrTableCell31.Weight = 0.063119930374871888D;
+ this.xrTableCell31.Weight = 0.06762848938356511D;
//
// xrTableCell12
//
this.xrTableCell12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Days.PauseInMinuten")});
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Days.fieldPause", "{0:0.00}")});
this.xrTableCell12.Name = "xrTableCell12";
this.xrTableCell12.StylePriority.UseTextAlignment = false;
this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
- this.xrTableCell12.Weight = 0.063119875338662257D;
+ this.xrTableCell12.Weight = 0.0676284893835602D;
//
// xrTableCell67
//
@@ -222,7 +227,7 @@ namespace SHKService
this.xrTableCell67.StylePriority.UseTextAlignment = false;
this.xrTableCell67.Text = "xrTableCell67";
this.xrTableCell67.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
- this.xrTableCell67.Weight = 0.063120042167172666D;
+ this.xrTableCell67.Weight = 0.067628491103456534D;
//
// xrTableCell27
//
@@ -232,7 +237,16 @@ namespace SHKService
this.xrTableCell27.StylePriority.UseTextAlignment = false;
this.xrTableCell27.Text = "xrTableCell27";
this.xrTableCell27.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
- this.xrTableCell27.Weight = 0.063119914035996524D;
+ this.xrTableCell27.Weight = 0.06762847304468976D;
+ //
+ // xrTableCell32
+ //
+ this.xrTableCell32.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Days.Custom1")});
+ this.xrTableCell32.Name = "xrTableCell32";
+ this.xrTableCell32.StylePriority.UseTextAlignment = false;
+ this.xrTableCell32.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell32.Weight = 0.06762847304468976D;
//
// ruleIstFeiertagOderWE
//
@@ -291,7 +305,7 @@ namespace SHKService
this.xrTableHeader.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableHeader.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRowHeader});
- this.xrTableHeader.SizeF = new System.Drawing.SizeF(680F, 30F);
+ this.xrTableHeader.SizeF = new System.Drawing.SizeF(735F, 30F);
this.xrTableHeader.StylePriority.UseBackColor = false;
this.xrTableHeader.StylePriority.UseBorders = false;
this.xrTableHeader.StylePriority.UseFont = false;
@@ -307,7 +321,8 @@ namespace SHKService
this.xrTableCell7,
this.xrTableCell11,
this.xrTableCell8,
- this.xrTableCell10});
+ this.xrTableCell10,
+ this.xrTableCell29});
this.xrTableRowHeader.Name = "xrTableRowHeader";
this.xrTableRowHeader.Weight = 0.79999999999999982D;
//
@@ -319,7 +334,7 @@ namespace SHKService
this.xrTableCell5.StylePriority.UseTextAlignment = false;
this.xrTableCell5.Text = "Datum";
this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
- this.xrTableCell5.Weight = 0.090171325629990237D;
+ this.xrTableCell5.Weight = 0.081154193095780036D;
//
// xrTableCell2
//
@@ -327,7 +342,7 @@ namespace SHKService
this.xrTableCell2.StylePriority.UseTextAlignment = false;
this.xrTableCell2.Text = "Uhrzeit";
this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
- this.xrTableCell2.Weight = 0.27051397634361185D;
+ this.xrTableCell2.Weight = 0.24346257874098126D;
//
// xrTableCell7
//
@@ -335,7 +350,7 @@ namespace SHKService
this.xrTableCell7.StylePriority.UseTextAlignment = false;
this.xrTableCell7.Text = "Stunden";
this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
- this.xrTableCell7.Weight = 0.063119928929937077D;
+ this.xrTableCell7.Weight = 0.067628495197042171D;
//
// xrTableCell11
//
@@ -343,7 +358,7 @@ namespace SHKService
this.xrTableCell11.StylePriority.UseTextAlignment = false;
this.xrTableCell11.Text = "Pause";
this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
- this.xrTableCell11.Weight = 0.063119928895488023D;
+ this.xrTableCell11.Weight = 0.06762849516259313D;
//
// xrTableCell8
//
@@ -352,7 +367,7 @@ namespace SHKService
this.xrTableCell8.StylePriority.UseTextAlignment = false;
this.xrTableCell8.Text = "Krank";
this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
- this.xrTableCell8.Weight = 0.06311992750638197D;
+ this.xrTableCell8.Weight = 0.067628493773487064D;
//
// xrTableCell10
//
@@ -362,7 +377,15 @@ namespace SHKService
this.xrTableCell10.StylePriority.UseTextAlignment = false;
this.xrTableCell10.Text = "Urlaub";
this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
- this.xrTableCell10.Weight = 0.063119926380177924D;
+ this.xrTableCell10.Weight = 0.067628492647283017D;
+ //
+ // xrTableCell29
+ //
+ this.xrTableCell29.Name = "xrTableCell29";
+ this.xrTableCell29.StylePriority.UseTextAlignment = false;
+ this.xrTableCell29.Text = "ohne LFZ";
+ this.xrTableCell29.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell29.Weight = 0.067628492647283017D;
//
// GroupHeader3
//
@@ -440,6 +463,30 @@ namespace SHKService
this.xrTableCell25.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell25.Weight = 0.42678331118474744D;
//
+ // xrTableCell30
+ //
+ this.xrTableCell30.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+ this.xrTableCell30.Name = "xrTableCell30";
+ this.xrTableCell30.StylePriority.UseFont = false;
+ this.xrTableCell30.StylePriority.UseTextAlignment = false;
+ this.xrTableCell30.Text = "Personalnummer:";
+ this.xrTableCell30.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+ this.xrTableCell30.Weight = 0.24895814510513284D;
+ //
+ // xrTableCell14
+ //
+ this.xrTableCell14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FirstName")});
+ this.xrTableCell14.Font = new System.Drawing.Font("Arial", 10F);
+ this.xrTableCell14.Name = "xrTableCell14";
+ this.xrTableCell14.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
+ this.xrTableCell14.StylePriority.UseFont = false;
+ this.xrTableCell14.StylePriority.UsePadding = false;
+ this.xrTableCell14.StylePriority.UseTextAlignment = false;
+ this.xrTableCell14.Text = "xrTableCell14";
+ this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+ this.xrTableCell14.Weight = 0.24895814510513284D;
+ //
// xrTableRow8
//
this.xrTableRow8.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
@@ -472,6 +519,13 @@ namespace SHKService
this.cellRegelarbeitszeit.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.cellRegelarbeitszeit.Weight = 0.5835277006587D;
//
+ // xrTableCell22
+ //
+ this.xrTableCell22.Name = "xrTableCell22";
+ this.xrTableCell22.StylePriority.UseTextAlignment = false;
+ this.xrTableCell22.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+ this.xrTableCell22.Weight = 0.34117190073631326D;
+ //
// xrTableRow10
//
this.xrTableRow10.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
@@ -544,7 +598,7 @@ namespace SHKService
this.xrTable4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow9});
- this.xrTable4.SizeF = new System.Drawing.SizeF(570F, 22F);
+ this.xrTable4.SizeF = new System.Drawing.SizeF(625F, 22F);
this.xrTable4.StylePriority.UseBorders = false;
this.xrTable4.StylePriority.UseFont = false;
this.xrTable4.StylePriority.UsePadding = false;
@@ -558,7 +612,8 @@ namespace SHKService
this.cellSumMinutesTotalDecimal,
this.xrTableCell13,
this.cellSumHoursSickDecimal,
- this.cellSumHoursInVacationDecimal});
+ this.cellSumHoursInVacationDecimal,
+ this.xrTableCell33});
this.xrTableRow9.Name = "xrTableRow9";
this.xrTableRow9.Weight = 0.87999999999999978D;
//
@@ -570,7 +625,7 @@ namespace SHKService
this.xrTableCell64.StylePriority.UseTextAlignment = false;
this.xrTableCell64.Text = "Summe:";
this.xrTableCell64.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
- this.xrTableCell64.Weight = 0.26149405118689462D;
+ this.xrTableCell64.Weight = 0.22542590687581596D;
//
// cellSumMinutesTotalDecimal
//
@@ -584,18 +639,19 @@ namespace SHKService
this.cellSumMinutesTotalDecimal.Summary = xrSummary1;
this.cellSumMinutesTotalDecimal.Text = "cellSumMinutesTotalDecimal";
this.cellSumMinutesTotalDecimal.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
- this.cellSumMinutesTotalDecimal.Weight = 0.0631191946273484D;
+ this.cellSumMinutesTotalDecimal.Weight = 0.06762776770185383D;
//
// xrTableCell13
//
this.xrTableCell13.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Days.PauseInMinuten")});
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Days.fieldPause")});
this.xrTableCell13.Name = "xrTableCell13";
this.xrTableCell13.StylePriority.UseTextAlignment = false;
+ xrSummary2.FormatString = "{0:0.00}";
xrSummary2.Running = DevExpress.XtraReports.UI.SummaryRunning.Report;
this.xrTableCell13.Summary = xrSummary2;
this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
- this.xrTableCell13.Weight = 0.0631191946273484D;
+ this.xrTableCell13.Weight = 0.06762776770185383D;
//
// cellSumHoursSickDecimal
//
@@ -610,7 +666,7 @@ namespace SHKService
this.cellSumHoursSickDecimal.Summary = xrSummary3;
this.cellSumHoursSickDecimal.Text = "cellSumHoursSickDecimal";
this.cellSumHoursSickDecimal.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
- this.cellSumHoursSickDecimal.Weight = 0.0631193595441027D;
+ this.cellSumHoursSickDecimal.Weight = 0.067627767511746345D;
//
// cellSumHoursInVacationDecimal
//
@@ -626,7 +682,14 @@ namespace SHKService
this.cellSumHoursInVacationDecimal.Summary = xrSummary4;
this.cellSumHoursInVacationDecimal.Text = "cellSumHoursInVacationDecimal";
this.cellSumHoursInVacationDecimal.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
- this.cellSumHoursInVacationDecimal.Weight = 0.0631192564471769D;
+ this.cellSumHoursInVacationDecimal.Weight = 0.067627774486061748D;
+ //
+ // xrTableCell33
+ //
+ this.xrTableCell33.Name = "xrTableCell33";
+ this.xrTableCell33.StylePriority.UseTextAlignment = false;
+ this.xrTableCell33.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+ this.xrTableCell33.Weight = 0.067627774486061748D;
//
// xrTable1
//
@@ -1016,36 +1079,12 @@ namespace SHKService
this.fieldUeberstundenGesamt.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.fieldUeberstundenGesamt.Name = "fieldUeberstundenGesamt";
//
- // xrTableCell14
+ // fieldPause
//
- this.xrTableCell14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FirstName")});
- this.xrTableCell14.Font = new System.Drawing.Font("Arial", 10F);
- this.xrTableCell14.Name = "xrTableCell14";
- this.xrTableCell14.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
- this.xrTableCell14.StylePriority.UseFont = false;
- this.xrTableCell14.StylePriority.UsePadding = false;
- this.xrTableCell14.StylePriority.UseTextAlignment = false;
- this.xrTableCell14.Text = "xrTableCell14";
- this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
- this.xrTableCell14.Weight = 0.24895814510513284D;
- //
- // xrTableCell22
- //
- this.xrTableCell22.Name = "xrTableCell22";
- this.xrTableCell22.StylePriority.UseTextAlignment = false;
- this.xrTableCell22.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
- this.xrTableCell22.Weight = 0.34117190073631326D;
- //
- // xrTableCell30
- //
- this.xrTableCell30.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
- this.xrTableCell30.Name = "xrTableCell30";
- this.xrTableCell30.StylePriority.UseFont = false;
- this.xrTableCell30.StylePriority.UseTextAlignment = false;
- this.xrTableCell30.Text = "Personalnummer:";
- this.xrTableCell30.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
- this.xrTableCell30.Weight = 0.24895814510513284D;
+ this.fieldPause.DataMember = "EmployeeDetailList.Days";
+ this.fieldPause.Expression = "[PauseInMinuten]/60";
+ this.fieldPause.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
+ this.fieldPause.Name = "fieldPause";
//
// bindingSource1
//
@@ -1069,13 +1108,14 @@ namespace SHKService
this.fieldSumHours,
this.fieldSumHoliday2,
this.fieldIstArbeitszeit,
- this.fieldUeberstundenGesamt});
+ this.fieldUeberstundenGesamt,
+ this.fieldPause});
this.DataSource = this.bindingSource1;
this.DisplayName = "Mitarbeiterstundenkonto";
this.Font = new System.Drawing.Font("Arial", 8F);
this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
this.ruleIstFeiertagOderWE});
- this.Margins = new System.Drawing.Printing.Margins(75, 50, 50, 50);
+ this.Margins = new System.Drawing.Printing.Margins(40, 40, 50, 50);
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = System.Drawing.Printing.PaperKind.A4;
@@ -1184,5 +1224,9 @@ namespace SHKService
private DevExpress.XtraReports.UI.XRTableCell xrTableCell30;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell14;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell22;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell29;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell32;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell33;
+ private DevExpress.XtraReports.UI.CalculatedField fieldPause;
}
}
diff --git a/ReportImp/SHKServiceSBD/CustomMitarbeiterstundenkontoBerechnung.cs b/ReportImp/SHKServiceSBD/CustomMitarbeiterstundenkontoBerechnung.cs
index 6765b41e4..f8e8357ac 100644
--- a/ReportImp/SHKServiceSBD/CustomMitarbeiterstundenkontoBerechnung.cs
+++ b/ReportImp/SHKServiceSBD/CustomMitarbeiterstundenkontoBerechnung.cs
@@ -347,6 +347,16 @@ namespace SHKServiceSBD
return true;
}
+ public override bool BerechneFeiertageAlsArbeitszeit()
+ {
+ return true;
+ }
+
+ public override bool AbsenceTimeAufIstStundenAddieren(AbsenceTime at)
+ {
+ return false;
+ }
+
public override MitarbeiterstundenkontoRO.DayDetail CreateDayDetail(DateTime date, MitarbeiterstundenkontoRO.EmployeeDetail ed)
{
var dd = base.CreateDayDetail(date, ed);
@@ -364,7 +374,6 @@ namespace SHKServiceSBD
return 1;
}
-
return base.GetFeiertagsFaktor(start);
}
diff --git a/ReportImp/VSDHammReports/Calculations/VSDCalculations.cs b/ReportImp/VSDHammReports/Calculations/VSDCalculations.cs
index dc694773e..aeb39d9cc 100644
--- a/ReportImp/VSDHammReports/Calculations/VSDCalculations.cs
+++ b/ReportImp/VSDHammReports/Calculations/VSDCalculations.cs
@@ -9,152 +9,152 @@ using BS.Shared.Services;
namespace VSDHammReports
{
- public class VSDCalculations : LWLCalculations
- {
+ //public class VSDCalculations : LWLCalculations
+ //{
- public override decimal? GetApprovedHoursTotal(SupportConceptCostBearerRelDC relDC, bool useIsCalculationWithFactor)
- {
- if (relDC.ApprovalPeriodList == null || !relDC.GetApprovedDuration().HasValue)
- {
- return null;
- }
+ // public override decimal? GetApprovedHoursTotal(SupportConceptCostBearerRelDC relDC, bool useIsCalculationWithFactor)
+ // {
+ // if (relDC.ApprovalPeriodList == null || !relDC.GetApprovedDuration().HasValue)
+ // {
+ // return null;
+ // }
- if (!useIsCalculationWithFactor)
- {
- return base.GetApprovedHoursTotal(relDC, useIsCalculationWithFactor);
- }
+ // if (!useIsCalculationWithFactor)
+ // {
+ // return base.GetApprovedHoursTotal(relDC, useIsCalculationWithFactor);
+ // }
- decimal hoursTotal = 0;
+ // decimal hoursTotal = 0;
- foreach (var scap in relDC.ApprovalPeriodList)
- {
- var newhoursTotal = this.GetApprovedHoursTotal(scap, relDC.CostBearer.CostRatePeriods);
+ // foreach (var scap in relDC.ApprovalPeriodList)
+ // {
+ // var newhoursTotal = this.GetApprovedHoursTotal(scap, relDC.CostBearer.CostRatePeriods);
- if (newhoursTotal.HasValue)
- {
- newhoursTotal = ApplyIsCalculationWithFactor(relDC, scap, newhoursTotal);
- hoursTotal += newhoursTotal.Value;
- }
- }
+ // if (newhoursTotal.HasValue)
+ // {
+ // newhoursTotal = ApplyIsCalculationWithFactor(relDC, scap, newhoursTotal);
+ // hoursTotal += newhoursTotal.Value;
+ // }
+ // }
- hoursTotal = Math.Round(hoursTotal, 10, MidpointRounding.AwayFromZero);
- return hoursTotal;
- }
+ // hoursTotal = Math.Round(hoursTotal, 10, MidpointRounding.AwayFromZero);
+ // return hoursTotal;
+ // }
- public override decimal? GetApprovedHoursForPeriod(SupportConceptCostBearerRelDC relDC,
- SupportConceptApprovalPeriodDC scap,
- List costRatePeriods,
- DateTime? pStart,
- DateTime? pEnd,
- bool useIsCalculationWithFactor)
- {
- decimal? approvedHours = GetApprovedHoursForPeriod(scap, costRatePeriods, pStart, pEnd);
- if (approvedHours.HasValue && useIsCalculationWithFactor)
- approvedHours = ApplyIsCalculationWithFactor(relDC, scap, approvedHours);
- return approvedHours;
+ // public override decimal? GetApprovedHoursForPeriod(SupportConceptCostBearerRelDC relDC,
+ // SupportConceptApprovalPeriodDC scap,
+ // List costRatePeriods,
+ // DateTime? pStart,
+ // DateTime? pEnd,
+ // bool useIsCalculationWithFactor)
+ // {
+ // decimal? approvedHours = GetApprovedHoursForPeriod(scap, costRatePeriods, pStart, pEnd);
+ // if (approvedHours.HasValue && useIsCalculationWithFactor)
+ // approvedHours = ApplyIsCalculationWithFactor(relDC, scap, approvedHours);
+ // return approvedHours;
- }
+ // }
- public decimal? ApplyIsCalculationWithFactor(SupportConceptCostBearerRelDC relDC, SupportConceptApprovalPeriodDC scap, decimal? valueToApply)
- {
- if (valueToApply.HasValue && relDC .CostBearer != null && relDC.CostBearer.IsCalculatingWithFactor)
- {
- if (relDC.CostBearer.CostRatePeriods != null)
- {
- var rateFactorsInSpan = relDC.CostBearer.CostRatePeriods.GetSpans(CostRatePeriodType.RateFactor, scap.StartDate.Value.Date, scap.EndDate.Value.Date).ToList();
+ // public decimal? ApplyIsCalculationWithFactor(SupportConceptCostBearerRelDC relDC, SupportConceptApprovalPeriodDC scap, decimal? valueToApply)
+ // {
+ // if (valueToApply.HasValue && relDC .CostBearer != null && relDC.CostBearer.IsCalculatingWithFactor)
+ // {
+ // if (relDC.CostBearer.CostRatePeriods != null)
+ // {
+ // var rateFactorsInSpan = relDC.CostBearer.CostRatePeriods.GetSpans(CostRatePeriodType.RateFactor, scap.StartDate.Value.Date, scap.EndDate.Value.Date).ToList();
- if (rateFactorsInSpan.Count > 1)
- {
- decimal totalhours = 0;
+ // if (rateFactorsInSpan.Count > 1)
+ // {
+ // decimal totalhours = 0;
- var totalDays = (scap.EndDate.Value - scap.StartDate.Value).Days + 1;
- foreach (var keyValuePair in rateFactorsInSpan)
- {
- var span = keyValuePair.Value;
- var rf = keyValuePair.Key;
+ // var totalDays = (scap.EndDate.Value - scap.StartDate.Value).Days + 1;
+ // foreach (var keyValuePair in rateFactorsInSpan)
+ // {
+ // var span = keyValuePair.Value;
+ // var rf = keyValuePair.Key;
- if (rf.CostRateValue.HasValue && rf.CostRateValue.Value > 0)
- {
- var spanDays = (span.EndDate - span.StartDate).Days + 1;
+ // if (rf.CostRateValue.HasValue && rf.CostRateValue.Value > 0)
+ // {
+ // var spanDays = (span.EndDate - span.StartDate).Days + 1;
- decimal prozent = (spanDays/(decimal)totalDays);
- decimal hours = valueToApply.Value * prozent;
+ // decimal prozent = (spanDays/(decimal)totalDays);
+ // decimal hours = valueToApply.Value * prozent;
- hours = (hours * 100) / (rf.CostRateValue.Value + 100);
+ // hours = (hours * 100) / (rf.CostRateValue.Value + 100);
- totalhours += hours;
- }
+ // totalhours += hours;
+ // }
- }
+ // }
- return totalhours;
- }
- else
- {
- decimal? rateFactor =
- relDC.CostBearer.CostRatePeriods.GetValidRateValueForDate(CostRatePeriodType.RateFactor, scap.StartDate.Value);
- if (rateFactor.HasValue && rateFactor.Value > 0)
- valueToApply = (valueToApply.Value*100)/(rateFactor.Value + 100);
- }
- }
+ // return totalhours;
+ // }
+ // else
+ // {
+ // decimal? rateFactor =
+ // relDC.CostBearer.CostRatePeriods.GetValidRateValueForDate(CostRatePeriodType.RateFactor, scap.StartDate.Value);
+ // if (rateFactor.HasValue && rateFactor.Value > 0)
+ // valueToApply = (valueToApply.Value*100)/(rateFactor.Value + 100);
+ // }
+ // }
- }
- return valueToApply;
- }
+ // }
+ // return valueToApply;
+ // }
- public override decimal? GetApprovedHoursForPeriod(SupportConceptApprovalPeriodDC scap,
- List costRatePeriods,
- DateTime? pStart,
- DateTime? pEnd)
- {
- if (!pStart.HasValue || !pEnd.HasValue)
- {
- return null;
- }
- if (scap.ApprovedBEInterval.HasValue && scap.ApprovedBEPerInterval.HasValue)
- {
- if (scap.ApprovedBEInterval.Value == SupportConceptApprovalInterval.Monthly)
- {
- var months = GetTotalMonths(pStart.Value, pEnd.Value);
- return months * scap.ApprovedBEPerInterval.Value;
- }
- else if (scap.ApprovedBEInterval.Value == SupportConceptApprovalInterval.Quarterly)
- {
- var qs = GetTotalQuarters(pStart.Value, pEnd.Value);
- return qs * scap.ApprovedBEPerInterval.Value;
- }
- }
+ // public override decimal? GetApprovedHoursForPeriod(SupportConceptApprovalPeriodDC scap,
+ // List costRatePeriods,
+ // DateTime? pStart,
+ // DateTime? pEnd)
+ // {
+ // if (!pStart.HasValue || !pEnd.HasValue)
+ // {
+ // return null;
+ // }
+ // if (scap.ApprovedBEInterval.HasValue && scap.ApprovedBEPerInterval.HasValue)
+ // {
+ // if (scap.ApprovedBEInterval.Value == SupportConceptApprovalInterval.Monthly)
+ // {
+ // var months = GetTotalMonths(pStart.Value, pEnd.Value);
+ // return months * scap.ApprovedBEPerInterval.Value;
+ // }
+ // else if (scap.ApprovedBEInterval.Value == SupportConceptApprovalInterval.Quarterly)
+ // {
+ // var qs = GetTotalQuarters(pStart.Value, pEnd.Value);
+ // return qs * scap.ApprovedBEPerInterval.Value;
+ // }
+ // }
- var periodInDays = (pEnd.Value.Date - pStart.Value.Date).Days + 1;
+ // var periodInDays = (pEnd.Value.Date - pStart.Value.Date).Days + 1;
- return this.GetApprovedHoursPerDay(scap, costRatePeriods) * periodInDays;
- }
+ // return this.GetApprovedHoursPerDay(scap, costRatePeriods) * periodInDays;
+ // }
- public override decimal? GetApprovedHoursPerDay(SupportConceptApprovalPeriodDC scap,
- List costRatePeriods)
- {
- if (scap.EndDate.HasValue && scap.StartDate.HasValue && scap.ApprovedBEPerInterval.HasValue && !scap.ApprovedBETotal.HasValue
- && scap.ApprovedBEInterval.HasValue && scap.ApprovedBEInterval.Value == SupportConceptApprovalInterval.Weekly)
- {
- var scapDurationInDays = (scap.EndDate.Value - scap.StartDate.Value).Days + 1;
+ // public override decimal? GetApprovedHoursPerDay(SupportConceptApprovalPeriodDC scap,
+ // List costRatePeriods)
+ // {
+ // if (scap.EndDate.HasValue && scap.StartDate.HasValue && scap.ApprovedBEPerInterval.HasValue && !scap.ApprovedBETotal.HasValue
+ // && scap.ApprovedBEInterval.HasValue && scap.ApprovedBEInterval.Value == SupportConceptApprovalInterval.Weekly)
+ // {
+ // var scapDurationInDays = (scap.EndDate.Value - scap.StartDate.Value).Days + 1;
- decimal weeks = Math.Round(scapDurationInDays * 0.1427m, 2, MidpointRounding.AwayFromZero);
- decimal total = weeks * scap.ApprovedBEPerInterval.Value;
+ // decimal weeks = Math.Round(scapDurationInDays * 0.1427m, 2, MidpointRounding.AwayFromZero);
+ // decimal total = weeks * scap.ApprovedBEPerInterval.Value;
- decimal ah = 0;
- if (scapDurationInDays != 0)
- ah = total / scapDurationInDays;
- return ah;
+ // decimal ah = 0;
+ // if (scapDurationInDays != 0)
+ // ah = total / scapDurationInDays;
+ // return ah;
- }
- return base.GetApprovedHoursPerDay(scap, costRatePeriods);
+ // }
+ // return base.GetApprovedHoursPerDay(scap, costRatePeriods);
- }
+ // }
- }
+ //}
}
diff --git a/Service/Invoicing/LWLSettlementInvoiceCreation.cs b/Service/Invoicing/LWLSettlementInvoiceCreation.cs
index c6aad5bdb..e2e4f6c10 100644
--- a/Service/Invoicing/LWLSettlementInvoiceCreation.cs
+++ b/Service/Invoicing/LWLSettlementInvoiceCreation.cs
@@ -27,6 +27,11 @@ namespace BeWo.Service.Invoicing
String id = c2s.CostBearer.ID;
var calc = PluginLoader.FindClass(id);
+ if (calc == null)
+ {
+ calc = Calculations.GetInstance(id);
+ }
+
var relDc = c2s.MapToNewDC();
var apListFehlkontakt = new List();