diff --git a/Report/DefaultReports/Mitarbeiterarbeitszeitkonto.cs b/Report/DefaultReports/Mitarbeiterarbeitszeitkonto.cs index 53802d8c3..37ef95f4e 100644 --- a/Report/DefaultReports/Mitarbeiterarbeitszeitkonto.cs +++ b/Report/DefaultReports/Mitarbeiterarbeitszeitkonto.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.Linq; using BeWo.Report; using BeWo.Report.ReportObjects; - +using BeWo.Service.Plugins; using BS.Shared.Core; using DevExpress.XtraReports.UI; @@ -21,7 +21,7 @@ namespace BeWo.Report.DefaultReports public void SetReportDataSource(MitarbeiterstundenkontoRO pRO) { - var msb = new MitarbeiterstundenkontoBerechnungTagesansicht(); + var msb = PluginLoader.FindClass(); msb.CreateReport(pRO); foreach (var ed in pRO.EmployeeDetailList) @@ -40,16 +40,19 @@ namespace BeWo.Report.DefaultReports } ed.UrlaubUndKrankheit = 0; - foreach (var day in ed.Days) - { - if (day.HoursOtherAbsenceTimes > 0) - { - //CB: In der Standard Berechnungsklasse wurden die anderen Abwesenheiten auch auf die MinutesTotal addiert, daher hier wieder abziehen - //Ich traue mich nicht, das in der Berechnungsklasse zu ändern, weil es dann bestimmt wieder zu Fehlern in angepassten Konten führt. - day.MinutesTotal -= day.HoursOtherAbsenceTimes * 60; + if (ed.Days != null) + { + foreach (var day in ed.Days) + { + if (day.HoursOtherAbsenceTimes > 0) + { + //CB: In der Standard Berechnungsklasse wurden die anderen Abwesenheiten auch auf die MinutesTotal addiert, daher hier wieder abziehen + //Ich traue mich nicht, das in der Berechnungsklasse zu ändern, weil es dann bestimmt wieder zu Fehlern in angepassten Konten führt. + day.MinutesTotal -= day.HoursOtherAbsenceTimes * 60; + } + + ed.UrlaubUndKrankheit += (day.HoursSick + day.HoursInVacation + day.HoursOtherAbsenceTimes); } - - ed.UrlaubUndKrankheit += (day.HoursSick + day.HoursInVacation + day.HoursOtherAbsenceTimes); } } diff --git a/Report/DefaultReports/Mitarbeiterstundenkonto.cs b/Report/DefaultReports/Mitarbeiterstundenkonto.cs index 432823591..ec93174b4 100644 --- a/Report/DefaultReports/Mitarbeiterstundenkonto.cs +++ b/Report/DefaultReports/Mitarbeiterstundenkonto.cs @@ -1,5 +1,6 @@ using System; using BeWo.Report.ReportObjects; +using BeWo.Service.Plugins; using BS.Shared.Core; @@ -17,7 +18,8 @@ namespace BeWo.Report.DefaultReports public void SetReportDataSource(MitarbeiterstundenkontoRO pRO) { - var msb = new MitarbeiterstundenkontoBerechnung(); + //var msb = new MitarbeiterstundenkontoBerechnung(); + var msb = PluginLoader.FindClass(); msb.CreateReport(pRO); this.bindingSource1.DataSource = pRO; diff --git a/Report/DefaultReports/MitarbeiterstundenkontoJahr.cs b/Report/DefaultReports/MitarbeiterstundenkontoJahr.cs index 7957b81b2..e2356b782 100644 --- a/Report/DefaultReports/MitarbeiterstundenkontoJahr.cs +++ b/Report/DefaultReports/MitarbeiterstundenkontoJahr.cs @@ -1,5 +1,6 @@ using System; using BeWo.Report.ReportObjects; +using BeWo.Service.Plugins; using BS.Shared.Core; @@ -17,7 +18,8 @@ namespace BeWo.Report.DefaultReports public void SetReportDataSource(MitarbeiterstundenkontoMonateRO pRO) { - var msb = new MitarbeiterstundenkontoBerechnungMonate(); + var msb = PluginLoader.FindClass(); + //var msb = new MitarbeiterstundenkontoBerechnungMonate(); msb.CreateReport(pRO); this.bindingSource1.DataSource = pRO; diff --git a/Report/DefaultReports/Teamstundenkonto.cs b/Report/DefaultReports/Teamstundenkonto.cs index 297d18fd5..99991fa35 100644 --- a/Report/DefaultReports/Teamstundenkonto.cs +++ b/Report/DefaultReports/Teamstundenkonto.cs @@ -1,5 +1,6 @@ using System; using BeWo.Report.ReportObjects; +using BeWo.Service.Plugins; using BS.Shared.Core; @@ -17,7 +18,7 @@ namespace BeWo.Report.DefaultReports public void SetReportDataSource(MitarbeiterstundenkontoRO pRO) { - var msb = new MitarbeiterstundenkontoBerechnung(); + var msb = PluginLoader.FindClass(); msb.CreateReport(pRO); bindingSource1.DataSource = pRO; diff --git a/Report/ReportObjects/MitarbeiterstundenkontoBerechnung.cs b/Report/ReportObjects/MitarbeiterstundenkontoBerechnung.cs index f2632d666..35d8b425b 100644 --- a/Report/ReportObjects/MitarbeiterstundenkontoBerechnung.cs +++ b/Report/ReportObjects/MitarbeiterstundenkontoBerechnung.cs @@ -1006,6 +1006,33 @@ namespace BeWo.Report.ReportObjects else sum.IstNichtAbrechenbar += duration; + + //Prüfe ProzentStundenkonto, wenn der Wert != 100 ist, dann packe die prozentuale Differenz von abbrechenbar auf nicht abbrechenbar + decimal prozent = 100; + if (item.ServiceDescription.ProzentStundenkonto.HasValue) + { + prozent = item.ServiceDescription.ProzentStundenkonto.Value; + } + else if (item.ServiceDescription.ServiceCategory.ProzentStundenkonto.HasValue) + { + prozent = item.ServiceDescription.ServiceCategory.ProzentStundenkonto.Value; + } + if (prozent == 0) + { + int test = 0; + } + if (prozent != 100 && prozent > 0) + { + var ohneProzent = duration / prozent * 100; + + var diff = duration - ohneProzent; + + sum.IstAbrechenbar -= diff; + sum.IstNichtAbrechenbar += diff; + } + + + } sum.RecordsImBerichtszeitraum.Add(item); } @@ -1317,11 +1344,12 @@ namespace BeWo.Report.ReportObjects public virtual bool ShouldCreateDayDetails() { - if (Settings.ShowWorktime && Settings.EnableArbeitszeiterfassung) - { - return true; - } - return false; + //if (Settings.ShowWorktime && Settings.EnableArbeitszeiterfassung) + //{ + // return true; + //} + //CB ab 04.09.2024 immer true + return true; } public virtual bool ShouldCreateDayDetailsForEachServiceRecord() @@ -1740,12 +1768,13 @@ namespace BeWo.Report.ReportObjects dd.BreakMinutes2 = 15; } } - else - { - //Alter Default - dd.MaxHoursUntilBreak = 6; - dd.BreakMinutes = 30; - } + //nicht mehr nötig. Im Default werden keine Pausen mehr berechnet + //else + // { + // //Alter Default + // dd.MaxHoursUntilBreak = null; + // dd.BreakMinutes = 30; + //} } public virtual void BerechneSollStundenFuerDayDetail(MitarbeiterstundenkontoRO.EmployeeDetail ed, MitarbeiterstundenkontoRO.DayDetail dd) @@ -3561,6 +3590,24 @@ namespace BeWo.Report.ReportObjects } return az; } + + public AbsenceTime GetAbsenceTimeForDate(MitarbeiterstundenkontoRO.EmployeeDetail ed, DateTime date) + { + var absenceTimes = ed.Employee.AbsenceTimes; + + if (absenceTimes != null) + { + foreach (var absenceTime in absenceTimes) + { + if (absenceTime.Start < date.AddDays(1) && (!absenceTime.End.HasValue || absenceTime.End >= date)) + { + return absenceTime; + } + } + } + + return null; + } } public class AbsenceTimeDays diff --git a/Report/ReportObjects/MitarbeiterstundenkontoBerechnungMonate.cs b/Report/ReportObjects/MitarbeiterstundenkontoBerechnungMonate.cs index f77cf2b40..3f57f0cf1 100644 --- a/Report/ReportObjects/MitarbeiterstundenkontoBerechnungMonate.cs +++ b/Report/ReportObjects/MitarbeiterstundenkontoBerechnungMonate.cs @@ -10,7 +10,7 @@ using BeWo.Service.ServiceImplementations; using BS.Shared; using BS.Shared.Core; using BS.Shared.Extensions; - +using BeWo.Service.Plugins; namespace BeWo.Report.ReportObjects { @@ -86,7 +86,7 @@ namespace BeWo.Report.ReportObjects public virtual MitarbeiterstundenkontoBerechnung CreateMitarbeiterstundenkontoBerechnung() { - return new MitarbeiterstundenkontoBerechnung(); + return PluginLoader.FindClass(); } } } diff --git a/Report/ReportObjects/MitarbeiterstundenkontoRO.cs b/Report/ReportObjects/MitarbeiterstundenkontoRO.cs index fa234c624..5d6e675e4 100644 --- a/Report/ReportObjects/MitarbeiterstundenkontoRO.cs +++ b/Report/ReportObjects/MitarbeiterstundenkontoRO.cs @@ -378,7 +378,19 @@ namespace BeWo.Report.ReportObjects public decimal HoursOtherAbsenceTimes { get; set; } - public decimal MinutesTotal { get; set; } + decimal test = 0; + public decimal MinutesTotal + { + get { return test; } + set + { + if (Date == new DateTime(2024, 5, 1)) + { + int test2 = 0; + } + test = value; + } + } public String TimeInVacation { get; set; } diff --git a/ReportImp/AWOMuensterlandRecklinghausen/CustomMitarbeiterstundenkontoBerechnung.cs b/ReportImp/AWOMuensterlandRecklinghausen/CustomMitarbeiterstundenkontoBerechnung.cs index dc692ac91..02ecb6ba3 100644 --- a/ReportImp/AWOMuensterlandRecklinghausen/CustomMitarbeiterstundenkontoBerechnung.cs +++ b/ReportImp/AWOMuensterlandRecklinghausen/CustomMitarbeiterstundenkontoBerechnung.cs @@ -211,7 +211,9 @@ namespace AWOMuensterlandRecklinghausen public override MitarbeiterstundenkontoRO.DayDetail CreateDayDetail(DateTime date, MitarbeiterstundenkontoRO.EmployeeDetail ed) { var dd = base.CreateDayDetail(date, ed); - dd.BreakMinutes2 = 15; + dd.MaxHoursUntilBreak = 6; + dd.BreakMinutes = 30; + dd.BreakMinutes2 = 15; dd.MaxHoursUntilBreak2 = 9; return dd; diff --git a/ReportImp/AachenerLaienhelfer/AachenerLaienhelfer.csproj b/ReportImp/AachenerLaienhelfer/AachenerLaienhelfer.csproj index e75ac8597..ccb90d043 100644 --- a/ReportImp/AachenerLaienhelfer/AachenerLaienhelfer.csproj +++ b/ReportImp/AachenerLaienhelfer/AachenerLaienhelfer.csproj @@ -87,6 +87,7 @@ QuittierungsbelegJugendamt.cs + Component diff --git a/ReportImp/AachenerLaienhelfer/Reporting/CustomMitarbeiterstundenkontoBerechnung.cs b/ReportImp/AachenerLaienhelfer/Reporting/CustomMitarbeiterstundenkontoBerechnung.cs new file mode 100644 index 000000000..d907657ad --- /dev/null +++ b/ReportImp/AachenerLaienhelfer/Reporting/CustomMitarbeiterstundenkontoBerechnung.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using BeWo.Data.Entities; +using BeWo.Report.ReportObjects; + +using BS.Shared.Extensions; + + +namespace AachenerLaienhelfer.Reporting +{ + public class CustomMitarbeiterstundenkontoBerechnung : MitarbeiterstundenkontoBerechnung + { + public override bool IstAnrechenbareAbsenceTime(AbsenceTime item) + { + if (item.AbsenceReason.Description.Contains("Ãœberstun den") && item.AbsenceReason.Description.Contains("Abbau")) + { + return false; + } + + return true; + } + } +} diff --git a/ReportImp/AkggMid/CustomMitarbeiterstundenkontoBerechnung.cs b/ReportImp/AkggMid/CustomMitarbeiterstundenkontoBerechnung.cs index c311060e5..70af63a15 100644 --- a/ReportImp/AkggMid/CustomMitarbeiterstundenkontoBerechnung.cs +++ b/ReportImp/AkggMid/CustomMitarbeiterstundenkontoBerechnung.cs @@ -88,15 +88,35 @@ namespace AkggMid if (item.AbsenceReason.Description.ToLower().Contains("ma_vkt")) return false; - if (item.AbsenceReason.Description.ToLower().Contains("ma_bkl")) - return false; - if (item.AbsenceReason.Description.ToLower().Contains("ma_päd.tag")) return false; if (item.AbsenceReason.Description.ToLower().Contains("ma_uf")) return false; + //CB Ab 2.9.24 neue Kategorien: + if (item.AbsenceReason.Description.ToLower().Contains("freistellung") && item.AbsenceReason.Description.ToLower().Contains("betriebsrat")) + return false; + + if (item.AbsenceReason.Description.ToLower().Contains("pädagogischer tag")) + return false; + + if (item.AbsenceReason.Description.ToLower().Contains("unentschuldigt")) + return false; + + if (item.AbsenceReason.Description.ToLower().Contains("verkürzt")) + return false; + + if (item.AbsenceReason.Description.ToLower().Contains("keine teilnahme an klassenfahrt")) + return false; + + if (item.AbsenceReason.Description.ToLower().Contains("keine teilnahme an klassenfahrt")) + return false; + + if (item.AbsenceReason.Description.ToLower().Contains("ma_bkl")) + return false; + + return base.IstAnrechenbareAbsenceTime(item); } @@ -106,8 +126,8 @@ namespace AkggMid } public override decimal? GetSollStundenForAbsenceTime(MitarbeiterstundenkontoRO.EmployeeDetail ed, AbsenceTime at, DateTime datum) - { - if (at.AbsenceReason.Description.StartsWith("MA_K") || at.AbsenceReason.Description.StartsWith("MA_KAU") || at.AbsenceReason.Description.StartsWith("MA_KK")) + { + if (at.AbsenceReason.Description.StartsWith("Krank (ohne AU)") || at.AbsenceReason.Description.StartsWith("Krank (mit AU)") || at.AbsenceReason.Description.StartsWith("Freistellung (Kind krank)")) { foreach (var vv in ed.Employee.VarFieldValueList) { diff --git a/ReportImp/AsbRheinErftDuerenSBD/CustomMitarbeiterstundenkontoBerechnung.cs b/ReportImp/AsbRheinErftDuerenSBD/CustomMitarbeiterstundenkontoBerechnung.cs index d42ea1ddd..f8cc7216e 100644 --- a/ReportImp/AsbRheinErftDuerenSBD/CustomMitarbeiterstundenkontoBerechnung.cs +++ b/ReportImp/AsbRheinErftDuerenSBD/CustomMitarbeiterstundenkontoBerechnung.cs @@ -53,6 +53,9 @@ namespace AsbRheinErftDuerenSBD public override MitarbeiterstundenkontoRO.DayDetail CreateDayDetail(DateTime date, MitarbeiterstundenkontoRO.EmployeeDetail ed) { var dd = base.CreateDayDetail(date, ed); + + dd.MaxHoursUntilBreak = 6; + dd.BreakMinutes = 30; dd.BreakMinutes2 = 15; dd.MaxHoursUntilBreak2 = 9; diff --git a/ReportImp/BAPBielefelderAmbulantePflege/CustomerMitarbeiterstundenkontoBerechnung.cs b/ReportImp/BAPBielefelderAmbulantePflege/CustomerMitarbeiterstundenkontoBerechnung.cs index 3003926df..7747a611b 100644 --- a/ReportImp/BAPBielefelderAmbulantePflege/CustomerMitarbeiterstundenkontoBerechnung.cs +++ b/ReportImp/BAPBielefelderAmbulantePflege/CustomerMitarbeiterstundenkontoBerechnung.cs @@ -17,8 +17,10 @@ namespace BeWo.BAPBielefelderAmbulantePflege public override MitarbeiterstundenkontoRO.DayDetail CreateDayDetail(DateTime date, MitarbeiterstundenkontoRO.EmployeeDetail ed) { var dd = base.CreateDayDetail(date, ed); - dd.BreakMinutes2 = 15; + dd.MaxHoursUntilBreak = 6; dd.MaxHoursUntilBreak2 = 9; + dd.BreakMinutes = 30; + dd.BreakMinutes2 = 15; return dd; } diff --git a/ReportImp/BeWoAuxilio/CustomMitarbeiterstundenkontoBerechnung.cs b/ReportImp/BeWoAuxilio/CustomMitarbeiterstundenkontoBerechnung.cs index e3e1939bc..64d316a7d 100644 --- a/ReportImp/BeWoAuxilio/CustomMitarbeiterstundenkontoBerechnung.cs +++ b/ReportImp/BeWoAuxilio/CustomMitarbeiterstundenkontoBerechnung.cs @@ -51,10 +51,12 @@ namespace BeWo.BeWoAuxilio else { var dd = base.CreateDayDetail(date, ed); - dd.BreakMinutes2 = 15; - dd.MaxHoursUntilBreak2 = 9; + dd.MaxHoursUntilBreak = 6; + dd.MaxHoursUntilBreak2 = 9; + dd.BreakMinutes = 30; + dd.BreakMinutes2 = 15; - return dd; + return dd; } } diff --git a/ReportImp/BeWoDellbrueck/CustomMitarbeiterstundenkontoBerechnung.cs b/ReportImp/BeWoDellbrueck/CustomMitarbeiterstundenkontoBerechnung.cs index 8db0164c4..a366108e2 100644 --- a/ReportImp/BeWoDellbrueck/CustomMitarbeiterstundenkontoBerechnung.cs +++ b/ReportImp/BeWoDellbrueck/CustomMitarbeiterstundenkontoBerechnung.cs @@ -17,10 +17,12 @@ namespace BeWoDellbrueck public override MitarbeiterstundenkontoRO.DayDetail CreateDayDetail(DateTime date, MitarbeiterstundenkontoRO.EmployeeDetail ed) { var dd = base.CreateDayDetail(date, ed); - dd.BreakMinutes2 = 15; - dd.MaxHoursUntilBreak2 = 9; + dd.MaxHoursUntilBreak = 6; + dd.MaxHoursUntilBreak2 = 9; + dd.BreakMinutes = 30; + dd.BreakMinutes2 = 15; - return dd; + return dd; } public override bool AddServiceRecordToDuration(ServiceRecord item) diff --git a/ReportImp/BeWoFuerDich/CustomMitarbeiterstundenkontoBerechnung.cs b/ReportImp/BeWoFuerDich/CustomMitarbeiterstundenkontoBerechnung.cs index 4b49d6ba9..aff5f37c6 100644 --- a/ReportImp/BeWoFuerDich/CustomMitarbeiterstundenkontoBerechnung.cs +++ b/ReportImp/BeWoFuerDich/CustomMitarbeiterstundenkontoBerechnung.cs @@ -17,8 +17,10 @@ namespace BeWoFuerDich public override MitarbeiterstundenkontoRO.DayDetail CreateDayDetail(DateTime date, MitarbeiterstundenkontoRO.EmployeeDetail ed) { var dd = base.CreateDayDetail(date, ed); - dd.BreakMinutes2 = 15; + dd.MaxHoursUntilBreak = 6; dd.MaxHoursUntilBreak2 = 9; + dd.BreakMinutes = 30; + dd.BreakMinutes2 = 15; return dd; } diff --git a/ReportImp/BehindertenhilfeMenden/CustomMitarbeiterstundenkontoBerechnung.cs b/ReportImp/BehindertenhilfeMenden/CustomMitarbeiterstundenkontoBerechnung.cs index 75750b61d..0e20dcb1e 100644 --- a/ReportImp/BehindertenhilfeMenden/CustomMitarbeiterstundenkontoBerechnung.cs +++ b/ReportImp/BehindertenhilfeMenden/CustomMitarbeiterstundenkontoBerechnung.cs @@ -16,8 +16,10 @@ namespace BehindertenhilfeMenden public override MitarbeiterstundenkontoRO.DayDetail CreateDayDetail(DateTime date, MitarbeiterstundenkontoRO.EmployeeDetail ed) { var dd = base.CreateDayDetail(date, ed); - dd.BreakMinutes2 = 15; + dd.MaxHoursUntilBreak = 6; dd.MaxHoursUntilBreak2 = 9; + dd.BreakMinutes = 30; + dd.BreakMinutes2 = 15; return dd; } diff --git a/ReportImp/BewegtSystemischeBeratung/CustomMitarbeiterstundenkontoBerechnungTagesansicht.cs b/ReportImp/BewegtSystemischeBeratung/CustomMitarbeiterstundenkontoBerechnungTagesansicht.cs index a276c128a..670905a5f 100644 --- a/ReportImp/BewegtSystemischeBeratung/CustomMitarbeiterstundenkontoBerechnungTagesansicht.cs +++ b/ReportImp/BewegtSystemischeBeratung/CustomMitarbeiterstundenkontoBerechnungTagesansicht.cs @@ -20,10 +20,12 @@ namespace BewegtSystemischeBeratung public override MitarbeiterstundenkontoRO.DayDetail CreateDayDetail(DateTime date, MitarbeiterstundenkontoRO.EmployeeDetail ed) { var dd = base.CreateDayDetail(date, ed); - dd.BreakMinutes2 = 15; - dd.MaxHoursUntilBreak2 = 9; + dd.MaxHoursUntilBreak = 6; + dd.MaxHoursUntilBreak2 = 9; + dd.BreakMinutes = 30; + dd.BreakMinutes2 = 15; - return dd; + return dd; } } } diff --git a/ReportImp/DieDueneReports/DieDueneMitarbeiterstundenkontoBerechnung.cs b/ReportImp/DieDueneReports/DieDueneMitarbeiterstundenkontoBerechnung.cs index 78f4e64d8..77013d508 100644 --- a/ReportImp/DieDueneReports/DieDueneMitarbeiterstundenkontoBerechnung.cs +++ b/ReportImp/DieDueneReports/DieDueneMitarbeiterstundenkontoBerechnung.cs @@ -26,8 +26,10 @@ namespace BeWo.DieDueneReports public override MitarbeiterstundenkontoRO.DayDetail CreateDayDetail(DateTime date, MitarbeiterstundenkontoRO.EmployeeDetail ed) { var dd = base.CreateDayDetail(date, ed); - dd.BreakMinutes2 = 15; + dd.MaxHoursUntilBreak = 6; dd.MaxHoursUntilBreak2 = 9; + dd.BreakMinutes = 30; + dd.BreakMinutes2 = 15; return dd; } diff --git a/ReportImp/HausDuelken/CustomMitarbeiterstundenkontoBerechnung.cs b/ReportImp/HausDuelken/CustomMitarbeiterstundenkontoBerechnung.cs index b889ac60f..4b417cf46 100644 --- a/ReportImp/HausDuelken/CustomMitarbeiterstundenkontoBerechnung.cs +++ b/ReportImp/HausDuelken/CustomMitarbeiterstundenkontoBerechnung.cs @@ -16,10 +16,12 @@ namespace HausDuelken public override MitarbeiterstundenkontoRO.DayDetail CreateDayDetail(DateTime date, MitarbeiterstundenkontoRO.EmployeeDetail ed) { var dd = base.CreateDayDetail(date, ed); - dd.BreakMinutes2 = 15; - dd.MaxHoursUntilBreak2 = 9; + dd.MaxHoursUntilBreak = 6; + dd.MaxHoursUntilBreak2 = 9; + dd.BreakMinutes = 30; + dd.BreakMinutes2 = 15; - return dd; + return dd; } public override bool AddServiceRecordToDuration(ServiceRecord item) diff --git a/ReportImp/KompassBeWoWesel/CustomMitarbeiterstundenkontoBerechnungTagesansicht.cs b/ReportImp/KompassBeWoWesel/CustomMitarbeiterstundenkontoBerechnungTagesansicht.cs index be9b1bd9f..9d30f058a 100644 --- a/ReportImp/KompassBeWoWesel/CustomMitarbeiterstundenkontoBerechnungTagesansicht.cs +++ b/ReportImp/KompassBeWoWesel/CustomMitarbeiterstundenkontoBerechnungTagesansicht.cs @@ -172,8 +172,10 @@ namespace KompassBeWoWesel public override MitarbeiterstundenkontoRO.DayDetail CreateDayDetail(DateTime date, MitarbeiterstundenkontoRO.EmployeeDetail ed) { var dd = base.CreateDayDetail(date, ed); - dd.BreakMinutes2 = 15; - dd.MaxHoursUntilBreak2 = 9; + dd.MaxHoursUntilBreak = 6; + dd.MaxHoursUntilBreak2 = 9; + dd.BreakMinutes = 30; + dd.BreakMinutes2 = 15; return dd; } } diff --git a/ReportImp/LebenshilfeEssenReports/LHEssenMitarbeiterstundenkontoBerechnung.cs b/ReportImp/LebenshilfeEssenReports/LHEssenMitarbeiterstundenkontoBerechnung.cs index fd9318e45..09eac45fa 100644 --- a/ReportImp/LebenshilfeEssenReports/LHEssenMitarbeiterstundenkontoBerechnung.cs +++ b/ReportImp/LebenshilfeEssenReports/LHEssenMitarbeiterstundenkontoBerechnung.cs @@ -15,9 +15,11 @@ namespace BeWo.LebenshilfeEssenReports var dd = base.CreateDayDetail(date, ed); if (date.Date >= new DateTime(2019, 6, 1)) { - dd.BreakMinutes2 = 15; - dd.MaxHoursUntilBreak2 = 9; - } + dd.MaxHoursUntilBreak = 6; + dd.MaxHoursUntilBreak2 = 9; + dd.BreakMinutes = 30; + dd.BreakMinutes2 = 15; + } return dd; } diff --git a/ReportImp/PraxisPusteblume/CustomMitarbeiterstundenkontoBerechnung.cs b/ReportImp/PraxisPusteblume/CustomMitarbeiterstundenkontoBerechnung.cs index 2fe8bfbf3..11150f0f2 100644 --- a/ReportImp/PraxisPusteblume/CustomMitarbeiterstundenkontoBerechnung.cs +++ b/ReportImp/PraxisPusteblume/CustomMitarbeiterstundenkontoBerechnung.cs @@ -17,7 +17,9 @@ namespace PraxisPusteblume public override MitarbeiterstundenkontoRO.DayDetail CreateDayDetail(DateTime date, MitarbeiterstundenkontoRO.EmployeeDetail ed) { var dd = base.CreateDayDetail(date, ed); + dd.MaxHoursUntilBreak = 6; dd.MaxHoursUntilBreak2 = 9; + dd.BreakMinutes = 30; dd.BreakMinutes2 = 15; if (date < new DateTime(2019, 12, 1)) diff --git a/ReportImp/SHKServiceSBD/CustomMitarbeiterstundenkontoBerechnung.cs b/ReportImp/SHKServiceSBD/CustomMitarbeiterstundenkontoBerechnung.cs index 050ad93dd..812a5555f 100644 --- a/ReportImp/SHKServiceSBD/CustomMitarbeiterstundenkontoBerechnung.cs +++ b/ReportImp/SHKServiceSBD/CustomMitarbeiterstundenkontoBerechnung.cs @@ -409,7 +409,10 @@ namespace SHKServiceSBD { dd.Custom1 = "x"; // String.Format("{0:0.00}", ed.SollProTag * 60); } - + if (at.AbsenceReason.Description.ToLower().Contains("krankengeld") || at.AbsenceReason.Description.ToLower().Contains("elternzeit") || at.AbsenceReason.Description.ToLower().Contains("krank ohne lohnfortzahlung")) + { + feiertagAnrechnen = false; + } } } } @@ -449,6 +452,29 @@ namespace SHKServiceSBD return list; } + public override decimal BerechneSollStundenFuerTag(MitarbeiterstundenkontoRO.EmployeeDetail ed, DateTime date) + { + if (date == new DateTime(2024, 5, 1)) + { + int test = 0; + } + var soll = base.BerechneSollStundenFuerTag(ed, date); + + if (soll > 0 && IstFeiertag(date)) + { + var at = GetAbsenceTimeForDate(ed, date); + if (at != null) + { + if (at.AbsenceReason.Description.ToLower().Contains("krankengeld") || at.AbsenceReason.Description.ToLower().Contains("elternzeit") || at.AbsenceReason.Description.ToLower().Contains("krank ohne lohnfortzahlung")) + { + return 0; + } + } + + } + + return soll; + } private bool HatVertrag(MitarbeiterstundenkontoRO.EmployeeDetail ed, DateTime date) { diff --git a/ReportImp/SHKServiceSBD/EmployeeKilometerauswertungsListReport.Designer.cs b/ReportImp/SHKServiceSBD/EmployeeKilometerauswertungsListReport.Designer.cs new file mode 100644 index 000000000..2caf2d107 --- /dev/null +++ b/ReportImp/SHKServiceSBD/EmployeeKilometerauswertungsListReport.Designer.cs @@ -0,0 +1,508 @@ +using BeWo.Report.ReportObjects; +namespace SHKServiceSBD +{ + partial class EmployeeKilometerauswertungsListReport + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// 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(); + this.Detail = new DevExpress.XtraReports.UI.DetailBand(); + this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); + this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); + this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); + this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); + this.DetailReport1 = new DevExpress.XtraReports.UI.DetailReportBand(); + this.Detail2 = new DevExpress.XtraReports.UI.DetailBand(); + this.xrTable4 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); + this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.xrTable2 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); + this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); + this.objectDataSource1 = new DevExpress.DataAccess.ObjectBinding.ObjectDataSource(this.components); + this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); + this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); + this.pageFooterBand1 = new DevExpress.XtraReports.UI.PageFooterBand(); + this.xrPageInfo2 = new DevExpress.XtraReports.UI.XRPageInfo(); + this.xrPageInfo1 = new DevExpress.XtraReports.UI.XRPageInfo(); + this.Title = new DevExpress.XtraReports.UI.XRControlStyle(); + this.FieldCaption = new DevExpress.XtraReports.UI.XRControlStyle(); + this.PageInfo = new DevExpress.XtraReports.UI.XRControlStyle(); + this.DataField = new DevExpress.XtraReports.UI.XRControlStyle(); + this.fieldFLS = new DevExpress.XtraReports.UI.CalculatedField(); + this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); + this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.objectDataSource1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); + // + // Detail + // + 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; + // + // xrTableCell1 + // + this.xrTableCell1.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrTableCell1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Employees2Entries.EmployeeName")}); + this.xrTableCell1.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell1.Name = "xrTableCell1"; + this.xrTableCell1.StylePriority.UseBorderColor = false; + this.xrTableCell1.StylePriority.UseBorders = false; + this.xrTableCell1.StylePriority.UseFont = false; + this.xrTableCell1.Weight = 4.0816326530612246D; + // + // xrTableRow1 + // + this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell1}); + this.xrTableRow1.Name = "xrTableRow1"; + this.xrTableRow1.Weight = 1D; + // + // xrTable1 + // + this.xrTable1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25F); + this.xrTable1.Name = "xrTable1"; + this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow1}); + this.xrTable1.SizeF = new System.Drawing.SizeF(600F, 25F); + this.xrTable1.StylePriority.UseBorders = false; + this.xrTable1.StylePriority.UsePadding = false; + // + // Detail1 + // + this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel7, + this.xrTable1}); + this.Detail1.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); + this.Detail1.HeightF = 83F; + this.Detail1.Name = "Detail1"; + this.Detail1.StylePriority.UseFont = false; + // + // xrLabel7 + // + this.xrLabel7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Employees2Entries.TotalDistanceInMeters", "Kilometer gesamt: {0:}")}); + this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 50F); + this.xrLabel7.Name = "xrLabel7"; + this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel7.SizeF = new System.Drawing.SizeF(280F, 25F); + this.xrLabel7.StylePriority.UseFont = false; + // + // DetailReport + // + this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail1, + this.DetailReport1}); + this.DetailReport.DataMember = "Employees2Entries"; + this.DetailReport.DataSource = this.objectDataSource1; + this.DetailReport.Level = 0; + this.DetailReport.Name = "DetailReport"; + // + // DetailReport1 + // + this.DetailReport1.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail2, + this.GroupHeader2, + this.GroupFooter1}); + this.DetailReport1.DataMember = "Employees2Entries.Entries"; + this.DetailReport1.DataSource = this.objectDataSource1; + this.DetailReport1.Level = 0; + this.DetailReport1.Name = "DetailReport1"; + // + // Detail2 + // + this.Detail2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable4}); + this.Detail2.HeightF = 25F; + this.Detail2.Name = "Detail2"; + this.Detail2.SortFields.AddRange(new DevExpress.XtraReports.UI.GroupField[] { + new DevExpress.XtraReports.UI.GroupField("Datum", DevExpress.XtraReports.UI.XRColumnSortOrder.Ascending)}); + // + // xrTable4 + // + this.xrTable4.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrTable4.Name = "xrTable4"; + this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow4}); + this.xrTable4.SizeF = new System.Drawing.SizeF(625.8302F, 25F); + this.xrTable4.StylePriority.UseBorders = false; + this.xrTable4.StylePriority.UsePadding = false; + // + // xrTableRow4 + // + this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell3, + this.xrTableCell8, + this.xrTableCell4, + this.xrTableCell9}); + this.xrTableRow4.Name = "xrTableRow4"; + this.xrTableRow4.Weight = 1D; + // + // xrTableCell3 + // + this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Employees2Entries.Entries.Datum", "{0:dd.MM.yyyy}")}); + this.xrTableCell3.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F); + this.xrTableCell3.Name = "xrTableCell3"; + this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 4, 0, 100F); + this.xrTableCell3.StylePriority.UseFont = false; + this.xrTableCell3.StylePriority.UsePadding = false; + this.xrTableCell3.StylePriority.UseTextAlignment = false; + this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell3.Weight = 0.6802721055263049D; + // + // xrTableCell8 + // + this.xrTableCell8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Employees2Entries.Entries.TimeRange")}); + this.xrTableCell8.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F); + this.xrTableCell8.Name = "xrTableCell8"; + this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 4, 0, 100F); + this.xrTableCell8.StylePriority.UseFont = false; + this.xrTableCell8.StylePriority.UsePadding = false; + this.xrTableCell8.StylePriority.UseTextAlignment = false; + this.xrTableCell8.Text = "xrTableCell8"; + this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell8.Weight = 0.89285797658466393D; + // + // xrTableCell4 + // + this.xrTableCell4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Employees2Entries.Entries.DistanceInMeters", "{0:0.##}")}); + this.xrTableCell4.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F); + this.xrTableCell4.Name = "xrTableCell4"; + this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 4, 0, 100F); + this.xrTableCell4.StylePriority.UseFont = false; + this.xrTableCell4.StylePriority.UsePadding = false; + this.xrTableCell4.StylePriority.UseTextAlignment = false; + this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell4.Weight = 1.028912291234853D; + // + // xrTableCell9 + // + this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Employees2Entries.Entries.Notice2")}); + this.xrTableCell9.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F); + this.xrTableCell9.Multiline = true; + this.xrTableCell9.Name = "xrTableCell9"; + this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(4, 4, 4, 0, 100F); + this.xrTableCell9.StylePriority.UseFont = false; + this.xrTableCell9.StylePriority.UsePadding = false; + this.xrTableCell9.StylePriority.UseTextAlignment = false; + this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.xrTableCell9.Weight = 1.6553058235012754D; + // + // GroupHeader2 + // + this.GroupHeader2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable2}); + this.GroupHeader2.HeightF = 25F; + this.GroupHeader2.Name = "GroupHeader2"; + this.GroupHeader2.RepeatEveryPage = true; + // + // xrTable2 + // + this.xrTable2.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTable2.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrTable2.Name = "xrTable2"; + this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow2}); + this.xrTable2.SizeF = new System.Drawing.SizeF(625.83F, 25F); + this.xrTable2.StylePriority.UseBorders = false; + this.xrTable2.StylePriority.UseFont = false; + this.xrTable2.StylePriority.UsePadding = false; + // + // xrTableRow2 + // + this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell5, + this.xrTableCell2, + this.xrTableCell6, + this.xrTableCell7}); + this.xrTableRow2.Name = "xrTableRow2"; + this.xrTableRow2.Weight = 1D; + // + // xrTableCell5 + // + this.xrTableCell5.Name = "xrTableCell5"; + this.xrTableCell5.StylePriority.UseTextAlignment = false; + this.xrTableCell5.Text = "Datum"; + this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell5.Weight = 0.68027211962967382D; + // + // xrTableCell2 + // + this.xrTableCell2.Name = "xrTableCell2"; + this.xrTableCell2.StylePriority.UseTextAlignment = false; + this.xrTableCell2.Text = "Uhrzeit"; + this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell2.Weight = 0.892857131771576D; + // + // xrTableCell6 + // + this.xrTableCell6.Name = "xrTableCell6"; + this.xrTableCell6.StylePriority.UseTextAlignment = false; + this.xrTableCell6.Text = "gefahrene Kilometer"; + this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell6.Weight = 1.0289115603020467D; + // + // xrTableCell7 + // + this.xrTableCell7.Name = "xrTableCell7"; + this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 100F); + this.xrTableCell7.StylePriority.UsePadding = false; + this.xrTableCell7.StylePriority.UseTextAlignment = false; + this.xrTableCell7.Text = "Bemerkungen"; + this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell7.Weight = 1.6553060397102077D; + // + // GroupFooter1 + // + this.GroupFooter1.HeightF = 0F; + this.GroupFooter1.Name = "GroupFooter1"; + this.GroupFooter1.PageBreak = DevExpress.XtraReports.UI.PageBreak.AfterBand; + // + // objectDataSource1 + // + this.objectDataSource1.DataSource = typeof(BeWo.Report.ReportObjects.EmployeeKilometerauswertungsListRO); + this.objectDataSource1.Name = "objectDataSource1"; + // + // ReportHeader + // + this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel2, + this.xrLabel1}); + this.ReportHeader.HeightF = 50F; + this.ReportHeader.Name = "ReportHeader"; + // + // xrLabel2 + // + this.xrLabel2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "MonthInformation", "Zeitraum: {0:MMMM yyyy}")}); + this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 12F); + this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25F); + this.xrLabel2.Name = "xrLabel2"; + this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel2.SizeF = new System.Drawing.SizeF(280F, 25F); + this.xrLabel2.StylePriority.UseFont = false; + // + // xrLabel1 + // + this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 14F); + this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrLabel1.Multiline = true; + this.xrLabel1.Name = "xrLabel1"; + this.xrLabel1.SizeF = new System.Drawing.SizeF(600F, 25F); + this.xrLabel1.StyleName = "Title"; + this.xrLabel1.StylePriority.UseFont = false; + this.xrLabel1.Text = "Auswertung über gefahrene Kilometer"; + // + // pageFooterBand1 + // + this.pageFooterBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrPageInfo2, + this.xrPageInfo1}); + this.pageFooterBand1.HeightF = 48F; + this.pageFooterBand1.Name = "pageFooterBand1"; + // + // xrPageInfo2 + // + this.xrPageInfo2.Font = new DevExpress.Drawing.DXFont("Arial", 8F); + this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(382.5002F, 25F); + this.xrPageInfo2.Name = "xrPageInfo2"; + this.xrPageInfo2.SizeF = new System.Drawing.SizeF(243.3297F, 23F); + this.xrPageInfo2.StyleName = "PageInfo"; + this.xrPageInfo2.StylePriority.UseFont = false; + this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrPageInfo2.TextFormatString = "Seite {0} von {1}"; + // + // xrPageInfo1 + // + this.xrPageInfo1.Font = new DevExpress.Drawing.DXFont("Arial", 8F); + this.xrPageInfo1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25F); + this.xrPageInfo1.Name = "xrPageInfo1"; + this.xrPageInfo1.PageInfo = DevExpress.XtraPrinting.PageInfo.DateTime; + this.xrPageInfo1.SizeF = new System.Drawing.SizeF(231.2501F, 23F); + this.xrPageInfo1.StyleName = "PageInfo"; + this.xrPageInfo1.StylePriority.UseFont = false; + // + // Title + // + this.Title.BackColor = System.Drawing.Color.White; + this.Title.BorderColor = System.Drawing.SystemColors.ControlText; + this.Title.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.Title.BorderWidth = 1F; + this.Title.Font = new DevExpress.Drawing.DXFont("Times New Roman", 24F); + this.Title.ForeColor = System.Drawing.Color.Black; + this.Title.Name = "Title"; + // + // FieldCaption + // + this.FieldCaption.BackColor = System.Drawing.Color.White; + this.FieldCaption.BorderColor = System.Drawing.SystemColors.ControlText; + this.FieldCaption.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.FieldCaption.BorderWidth = 1F; + this.FieldCaption.Font = new DevExpress.Drawing.DXFont("Times New Roman", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.FieldCaption.ForeColor = System.Drawing.Color.Black; + this.FieldCaption.Name = "FieldCaption"; + // + // PageInfo + // + this.PageInfo.BackColor = System.Drawing.Color.White; + this.PageInfo.BorderColor = System.Drawing.SystemColors.ControlText; + this.PageInfo.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.PageInfo.BorderWidth = 1F; + this.PageInfo.Font = new DevExpress.Drawing.DXFont("Times New Roman", 8F); + this.PageInfo.ForeColor = System.Drawing.Color.Black; + this.PageInfo.Name = "PageInfo"; + // + // DataField + // + this.DataField.BackColor = System.Drawing.Color.White; + this.DataField.BorderColor = System.Drawing.SystemColors.ControlText; + this.DataField.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.DataField.BorderWidth = 1F; + this.DataField.Font = new DevExpress.Drawing.DXFont("Times New Roman", 8F); + this.DataField.ForeColor = System.Drawing.SystemColors.ControlText; + this.DataField.Name = "DataField"; + // + // fieldFLS + // + this.fieldFLS.DataMember = "FLSReportGroups"; + this.fieldFLS.Expression = "[TotalFLM] / 60"; + this.fieldFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; + this.fieldFLS.Name = "fieldFLS"; + // + // topMarginBand1 + // + this.topMarginBand1.HeightF = 50F; + this.topMarginBand1.Name = "topMarginBand1"; + // + // bottomMarginBand1 + // + this.bottomMarginBand1.HeightF = 50F; + this.bottomMarginBand1.Name = "bottomMarginBand1"; + // + // EmployeeKilometerauswertungsListReport + // + this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail, + this.DetailReport, + this.ReportHeader, + this.pageFooterBand1, + this.topMarginBand1, + this.bottomMarginBand1}); + this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] { + this.fieldFLS}); + this.ComponentStorage.AddRange(new System.ComponentModel.IComponent[] { + this.objectDataSource1}); + this.DataSource = this.objectDataSource1; + this.Margins = new DevExpress.Drawing.DXMargins(75F, 75F, 50F, 50F); + this.PageHeight = 1169; + this.PageWidth = 827; + this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; + this.StyleSheet.AddRange(new DevExpress.XtraReports.UI.XRControlStyle[] { + this.Title, + this.FieldCaption, + this.PageInfo, + this.DataField}); + this.Version = "23.2"; + ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.objectDataSource1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); + + } + + #endregion + + private DevExpress.XtraReports.UI.DetailBand Detail; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell1; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow1; + private DevExpress.XtraReports.UI.XRTable xrTable1; + private DevExpress.XtraReports.UI.DetailBand Detail1; + private DevExpress.XtraReports.UI.DetailReportBand DetailReport; + private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader; + private DevExpress.XtraReports.UI.XRLabel xrLabel1; + private DevExpress.XtraReports.UI.PageFooterBand pageFooterBand1; + private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo2; + private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo1; + private DevExpress.XtraReports.UI.XRControlStyle Title; + private DevExpress.XtraReports.UI.XRControlStyle FieldCaption; + private DevExpress.XtraReports.UI.XRControlStyle PageInfo; + private DevExpress.XtraReports.UI.XRControlStyle DataField; + private DevExpress.XtraReports.UI.XRTable xrTable2; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow2; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell5; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell6; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell7; + private DevExpress.XtraReports.UI.DetailReportBand DetailReport1; + private DevExpress.XtraReports.UI.DetailBand Detail2; + private DevExpress.XtraReports.UI.XRTable xrTable4; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow4; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell3; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell4; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell9; + private DevExpress.XtraReports.UI.XRLabel xrLabel2; + private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader2; + private DevExpress.XtraReports.UI.XRLabel xrLabel7; + private DevExpress.XtraReports.UI.CalculatedField fieldFLS; + private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1; + private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1; + private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1; + private DevExpress.DataAccess.ObjectBinding.ObjectDataSource objectDataSource1; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell8; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell2; + } +} diff --git a/ReportImp/SHKServiceSBD/EmployeeKilometerauswertungsListReport.cs b/ReportImp/SHKServiceSBD/EmployeeKilometerauswertungsListReport.cs new file mode 100644 index 000000000..6f3d6d8e2 --- /dev/null +++ b/ReportImp/SHKServiceSBD/EmployeeKilometerauswertungsListReport.cs @@ -0,0 +1,18 @@ +using BeWo.Report; +using BeWo.Report.ReportObjects; + +namespace SHKServiceSBD +{ + public partial class EmployeeKilometerauswertungsListReport : DevExpress.XtraReports.UI.XtraReport, IBeWoReport + { + public EmployeeKilometerauswertungsListReport() + { + InitializeComponent(); + } + + public void SetReportDataSource(EmployeeKilometerauswertungsListRO pRO) + { + objectDataSource1.DataSource = pRO; + } + } +} diff --git a/ReportImp/SHKServiceSBD/EmployeeKilometerauswertungsListReport.resx b/ReportImp/SHKServiceSBD/EmployeeKilometerauswertungsListReport.resx new file mode 100644 index 000000000..d58980a38 --- /dev/null +++ b/ReportImp/SHKServiceSBD/EmployeeKilometerauswertungsListReport.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + \ No newline at end of file diff --git a/ReportImp/SHKServiceSBD/EmployeeKilometerauswertungsReport.cs b/ReportImp/SHKServiceSBD/EmployeeKilometerauswertungsReport.cs new file mode 100644 index 000000000..cb411ac37 --- /dev/null +++ b/ReportImp/SHKServiceSBD/EmployeeKilometerauswertungsReport.cs @@ -0,0 +1,20 @@ +using BeWo.Report; +using BeWo.Report.ReportObjects; + +namespace SHKServiceSBD +{ + public partial class EmployeeKilometerauswertungsReport : DevExpress.XtraReports.UI.XtraReport, IBeWoReport + { + public EmployeeKilometerauswertungsReport() + { + InitializeComponent(); + } + + public void SetReportDataSource(EmployeeKilometerauswertungsRO pRO) + { + pRO.CreateDistanceList(); + + objectDataSource1.DataSource = pRO; + } + } +} diff --git a/ReportImp/SHKServiceSBD/EmployeeKilometerauswertungsReport.designer.cs b/ReportImp/SHKServiceSBD/EmployeeKilometerauswertungsReport.designer.cs new file mode 100644 index 000000000..4517f4509 --- /dev/null +++ b/ReportImp/SHKServiceSBD/EmployeeKilometerauswertungsReport.designer.cs @@ -0,0 +1,488 @@ +using BeWo.Report.ReportObjects; +namespace SHKServiceSBD +{ + partial class EmployeeKilometerauswertungsReport + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// 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(); + this.Detail = new DevExpress.XtraReports.UI.DetailBand(); + this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); + this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel(); + this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); + this.DetailReport1 = new DevExpress.XtraReports.UI.DetailReportBand(); + this.Detail2 = new DevExpress.XtraReports.UI.DetailBand(); + this.xrTable4 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); + this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); + this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.xrTable2 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); + this.objectDataSource1 = new DevExpress.DataAccess.ObjectBinding.ObjectDataSource(this.components); + this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); + this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); + this.pageFooterBand1 = new DevExpress.XtraReports.UI.PageFooterBand(); + this.xrPageInfo2 = new DevExpress.XtraReports.UI.XRPageInfo(); + this.xrPageInfo1 = new DevExpress.XtraReports.UI.XRPageInfo(); + this.Title = new DevExpress.XtraReports.UI.XRControlStyle(); + this.FieldCaption = new DevExpress.XtraReports.UI.XRControlStyle(); + this.PageInfo = new DevExpress.XtraReports.UI.XRControlStyle(); + this.DataField = new DevExpress.XtraReports.UI.XRControlStyle(); + this.fieldFLS = new DevExpress.XtraReports.UI.CalculatedField(); + this.fieldGroupFLS = new DevExpress.XtraReports.UI.CalculatedField(); + this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); + this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.objectDataSource1)).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; + // + // Detail1 + // + this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel13}); + this.Detail1.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); + this.Detail1.HeightF = 46.16668F; + this.Detail1.Name = "Detail1"; + this.Detail1.StylePriority.UseFont = false; + // + // xrLabel13 + // + this.xrLabel13.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalDistanceInMeters", "Kilometer gesamt: {0:0.##}")}); + this.xrLabel13.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0F, 10.00001F); + this.xrLabel13.Name = "xrLabel13"; + this.xrLabel13.SizeF = new System.Drawing.SizeF(677.0001F, 25F); + this.xrLabel13.StylePriority.UseFont = false; + this.xrLabel13.StylePriority.UsePadding = false; + this.xrLabel13.StylePriority.UseTextAlignment = false; + this.xrLabel13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + // + // DetailReport + // + this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail1, + this.DetailReport1}); + this.DetailReport.DataSource = this.objectDataSource1; + this.DetailReport.Level = 0; + this.DetailReport.Name = "DetailReport"; + // + // DetailReport1 + // + this.DetailReport1.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail2, + this.GroupFooter1, + this.GroupHeader2}); + this.DetailReport1.DataMember = "Entries"; + this.DetailReport1.DataSource = this.objectDataSource1; + this.DetailReport1.Level = 0; + this.DetailReport1.Name = "DetailReport1"; + // + // Detail2 + // + this.Detail2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable4}); + this.Detail2.HeightF = 25F; + this.Detail2.KeepTogether = true; + this.Detail2.KeepTogetherWithDetailReports = true; + this.Detail2.Name = "Detail2"; + this.Detail2.SortFields.AddRange(new DevExpress.XtraReports.UI.GroupField[] { + new DevExpress.XtraReports.UI.GroupField("Datum", DevExpress.XtraReports.UI.XRColumnSortOrder.Ascending)}); + // + // xrTable4 + // + this.xrTable4.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrTable4.Name = "xrTable4"; + this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow4}); + this.xrTable4.SizeF = new System.Drawing.SizeF(625.8332F, 25F); + this.xrTable4.StylePriority.UseBorders = false; + this.xrTable4.StylePriority.UsePadding = false; + // + // xrTableRow4 + // + this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell3, + this.xrTableCell2, + this.xrTableCell4, + this.xrTableCell9}); + this.xrTableRow4.Name = "xrTableRow4"; + this.xrTableRow4.Weight = 1D; + // + // xrTableCell3 + // + this.xrTableCell3.CanGrow = false; + this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Entries.Datum", "{0:dd.MM.yyyy}")}); + this.xrTableCell3.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F); + this.xrTableCell3.Name = "xrTableCell3"; + this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 4, 0, 100F); + this.xrTableCell3.StylePriority.UseFont = false; + this.xrTableCell3.StylePriority.UsePadding = false; + this.xrTableCell3.StylePriority.UseTextAlignment = false; + this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell3.Weight = 0.6802721106538383D; + // + // xrTableCell2 + // + this.xrTableCell2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Entries.TimeRange")}); + this.xrTableCell2.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F); + this.xrTableCell2.Name = "xrTableCell2"; + this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 4, 0, 100F); + this.xrTableCell2.StylePriority.UseFont = false; + this.xrTableCell2.StylePriority.UsePadding = false; + this.xrTableCell2.StylePriority.UseTextAlignment = false; + this.xrTableCell2.Text = "xrTableCell2"; + this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell2.Weight = 0.89285569697781431D; + // + // xrTableCell4 + // + this.xrTableCell4.CanGrow = false; + this.xrTableCell4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Entries.DistanceInMeters", "{0:0.##}")}); + this.xrTableCell4.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F); + this.xrTableCell4.Name = "xrTableCell4"; + this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 4, 0, 100F); + this.xrTableCell4.StylePriority.UseFont = false; + this.xrTableCell4.StylePriority.UsePadding = false; + this.xrTableCell4.StylePriority.UseTextAlignment = false; + this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell4.Weight = 1.028910120556823D; + // + // xrTableCell9 + // + this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Entries.Notice2")}); + this.xrTableCell9.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F); + this.xrTableCell9.Multiline = true; + this.xrTableCell9.Name = "xrTableCell9"; + this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(4, 4, 4, 0, 100F); + this.xrTableCell9.StylePriority.UseFont = false; + this.xrTableCell9.StylePriority.UsePadding = false; + this.xrTableCell9.StylePriority.UseTextAlignment = false; + this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.xrTableCell9.Weight = 1.655330774159318D; + // + // GroupFooter1 + // + this.GroupFooter1.HeightF = 0F; + this.GroupFooter1.Name = "GroupFooter1"; + this.GroupFooter1.PageBreak = DevExpress.XtraReports.UI.PageBreak.AfterBand; + // + // GroupHeader2 + // + this.GroupHeader2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable2}); + this.GroupHeader2.HeightF = 25F; + this.GroupHeader2.Name = "GroupHeader2"; + this.GroupHeader2.RepeatEveryPage = true; + // + // xrTable2 + // + this.xrTable2.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTable2.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrTable2.Name = "xrTable2"; + this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow2}); + this.xrTable2.SizeF = new System.Drawing.SizeF(625.8333F, 25F); + this.xrTable2.StylePriority.UseBorders = false; + this.xrTable2.StylePriority.UseFont = false; + this.xrTable2.StylePriority.UsePadding = false; + // + // xrTableRow2 + // + this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell5, + this.xrTableCell1, + this.xrTableCell6, + this.xrTableCell7}); + this.xrTableRow2.Name = "xrTableRow2"; + this.xrTableRow2.Weight = 1D; + // + // xrTableCell5 + // + this.xrTableCell5.CanGrow = false; + this.xrTableCell5.Name = "xrTableCell5"; + this.xrTableCell5.StylePriority.UseTextAlignment = false; + this.xrTableCell5.Text = "Datum"; + this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell5.Weight = 0.68027211517937214D; + // + // xrTableCell1 + // + this.xrTableCell1.Name = "xrTableCell1"; + this.xrTableCell1.StylePriority.UseTextAlignment = false; + this.xrTableCell1.Text = "Uhrzeit"; + this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell1.Weight = 0.89285652020261552D; + // + // xrTableCell6 + // + this.xrTableCell6.CanGrow = false; + this.xrTableCell6.Name = "xrTableCell6"; + this.xrTableCell6.StylePriority.UseTextAlignment = false; + this.xrTableCell6.Text = "gefahrene Kilometer"; + this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell6.Weight = 1.0289109483071579D; + // + // xrTableCell7 + // + this.xrTableCell7.CanGrow = false; + this.xrTableCell7.Name = "xrTableCell7"; + this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 100F); + this.xrTableCell7.StylePriority.UsePadding = false; + this.xrTableCell7.StylePriority.UseTextAlignment = false; + this.xrTableCell7.Text = "Bemerkungen"; + this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell7.Weight = 1.6553300906804376D; + // + // objectDataSource1 + // + this.objectDataSource1.DataSource = typeof(BeWo.Report.ReportObjects.EmployeeKilometerauswertungsRO); + this.objectDataSource1.Name = "objectDataSource1"; + // + // ReportHeader + // + this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel2, + this.xrLabel1}); + this.ReportHeader.HeightF = 50F; + this.ReportHeader.Name = "ReportHeader"; + // + // xrLabel2 + // + this.xrLabel2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "MonthInformation", "Zeitraum: {0:MMMM yyyy}")}); + this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 12F); + this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 24.99999F); + this.xrLabel2.Name = "xrLabel2"; + this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); + this.xrLabel2.SizeF = new System.Drawing.SizeF(677.0001F, 25F); + this.xrLabel2.StylePriority.UseFont = false; + this.xrLabel2.StylePriority.UsePadding = false; + // + // xrLabel1 + // + this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 14F); + this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrLabel1.Multiline = true; + this.xrLabel1.Name = "xrLabel1"; + this.xrLabel1.SizeF = new System.Drawing.SizeF(677.0001F, 25F); + this.xrLabel1.StyleName = "Title"; + this.xrLabel1.StylePriority.UseFont = false; + this.xrLabel1.Text = "Auswertung über gefahrene Kilometer für [EmployeeName]"; + // + // pageFooterBand1 + // + this.pageFooterBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrPageInfo2, + this.xrPageInfo1}); + this.pageFooterBand1.HeightF = 48F; + this.pageFooterBand1.Name = "pageFooterBand1"; + // + // xrPageInfo2 + // + this.xrPageInfo2.Font = new DevExpress.Drawing.DXFont("Arial", 8F); + this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(382.4996F, 25F); + this.xrPageInfo2.Name = "xrPageInfo2"; + this.xrPageInfo2.SizeF = new System.Drawing.SizeF(243.3336F, 23F); + this.xrPageInfo2.StyleName = "PageInfo"; + this.xrPageInfo2.StylePriority.UseFont = false; + this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrPageInfo2.TextFormatString = "Seite {0} von {1}"; + // + // xrPageInfo1 + // + this.xrPageInfo1.Font = new DevExpress.Drawing.DXFont("Arial", 8F); + this.xrPageInfo1.LocationFloat = new DevExpress.Utils.PointFloat(7.999929F, 25F); + this.xrPageInfo1.Name = "xrPageInfo1"; + this.xrPageInfo1.PageInfo = DevExpress.XtraPrinting.PageInfo.DateTime; + this.xrPageInfo1.SizeF = new System.Drawing.SizeF(223.25F, 23F); + this.xrPageInfo1.StyleName = "PageInfo"; + this.xrPageInfo1.StylePriority.UseFont = false; + // + // Title + // + this.Title.BackColor = System.Drawing.Color.White; + this.Title.BorderColor = System.Drawing.SystemColors.ControlText; + this.Title.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.Title.BorderWidth = 1F; + this.Title.Font = new DevExpress.Drawing.DXFont("Times New Roman", 24F); + this.Title.ForeColor = System.Drawing.Color.Black; + this.Title.Name = "Title"; + // + // FieldCaption + // + this.FieldCaption.BackColor = System.Drawing.Color.White; + this.FieldCaption.BorderColor = System.Drawing.SystemColors.ControlText; + this.FieldCaption.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.FieldCaption.BorderWidth = 1F; + this.FieldCaption.Font = new DevExpress.Drawing.DXFont("Times New Roman", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.FieldCaption.ForeColor = System.Drawing.Color.Black; + this.FieldCaption.Name = "FieldCaption"; + // + // PageInfo + // + this.PageInfo.BackColor = System.Drawing.Color.White; + this.PageInfo.BorderColor = System.Drawing.SystemColors.ControlText; + this.PageInfo.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.PageInfo.BorderWidth = 1F; + this.PageInfo.Font = new DevExpress.Drawing.DXFont("Times New Roman", 8F); + this.PageInfo.ForeColor = System.Drawing.Color.Black; + this.PageInfo.Name = "PageInfo"; + // + // DataField + // + this.DataField.BackColor = System.Drawing.Color.White; + this.DataField.BorderColor = System.Drawing.SystemColors.ControlText; + this.DataField.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.DataField.BorderWidth = 1F; + this.DataField.Font = new DevExpress.Drawing.DXFont("Times New Roman", 8F); + this.DataField.ForeColor = System.Drawing.SystemColors.ControlText; + this.DataField.Name = "DataField"; + // + // fieldFLS + // + this.fieldFLS.DataMember = "FLSReportGroups.FLSReportDetails"; + this.fieldFLS.Expression = "[TotalFLM] / 60\r\n"; + this.fieldFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; + this.fieldFLS.Name = "fieldFLS"; + // + // fieldGroupFLS + // + this.fieldGroupFLS.DataMember = "FLSReportGroups"; + this.fieldGroupFLS.Expression = "[TotalFLM]/60"; + this.fieldGroupFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; + this.fieldGroupFLS.Name = "fieldGroupFLS"; + // + // topMarginBand1 + // + this.topMarginBand1.HeightF = 50F; + this.topMarginBand1.Name = "topMarginBand1"; + // + // bottomMarginBand1 + // + this.bottomMarginBand1.HeightF = 50F; + this.bottomMarginBand1.Name = "bottomMarginBand1"; + // + // EmployeeKilometerauswertungsReport + // + this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail, + this.DetailReport, + this.ReportHeader, + this.pageFooterBand1, + this.topMarginBand1, + this.bottomMarginBand1}); + this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] { + this.fieldFLS, + this.fieldGroupFLS}); + this.ComponentStorage.AddRange(new System.ComponentModel.IComponent[] { + this.objectDataSource1}); + this.DataSource = this.objectDataSource1; + this.Margins = new DevExpress.Drawing.DXMargins(75F, 75F, 50F, 50F); + this.PageHeight = 1169; + this.PageWidth = 827; + this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; + this.StyleSheet.AddRange(new DevExpress.XtraReports.UI.XRControlStyle[] { + this.Title, + this.FieldCaption, + this.PageInfo, + this.DataField}); + this.Version = "23.2"; + ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.objectDataSource1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); + + } + + #endregion + + private DevExpress.XtraReports.UI.DetailBand Detail; + private DevExpress.XtraReports.UI.DetailBand Detail1; + private DevExpress.XtraReports.UI.DetailReportBand DetailReport; + private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader; + private DevExpress.XtraReports.UI.XRLabel xrLabel1; + private DevExpress.XtraReports.UI.PageFooterBand pageFooterBand1; + private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo2; + private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo1; + private DevExpress.XtraReports.UI.XRControlStyle Title; + private DevExpress.XtraReports.UI.XRControlStyle FieldCaption; + private DevExpress.XtraReports.UI.XRControlStyle PageInfo; + private DevExpress.XtraReports.UI.XRControlStyle DataField; + private DevExpress.XtraReports.UI.XRTable xrTable2; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow2; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell5; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell6; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell7; + private DevExpress.XtraReports.UI.DetailReportBand DetailReport1; + private DevExpress.XtraReports.UI.DetailBand Detail2; + private DevExpress.XtraReports.UI.XRTable xrTable4; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow4; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell3; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell4; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell9; + private DevExpress.XtraReports.UI.XRLabel xrLabel2; + private DevExpress.XtraReports.UI.XRLabel xrLabel13; + private DevExpress.XtraReports.UI.CalculatedField fieldFLS; + private DevExpress.XtraReports.UI.CalculatedField fieldGroupFLS; + private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1; + private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1; + private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1; + private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader2; + private DevExpress.DataAccess.ObjectBinding.ObjectDataSource objectDataSource1; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell2; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell1; + } +} diff --git a/ReportImp/SHKServiceSBD/EmployeeKilometerauswertungsReport.resx b/ReportImp/SHKServiceSBD/EmployeeKilometerauswertungsReport.resx new file mode 100644 index 000000000..d58980a38 --- /dev/null +++ b/ReportImp/SHKServiceSBD/EmployeeKilometerauswertungsReport.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + \ No newline at end of file diff --git a/ReportImp/SHKServiceSBD/KilometerauswertungsListReport.Designer.cs b/ReportImp/SHKServiceSBD/KilometerauswertungsListReport.Designer.cs new file mode 100644 index 000000000..f026bf0b3 --- /dev/null +++ b/ReportImp/SHKServiceSBD/KilometerauswertungsListReport.Designer.cs @@ -0,0 +1,496 @@ +using BeWo.Report.ReportObjects; +namespace SHKServiceSBD +{ + partial class KilometerauswertungsListReport + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// 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(); + this.Detail = new DevExpress.XtraReports.UI.DetailBand(); + this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); + this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); + this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); + this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); + this.DetailReport1 = new DevExpress.XtraReports.UI.DetailReportBand(); + this.Detail2 = new DevExpress.XtraReports.UI.DetailBand(); + this.xrTable4 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); + this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.xrTable2 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); + this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); + this.objectDataSource1 = new DevExpress.DataAccess.ObjectBinding.ObjectDataSource(this.components); + this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); + this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); + this.pageFooterBand1 = new DevExpress.XtraReports.UI.PageFooterBand(); + this.xrPageInfo2 = new DevExpress.XtraReports.UI.XRPageInfo(); + this.xrPageInfo1 = new DevExpress.XtraReports.UI.XRPageInfo(); + this.Title = new DevExpress.XtraReports.UI.XRControlStyle(); + this.FieldCaption = new DevExpress.XtraReports.UI.XRControlStyle(); + this.PageInfo = new DevExpress.XtraReports.UI.XRControlStyle(); + this.DataField = new DevExpress.XtraReports.UI.XRControlStyle(); + this.fieldFLS = new DevExpress.XtraReports.UI.CalculatedField(); + this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); + this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.objectDataSource1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); + // + // Detail + // + 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; + // + // xrTableCell1 + // + this.xrTableCell1.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrTableCell1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Customer2Entries.CustomerName")}); + this.xrTableCell1.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); + this.xrTableCell1.Name = "xrTableCell1"; + this.xrTableCell1.StylePriority.UseBorderColor = false; + this.xrTableCell1.StylePriority.UseBorders = false; + this.xrTableCell1.StylePriority.UseFont = false; + this.xrTableCell1.Weight = 4.0816326530612246D; + // + // xrTableRow1 + // + this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell1}); + this.xrTableRow1.Name = "xrTableRow1"; + this.xrTableRow1.Weight = 1D; + // + // xrTable1 + // + this.xrTable1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25F); + this.xrTable1.Name = "xrTable1"; + this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow1}); + this.xrTable1.SizeF = new System.Drawing.SizeF(600F, 25F); + this.xrTable1.StylePriority.UseBorders = false; + this.xrTable1.StylePriority.UsePadding = false; + // + // Detail1 + // + this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel7, + this.xrTable1}); + this.Detail1.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.Detail1.HeightF = 83F; + this.Detail1.Name = "Detail1"; + this.Detail1.StylePriority.UseFont = false; + // + // xrLabel7 + // + this.xrLabel7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Customer2Entries.TotalDistanceInMeters", "Kilometer gesamt: {0:}")}); + this.xrLabel7.Font = new System.Drawing.Font("Arial", 10F); + this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 50F); + this.xrLabel7.Name = "xrLabel7"; + this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel7.SizeF = new System.Drawing.SizeF(280F, 25F); + this.xrLabel7.StylePriority.UseFont = false; + // + // DetailReport + // + this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail1, + this.DetailReport1}); + this.DetailReport.DataMember = "Customer2Entries"; + this.DetailReport.DataSource = this.objectDataSource1; + this.DetailReport.Level = 0; + this.DetailReport.Name = "DetailReport"; + // + // DetailReport1 + // + this.DetailReport1.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail2, + this.GroupHeader2, + this.GroupFooter1}); + this.DetailReport1.DataMember = "Customer2Entries.Entries"; + this.DetailReport1.DataSource = this.objectDataSource1; + this.DetailReport1.Level = 0; + this.DetailReport1.Name = "DetailReport1"; + // + // Detail2 + // + this.Detail2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable4}); + this.Detail2.HeightF = 25F; + this.Detail2.Name = "Detail2"; + // + // xrTable4 + // + this.xrTable4.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrTable4.Name = "xrTable4"; + this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow4}); + this.xrTable4.SizeF = new System.Drawing.SizeF(625.8302F, 25F); + this.xrTable4.StylePriority.UseBorders = false; + this.xrTable4.StylePriority.UsePadding = false; + // + // xrTableRow4 + // + this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell3, + this.xrTableCell8, + this.xrTableCell4, + this.xrTableCell9}); + this.xrTableRow4.Name = "xrTableRow4"; + this.xrTableRow4.Weight = 1D; + // + // xrTableCell3 + // + this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Customer2Entries.Entries.Datum", "{0:dd.MM.yyyy}")}); + this.xrTableCell3.Font = new System.Drawing.Font("Arial", 9.75F); + this.xrTableCell3.Name = "xrTableCell3"; + this.xrTableCell3.StylePriority.UseFont = false; + this.xrTableCell3.StylePriority.UseTextAlignment = false; + this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell3.Weight = 0.6802721055263049D; + // + // xrTableCell8 + // + this.xrTableCell8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Customer2Entries.Entries.TimeRange")}); + this.xrTableCell8.Font = new System.Drawing.Font("Arial", 9.75F); + this.xrTableCell8.Name = "xrTableCell8"; + this.xrTableCell8.StylePriority.UseFont = false; + this.xrTableCell8.StylePriority.UseTextAlignment = false; + this.xrTableCell8.Text = "xrTableCell8"; + this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell8.Weight = 0.89285797658466393D; + // + // xrTableCell4 + // + this.xrTableCell4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Customer2Entries.Entries.DistanceInMeters", "{0:0.##}")}); + this.xrTableCell4.Font = new System.Drawing.Font("Arial", 9.75F); + this.xrTableCell4.Name = "xrTableCell4"; + this.xrTableCell4.StylePriority.UseFont = false; + this.xrTableCell4.StylePriority.UseTextAlignment = false; + this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell4.Weight = 1.028912291234853D; + // + // xrTableCell9 + // + this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Customer2Entries.Entries.EmployeeName")}); + this.xrTableCell9.Font = new System.Drawing.Font("Arial", 9.75F); + this.xrTableCell9.Name = "xrTableCell9"; + this.xrTableCell9.StylePriority.UseFont = false; + this.xrTableCell9.StylePriority.UsePadding = false; + this.xrTableCell9.StylePriority.UseTextAlignment = false; + this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell9.Weight = 1.6553058235012754D; + // + // GroupHeader2 + // + this.GroupHeader2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable2}); + this.GroupHeader2.HeightF = 25F; + this.GroupHeader2.Name = "GroupHeader2"; + this.GroupHeader2.RepeatEveryPage = true; + // + // xrTable2 + // + this.xrTable2.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTable2.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); + this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrTable2.Name = "xrTable2"; + this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow2}); + this.xrTable2.SizeF = new System.Drawing.SizeF(625.83F, 25F); + this.xrTable2.StylePriority.UseBorders = false; + this.xrTable2.StylePriority.UseFont = false; + this.xrTable2.StylePriority.UsePadding = false; + // + // xrTableRow2 + // + this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell5, + this.xrTableCell2, + this.xrTableCell6, + this.xrTableCell7}); + this.xrTableRow2.Name = "xrTableRow2"; + this.xrTableRow2.Weight = 1D; + // + // xrTableCell5 + // + this.xrTableCell5.Name = "xrTableCell5"; + this.xrTableCell5.StylePriority.UseTextAlignment = false; + this.xrTableCell5.Text = "Datum"; + this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell5.Weight = 0.68027211962967382D; + // + // xrTableCell2 + // + this.xrTableCell2.Name = "xrTableCell2"; + this.xrTableCell2.StylePriority.UseTextAlignment = false; + this.xrTableCell2.Text = "Uhrzeit"; + this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell2.Weight = 0.892857131771576D; + // + // xrTableCell6 + // + this.xrTableCell6.Name = "xrTableCell6"; + this.xrTableCell6.StylePriority.UseTextAlignment = false; + this.xrTableCell6.Text = "gefahrene Kilometer"; + this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell6.Weight = 1.0289115603020467D; + // + // xrTableCell7 + // + this.xrTableCell7.Name = "xrTableCell7"; + this.xrTableCell7.StylePriority.UsePadding = false; + this.xrTableCell7.StylePriority.UseTextAlignment = false; + this.xrTableCell7.Text = "Mitarbeiter"; + this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell7.Weight = 1.6553060397102077D; + // + // GroupFooter1 + // + this.GroupFooter1.HeightF = 0F; + this.GroupFooter1.Name = "GroupFooter1"; + this.GroupFooter1.PageBreak = DevExpress.XtraReports.UI.PageBreak.AfterBand; + // + // objectDataSource1 + // + this.objectDataSource1.DataSource = typeof(BeWo.Report.ReportObjects.KilometerauswertungsListRO); + this.objectDataSource1.Name = "objectDataSource1"; + // + // ReportHeader + // + this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel2, + this.xrLabel1}); + this.ReportHeader.HeightF = 50F; + this.ReportHeader.Name = "ReportHeader"; + // + // xrLabel2 + // + this.xrLabel2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "MonthInformation", "Zeitraum: {0:MMMM yyyy}")}); + this.xrLabel2.Font = new System.Drawing.Font("Arial", 12F); + this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25F); + this.xrLabel2.Name = "xrLabel2"; + this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel2.SizeF = new System.Drawing.SizeF(280F, 25F); + this.xrLabel2.StylePriority.UseFont = false; + // + // xrLabel1 + // + this.xrLabel1.Font = new System.Drawing.Font("Arial", 14F); + this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrLabel1.Multiline = true; + this.xrLabel1.Name = "xrLabel1"; + this.xrLabel1.SizeF = new System.Drawing.SizeF(600F, 25F); + this.xrLabel1.StyleName = "Title"; + this.xrLabel1.StylePriority.UseFont = false; + this.xrLabel1.Text = "Auswertung über gefahrene Kilometer"; + // + // pageFooterBand1 + // + this.pageFooterBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrPageInfo2, + this.xrPageInfo1}); + this.pageFooterBand1.HeightF = 48F; + this.pageFooterBand1.Name = "pageFooterBand1"; + // + // xrPageInfo2 + // + this.xrPageInfo2.Font = new System.Drawing.Font("Arial", 8F); + this.xrPageInfo2.Format = "Seite {0} von {1}"; + this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(382.5002F, 25F); + this.xrPageInfo2.Name = "xrPageInfo2"; + this.xrPageInfo2.SizeF = new System.Drawing.SizeF(243.33F, 23F); + this.xrPageInfo2.StyleName = "PageInfo"; + this.xrPageInfo2.StylePriority.UseFont = false; + this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + // + // xrPageInfo1 + // + this.xrPageInfo1.Font = new System.Drawing.Font("Arial", 8F); + this.xrPageInfo1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25F); + this.xrPageInfo1.Name = "xrPageInfo1"; + this.xrPageInfo1.PageInfo = DevExpress.XtraPrinting.PageInfo.DateTime; + this.xrPageInfo1.SizeF = new System.Drawing.SizeF(231.2502F, 23F); + this.xrPageInfo1.StyleName = "PageInfo"; + this.xrPageInfo1.StylePriority.UseFont = false; + // + // Title + // + this.Title.BackColor = System.Drawing.Color.White; + this.Title.BorderColor = System.Drawing.SystemColors.ControlText; + this.Title.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.Title.BorderWidth = 1F; + this.Title.Font = new System.Drawing.Font("Times New Roman", 24F); + this.Title.ForeColor = System.Drawing.Color.Black; + this.Title.Name = "Title"; + // + // FieldCaption + // + this.FieldCaption.BackColor = System.Drawing.Color.White; + this.FieldCaption.BorderColor = System.Drawing.SystemColors.ControlText; + this.FieldCaption.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.FieldCaption.BorderWidth = 1F; + this.FieldCaption.Font = new System.Drawing.Font("Times New Roman", 10F, System.Drawing.FontStyle.Bold); + this.FieldCaption.ForeColor = System.Drawing.Color.Black; + this.FieldCaption.Name = "FieldCaption"; + // + // PageInfo + // + this.PageInfo.BackColor = System.Drawing.Color.White; + this.PageInfo.BorderColor = System.Drawing.SystemColors.ControlText; + this.PageInfo.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.PageInfo.BorderWidth = 1F; + this.PageInfo.Font = new System.Drawing.Font("Times New Roman", 8F); + this.PageInfo.ForeColor = System.Drawing.Color.Black; + this.PageInfo.Name = "PageInfo"; + // + // DataField + // + this.DataField.BackColor = System.Drawing.Color.White; + this.DataField.BorderColor = System.Drawing.SystemColors.ControlText; + this.DataField.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.DataField.BorderWidth = 1F; + this.DataField.Font = new System.Drawing.Font("Times New Roman", 8F); + this.DataField.ForeColor = System.Drawing.SystemColors.ControlText; + this.DataField.Name = "DataField"; + // + // fieldFLS + // + this.fieldFLS.DataMember = "FLSReportGroups"; + this.fieldFLS.Expression = "[TotalFLM] / 60"; + this.fieldFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; + this.fieldFLS.Name = "fieldFLS"; + // + // topMarginBand1 + // + this.topMarginBand1.HeightF = 50F; + this.topMarginBand1.Name = "topMarginBand1"; + // + // bottomMarginBand1 + // + this.bottomMarginBand1.HeightF = 50F; + this.bottomMarginBand1.Name = "bottomMarginBand1"; + // + // KilometerauswertungsListReport + // + this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail, + this.DetailReport, + this.ReportHeader, + this.pageFooterBand1, + this.topMarginBand1, + this.bottomMarginBand1}); + this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] { + this.fieldFLS}); + this.ComponentStorage.AddRange(new System.ComponentModel.IComponent[] { + this.objectDataSource1}); + this.DataSource = this.objectDataSource1; + this.Margins = new System.Drawing.Printing.Margins(75, 75, 50, 50); + this.PageHeight = 1169; + this.PageWidth = 827; + this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; + this.StyleSheet.AddRange(new DevExpress.XtraReports.UI.XRControlStyle[] { + this.Title, + this.FieldCaption, + this.PageInfo, + this.DataField}); + this.Version = "17.1"; + ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.objectDataSource1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); + + } + + #endregion + + private DevExpress.XtraReports.UI.DetailBand Detail; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell1; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow1; + private DevExpress.XtraReports.UI.XRTable xrTable1; + private DevExpress.XtraReports.UI.DetailBand Detail1; + private DevExpress.XtraReports.UI.DetailReportBand DetailReport; + private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader; + private DevExpress.XtraReports.UI.XRLabel xrLabel1; + private DevExpress.XtraReports.UI.PageFooterBand pageFooterBand1; + private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo2; + private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo1; + private DevExpress.XtraReports.UI.XRControlStyle Title; + private DevExpress.XtraReports.UI.XRControlStyle FieldCaption; + private DevExpress.XtraReports.UI.XRControlStyle PageInfo; + private DevExpress.XtraReports.UI.XRControlStyle DataField; + private DevExpress.XtraReports.UI.XRTable xrTable2; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow2; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell5; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell6; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell7; + private DevExpress.XtraReports.UI.DetailReportBand DetailReport1; + private DevExpress.XtraReports.UI.DetailBand Detail2; + private DevExpress.XtraReports.UI.XRTable xrTable4; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow4; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell3; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell4; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell9; + private DevExpress.XtraReports.UI.XRLabel xrLabel2; + private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader2; + private DevExpress.XtraReports.UI.XRLabel xrLabel7; + private DevExpress.XtraReports.UI.CalculatedField fieldFLS; + private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1; + private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1; + private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1; + private DevExpress.DataAccess.ObjectBinding.ObjectDataSource objectDataSource1; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell8; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell2; + } +} diff --git a/ReportImp/SHKServiceSBD/KilometerauswertungsListReport.cs b/ReportImp/SHKServiceSBD/KilometerauswertungsListReport.cs new file mode 100644 index 000000000..52d928e2b --- /dev/null +++ b/ReportImp/SHKServiceSBD/KilometerauswertungsListReport.cs @@ -0,0 +1,18 @@ +using BeWo.Report; +using BeWo.Report.ReportObjects; + +namespace SHKServiceSBD +{ + public partial class KilometerauswertungsListReport : DevExpress.XtraReports.UI.XtraReport, IBeWoReport + { + public KilometerauswertungsListReport() + { + InitializeComponent(); + } + + public void SetReportDataSource(KilometerauswertungsListRO pRO) + { + objectDataSource1.DataSource = pRO; + } + } +} diff --git a/ReportImp/SHKServiceSBD/KilometerauswertungsListReport.resx b/ReportImp/SHKServiceSBD/KilometerauswertungsListReport.resx new file mode 100644 index 000000000..2662eac07 --- /dev/null +++ b/ReportImp/SHKServiceSBD/KilometerauswertungsListReport.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 + + + 17, 17 + + \ No newline at end of file diff --git a/ReportImp/SHKServiceSBD/KilometerauswertungsReport.cs b/ReportImp/SHKServiceSBD/KilometerauswertungsReport.cs new file mode 100644 index 000000000..08c48715d --- /dev/null +++ b/ReportImp/SHKServiceSBD/KilometerauswertungsReport.cs @@ -0,0 +1,20 @@ +using BeWo.Report; +using BeWo.Report.ReportObjects; + +namespace SHKServiceSBD +{ + public partial class KilometerauswertungsReport : DevExpress.XtraReports.UI.XtraReport, IBeWoReport + { + public KilometerauswertungsReport() + { + InitializeComponent(); + } + + public void SetReportDataSource(KilometerauswertungsRO pRO) + { + pRO.CreateDistanceList(); + + objectDataSource1.DataSource = pRO; + } + } +} diff --git a/ReportImp/SHKServiceSBD/KilometerauswertungsReport.designer.cs b/ReportImp/SHKServiceSBD/KilometerauswertungsReport.designer.cs new file mode 100644 index 000000000..308792327 --- /dev/null +++ b/ReportImp/SHKServiceSBD/KilometerauswertungsReport.designer.cs @@ -0,0 +1,479 @@ +using BeWo.Report.ReportObjects; +namespace SHKServiceSBD +{ + partial class KilometerauswertungsReport + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// 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(); + this.Detail = new DevExpress.XtraReports.UI.DetailBand(); + this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); + this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel(); + this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); + this.DetailReport1 = new DevExpress.XtraReports.UI.DetailReportBand(); + this.Detail2 = new DevExpress.XtraReports.UI.DetailBand(); + this.xrTable4 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); + this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); + this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.xrTable2 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); + this.objectDataSource1 = new DevExpress.DataAccess.ObjectBinding.ObjectDataSource(this.components); + this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); + this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); + this.pageFooterBand1 = new DevExpress.XtraReports.UI.PageFooterBand(); + this.xrPageInfo2 = new DevExpress.XtraReports.UI.XRPageInfo(); + this.xrPageInfo1 = new DevExpress.XtraReports.UI.XRPageInfo(); + this.Title = new DevExpress.XtraReports.UI.XRControlStyle(); + this.FieldCaption = new DevExpress.XtraReports.UI.XRControlStyle(); + this.PageInfo = new DevExpress.XtraReports.UI.XRControlStyle(); + this.DataField = new DevExpress.XtraReports.UI.XRControlStyle(); + this.fieldFLS = new DevExpress.XtraReports.UI.CalculatedField(); + this.fieldGroupFLS = new DevExpress.XtraReports.UI.CalculatedField(); + this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); + this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.objectDataSource1)).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; + // + // Detail1 + // + this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel13}); + this.Detail1.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.Detail1.HeightF = 46.16668F; + this.Detail1.Name = "Detail1"; + this.Detail1.StylePriority.UseFont = false; + // + // xrLabel13 + // + this.xrLabel13.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalDistanceInMeters", "Kilometer gesamt: {0:0.##}")}); + this.xrLabel13.Font = new System.Drawing.Font("Arial", 10F); + this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0F, 10.00001F); + this.xrLabel13.Name = "xrLabel13"; + this.xrLabel13.SizeF = new System.Drawing.SizeF(677.0001F, 25F); + this.xrLabel13.StylePriority.UseFont = false; + this.xrLabel13.StylePriority.UsePadding = false; + this.xrLabel13.StylePriority.UseTextAlignment = false; + this.xrLabel13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + // + // DetailReport + // + this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail1, + this.DetailReport1}); + this.DetailReport.DataSource = this.objectDataSource1; + this.DetailReport.Level = 0; + this.DetailReport.Name = "DetailReport"; + // + // DetailReport1 + // + this.DetailReport1.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail2, + this.GroupFooter1, + this.GroupHeader2}); + this.DetailReport1.DataMember = "Entries"; + this.DetailReport1.DataSource = this.objectDataSource1; + this.DetailReport1.Level = 0; + this.DetailReport1.Name = "DetailReport1"; + // + // Detail2 + // + this.Detail2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable4}); + this.Detail2.HeightF = 25F; + this.Detail2.KeepTogether = true; + this.Detail2.KeepTogetherWithDetailReports = true; + this.Detail2.Name = "Detail2"; + // + // xrTable4 + // + this.xrTable4.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrTable4.Name = "xrTable4"; + this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow4}); + this.xrTable4.SizeF = new System.Drawing.SizeF(625.8332F, 25F); + this.xrTable4.StylePriority.UseBorders = false; + this.xrTable4.StylePriority.UsePadding = false; + // + // xrTableRow4 + // + this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell3, + this.xrTableCell2, + this.xrTableCell4, + this.xrTableCell9}); + this.xrTableRow4.Name = "xrTableRow4"; + this.xrTableRow4.Weight = 1D; + // + // xrTableCell3 + // + this.xrTableCell3.CanGrow = false; + this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Entries.Datum", "{0:dd.MM.yyyy}")}); + this.xrTableCell3.Font = new System.Drawing.Font("Arial", 9.75F); + this.xrTableCell3.Name = "xrTableCell3"; + this.xrTableCell3.StylePriority.UseFont = false; + this.xrTableCell3.StylePriority.UseTextAlignment = false; + this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell3.Weight = 0.6802721106538383D; + // + // xrTableCell2 + // + this.xrTableCell2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Entries.TimeRange")}); + this.xrTableCell2.Font = new System.Drawing.Font("Arial", 9.75F); + this.xrTableCell2.Name = "xrTableCell2"; + this.xrTableCell2.StylePriority.UseFont = false; + this.xrTableCell2.StylePriority.UseTextAlignment = false; + this.xrTableCell2.Text = "xrTableCell2"; + this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell2.Weight = 0.89285569697781431D; + // + // xrTableCell4 + // + this.xrTableCell4.CanGrow = false; + this.xrTableCell4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Entries.DistanceInMeters", "{0:0.##}")}); + this.xrTableCell4.Font = new System.Drawing.Font("Arial", 9.75F); + this.xrTableCell4.Name = "xrTableCell4"; + this.xrTableCell4.StylePriority.UseFont = false; + this.xrTableCell4.StylePriority.UseTextAlignment = false; + this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell4.Weight = 1.028910120556823D; + // + // xrTableCell9 + // + this.xrTableCell9.CanGrow = false; + this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Entries.EmployeeName")}); + this.xrTableCell9.Font = new System.Drawing.Font("Arial", 9.75F); + this.xrTableCell9.Name = "xrTableCell9"; + this.xrTableCell9.StylePriority.UseFont = false; + this.xrTableCell9.StylePriority.UsePadding = false; + this.xrTableCell9.StylePriority.UseTextAlignment = false; + this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell9.Weight = 1.655330774159318D; + // + // GroupFooter1 + // + this.GroupFooter1.HeightF = 0F; + this.GroupFooter1.Name = "GroupFooter1"; + this.GroupFooter1.PageBreak = DevExpress.XtraReports.UI.PageBreak.AfterBand; + // + // GroupHeader2 + // + this.GroupHeader2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable2}); + this.GroupHeader2.HeightF = 25F; + this.GroupHeader2.Name = "GroupHeader2"; + this.GroupHeader2.RepeatEveryPage = true; + // + // xrTable2 + // + this.xrTable2.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTable2.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); + this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrTable2.Name = "xrTable2"; + this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow2}); + this.xrTable2.SizeF = new System.Drawing.SizeF(625.8333F, 25F); + this.xrTable2.StylePriority.UseBorders = false; + this.xrTable2.StylePriority.UseFont = false; + this.xrTable2.StylePriority.UsePadding = false; + // + // xrTableRow2 + // + this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell5, + this.xrTableCell1, + this.xrTableCell6, + this.xrTableCell7}); + this.xrTableRow2.Name = "xrTableRow2"; + this.xrTableRow2.Weight = 1D; + // + // xrTableCell5 + // + this.xrTableCell5.CanGrow = false; + this.xrTableCell5.Name = "xrTableCell5"; + this.xrTableCell5.StylePriority.UseTextAlignment = false; + this.xrTableCell5.Text = "Datum"; + this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell5.Weight = 0.68027211517937214D; + // + // xrTableCell1 + // + this.xrTableCell1.Name = "xrTableCell1"; + this.xrTableCell1.StylePriority.UseTextAlignment = false; + this.xrTableCell1.Text = "Uhrzeit"; + this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell1.Weight = 0.89285652020261552D; + // + // xrTableCell6 + // + this.xrTableCell6.CanGrow = false; + this.xrTableCell6.Name = "xrTableCell6"; + this.xrTableCell6.StylePriority.UseTextAlignment = false; + this.xrTableCell6.Text = "gefahrene Kilometer"; + this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell6.Weight = 1.0289109483071579D; + // + // xrTableCell7 + // + this.xrTableCell7.CanGrow = false; + this.xrTableCell7.Name = "xrTableCell7"; + this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 100F); + this.xrTableCell7.StylePriority.UsePadding = false; + this.xrTableCell7.StylePriority.UseTextAlignment = false; + this.xrTableCell7.Text = "Mitarbeiter"; + this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell7.Weight = 1.6553300906804376D; + // + // objectDataSource1 + // + this.objectDataSource1.DataSource = typeof(BeWo.Report.ReportObjects.KilometerauswertungsRO); + this.objectDataSource1.Name = "objectDataSource1"; + // + // ReportHeader + // + this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel2, + this.xrLabel1}); + this.ReportHeader.HeightF = 50F; + this.ReportHeader.Name = "ReportHeader"; + // + // xrLabel2 + // + this.xrLabel2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "MonthInformation", "Zeitraum: {0:MMMM yyyy}")}); + this.xrLabel2.Font = new System.Drawing.Font("Arial", 12F); + this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 24.99999F); + this.xrLabel2.Name = "xrLabel2"; + this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); + this.xrLabel2.SizeF = new System.Drawing.SizeF(677.0001F, 25F); + this.xrLabel2.StylePriority.UseFont = false; + this.xrLabel2.StylePriority.UsePadding = false; + // + // xrLabel1 + // + this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerName", "Auswertung über gefahrene Kilometer für {0:}")}); + this.xrLabel1.Font = new System.Drawing.Font("Arial", 14F); + this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrLabel1.Multiline = true; + this.xrLabel1.Name = "xrLabel1"; + this.xrLabel1.SizeF = new System.Drawing.SizeF(677.0001F, 25F); + this.xrLabel1.StyleName = "Title"; + this.xrLabel1.StylePriority.UseFont = false; + // + // pageFooterBand1 + // + this.pageFooterBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrPageInfo2, + this.xrPageInfo1}); + this.pageFooterBand1.HeightF = 48F; + this.pageFooterBand1.Name = "pageFooterBand1"; + // + // xrPageInfo2 + // + this.xrPageInfo2.Font = new System.Drawing.Font("Arial", 8F); + this.xrPageInfo2.Format = "Seite {0} von {1}"; + this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(382.4996F, 25F); + this.xrPageInfo2.Name = "xrPageInfo2"; + this.xrPageInfo2.SizeF = new System.Drawing.SizeF(243.3337F, 23F); + this.xrPageInfo2.StyleName = "PageInfo"; + this.xrPageInfo2.StylePriority.UseFont = false; + this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + // + // xrPageInfo1 + // + this.xrPageInfo1.Font = new System.Drawing.Font("Arial", 8F); + this.xrPageInfo1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25F); + this.xrPageInfo1.Name = "xrPageInfo1"; + this.xrPageInfo1.PageInfo = DevExpress.XtraPrinting.PageInfo.DateTime; + this.xrPageInfo1.SizeF = new System.Drawing.SizeF(231.2499F, 23F); + this.xrPageInfo1.StyleName = "PageInfo"; + this.xrPageInfo1.StylePriority.UseFont = false; + // + // Title + // + this.Title.BackColor = System.Drawing.Color.White; + this.Title.BorderColor = System.Drawing.SystemColors.ControlText; + this.Title.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.Title.BorderWidth = 1F; + this.Title.Font = new System.Drawing.Font("Times New Roman", 24F); + this.Title.ForeColor = System.Drawing.Color.Black; + this.Title.Name = "Title"; + // + // FieldCaption + // + this.FieldCaption.BackColor = System.Drawing.Color.White; + this.FieldCaption.BorderColor = System.Drawing.SystemColors.ControlText; + this.FieldCaption.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.FieldCaption.BorderWidth = 1F; + this.FieldCaption.Font = new System.Drawing.Font("Times New Roman", 10F, System.Drawing.FontStyle.Bold); + this.FieldCaption.ForeColor = System.Drawing.Color.Black; + this.FieldCaption.Name = "FieldCaption"; + // + // PageInfo + // + this.PageInfo.BackColor = System.Drawing.Color.White; + this.PageInfo.BorderColor = System.Drawing.SystemColors.ControlText; + this.PageInfo.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.PageInfo.BorderWidth = 1F; + this.PageInfo.Font = new System.Drawing.Font("Times New Roman", 8F); + this.PageInfo.ForeColor = System.Drawing.Color.Black; + this.PageInfo.Name = "PageInfo"; + // + // DataField + // + this.DataField.BackColor = System.Drawing.Color.White; + this.DataField.BorderColor = System.Drawing.SystemColors.ControlText; + this.DataField.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.DataField.BorderWidth = 1F; + this.DataField.Font = new System.Drawing.Font("Times New Roman", 8F); + this.DataField.ForeColor = System.Drawing.SystemColors.ControlText; + this.DataField.Name = "DataField"; + // + // fieldFLS + // + this.fieldFLS.DataMember = "FLSReportGroups.FLSReportDetails"; + this.fieldFLS.Expression = "[TotalFLM] / 60\r\n"; + this.fieldFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; + this.fieldFLS.Name = "fieldFLS"; + // + // fieldGroupFLS + // + this.fieldGroupFLS.DataMember = "FLSReportGroups"; + this.fieldGroupFLS.Expression = "[TotalFLM]/60"; + this.fieldGroupFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; + this.fieldGroupFLS.Name = "fieldGroupFLS"; + // + // topMarginBand1 + // + this.topMarginBand1.HeightF = 50F; + this.topMarginBand1.Name = "topMarginBand1"; + // + // bottomMarginBand1 + // + this.bottomMarginBand1.HeightF = 50F; + this.bottomMarginBand1.Name = "bottomMarginBand1"; + // + // KilometerauswertungsReport + // + this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail, + this.DetailReport, + this.ReportHeader, + this.pageFooterBand1, + this.topMarginBand1, + this.bottomMarginBand1}); + this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] { + this.fieldFLS, + this.fieldGroupFLS}); + this.ComponentStorage.AddRange(new System.ComponentModel.IComponent[] { + this.objectDataSource1}); + this.DataSource = this.objectDataSource1; + this.Margins = new System.Drawing.Printing.Margins(75, 75, 50, 50); + this.PageHeight = 1169; + this.PageWidth = 827; + this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; + this.StyleSheet.AddRange(new DevExpress.XtraReports.UI.XRControlStyle[] { + this.Title, + this.FieldCaption, + this.PageInfo, + this.DataField}); + this.Version = "17.1"; + ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.objectDataSource1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); + + } + + #endregion + + private DevExpress.XtraReports.UI.DetailBand Detail; + private DevExpress.XtraReports.UI.DetailBand Detail1; + private DevExpress.XtraReports.UI.DetailReportBand DetailReport; + private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader; + private DevExpress.XtraReports.UI.XRLabel xrLabel1; + private DevExpress.XtraReports.UI.PageFooterBand pageFooterBand1; + private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo2; + private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo1; + private DevExpress.XtraReports.UI.XRControlStyle Title; + private DevExpress.XtraReports.UI.XRControlStyle FieldCaption; + private DevExpress.XtraReports.UI.XRControlStyle PageInfo; + private DevExpress.XtraReports.UI.XRControlStyle DataField; + private DevExpress.XtraReports.UI.XRTable xrTable2; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow2; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell5; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell6; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell7; + private DevExpress.XtraReports.UI.DetailReportBand DetailReport1; + private DevExpress.XtraReports.UI.DetailBand Detail2; + private DevExpress.XtraReports.UI.XRTable xrTable4; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow4; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell3; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell4; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell9; + private DevExpress.XtraReports.UI.XRLabel xrLabel2; + private DevExpress.XtraReports.UI.XRLabel xrLabel13; + private DevExpress.XtraReports.UI.CalculatedField fieldFLS; + private DevExpress.XtraReports.UI.CalculatedField fieldGroupFLS; + private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1; + private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1; + private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1; + private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader2; + private DevExpress.DataAccess.ObjectBinding.ObjectDataSource objectDataSource1; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell2; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell1; + } +} diff --git a/ReportImp/SHKServiceSBD/KilometerauswertungsReport.resx b/ReportImp/SHKServiceSBD/KilometerauswertungsReport.resx new file mode 100644 index 000000000..2662eac07 --- /dev/null +++ b/ReportImp/SHKServiceSBD/KilometerauswertungsReport.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 + + + 17, 17 + + \ No newline at end of file diff --git a/ReportImp/SHKServiceSBD/Mitarbeiterarbeitszeitkonto.cs b/ReportImp/SHKServiceSBD/Mitarbeiterarbeitszeitkonto.cs index a7f4b9dc9..18ac548c8 100644 --- a/ReportImp/SHKServiceSBD/Mitarbeiterarbeitszeitkonto.cs +++ b/ReportImp/SHKServiceSBD/Mitarbeiterarbeitszeitkonto.cs @@ -73,6 +73,7 @@ namespace SHKServiceSBD ed.StundenSollMax -= dd.HoursSick; ed.UrlaubUndKrankheit -= dd.HoursSick; dd.HoursSick = 0; + } } diff --git a/ReportImp/SHKServiceSBD/SHKServiceSBD.csproj b/ReportImp/SHKServiceSBD/SHKServiceSBD.csproj index 5e8b53a61..c401b43b9 100644 --- a/ReportImp/SHKServiceSBD/SHKServiceSBD.csproj +++ b/ReportImp/SHKServiceSBD/SHKServiceSBD.csproj @@ -31,6 +31,7 @@ 4 + @@ -39,6 +40,7 @@ + @@ -65,6 +67,30 @@ Arbeitszeitkonto.cs + + Component + + + EmployeeKilometerauswertungsListReport.cs + + + Component + + + EmployeeKilometerauswertungsReport.cs + + + Component + + + KilometerauswertungsListReport.cs + + + Component + + + KilometerauswertungsReport.cs + Component @@ -143,6 +169,20 @@ Arbeitszeitkonto.cs Designer + + EmployeeKilometerauswertungsListReport.cs + Designer + + + EmployeeKilometerauswertungsReport.cs + + + KilometerauswertungsListReport.cs + Designer + + + KilometerauswertungsReport.cs + Mitarbeiterarbeitszeitkonto.cs diff --git a/ReportImp/UebergangshilfeUnnaEV/CustomMitarbeiterstundenkontoBerechnung.cs b/ReportImp/UebergangshilfeUnnaEV/CustomMitarbeiterstundenkontoBerechnung.cs index 485a4d6ad..dd7a2e8d8 100644 --- a/ReportImp/UebergangshilfeUnnaEV/CustomMitarbeiterstundenkontoBerechnung.cs +++ b/ReportImp/UebergangshilfeUnnaEV/CustomMitarbeiterstundenkontoBerechnung.cs @@ -17,8 +17,10 @@ namespace UebergangshilfeUnnaEV public override MitarbeiterstundenkontoRO.DayDetail CreateDayDetail(DateTime date, MitarbeiterstundenkontoRO.EmployeeDetail ed) { var dd = base.CreateDayDetail(date, ed); - dd.BreakMinutes2 = 15; + dd.MaxHoursUntilBreak = 6; dd.MaxHoursUntilBreak2 = 9; + dd.BreakMinutes = 30; + dd.BreakMinutes2 = 15; return dd; } diff --git a/ReportImp/VereinDuerenerChristenReports/CustomMitarbeiterstundenkontoBerechnung.cs b/ReportImp/VereinDuerenerChristenReports/CustomMitarbeiterstundenkontoBerechnung.cs index ba6d826e9..445fcd06f 100644 --- a/ReportImp/VereinDuerenerChristenReports/CustomMitarbeiterstundenkontoBerechnung.cs +++ b/ReportImp/VereinDuerenerChristenReports/CustomMitarbeiterstundenkontoBerechnung.cs @@ -16,9 +16,11 @@ namespace BeWo.VereinDuerenerChristenReports public override MitarbeiterstundenkontoRO.DayDetail CreateDayDetail(DateTime date, MitarbeiterstundenkontoRO.EmployeeDetail ed) { var dd = base.CreateDayDetail(date, ed); - dd.BreakMinutes2 = 15; + dd.MaxHoursUntilBreak = 6; dd.MaxHoursUntilBreak2 = 9; - + dd.BreakMinutes = 30; + dd.BreakMinutes2 = 15; + return dd; } diff --git a/ReportImp/Wegfinder/CustomMitarbeiterstundenkontoBerechnung.cs b/ReportImp/Wegfinder/CustomMitarbeiterstundenkontoBerechnung.cs index de2e1fbbc..e350ee8c1 100644 --- a/ReportImp/Wegfinder/CustomMitarbeiterstundenkontoBerechnung.cs +++ b/ReportImp/Wegfinder/CustomMitarbeiterstundenkontoBerechnung.cs @@ -17,8 +17,10 @@ namespace Wegfinder public override MitarbeiterstundenkontoRO.DayDetail CreateDayDetail(DateTime date, MitarbeiterstundenkontoRO.EmployeeDetail ed) { var dd = base.CreateDayDetail(date, ed); - dd.BreakMinutes2 = 15; + dd.MaxHoursUntilBreak = 6; dd.MaxHoursUntilBreak2 = 9; + dd.BreakMinutes = 30; + dd.BreakMinutes2 = 15; return dd; } diff --git a/ReportImp/Wegfinder/CustomMitarbeiterstundenkontoBerechnungTagesansicht.cs b/ReportImp/Wegfinder/CustomMitarbeiterstundenkontoBerechnungTagesansicht.cs index fe80c646e..983ec7153 100644 --- a/ReportImp/Wegfinder/CustomMitarbeiterstundenkontoBerechnungTagesansicht.cs +++ b/ReportImp/Wegfinder/CustomMitarbeiterstundenkontoBerechnungTagesansicht.cs @@ -20,10 +20,12 @@ namespace Wegfinder public override MitarbeiterstundenkontoRO.DayDetail CreateDayDetail(DateTime date, MitarbeiterstundenkontoRO.EmployeeDetail ed) { var dd = base.CreateDayDetail(date, ed); - dd.BreakMinutes2 = 15; - dd.MaxHoursUntilBreak2 = 9; + dd.MaxHoursUntilBreak = 6; + dd.MaxHoursUntilBreak2 = 9; + dd.BreakMinutes = 30; + dd.BreakMinutes2 = 15; - return dd; + return dd; } } } diff --git a/ReportImp/ahaEV/Properties/licenses.licx b/ReportImp/ahaEV/Properties/licenses.licx index e69de29bb..d59547a61 100644 --- a/ReportImp/ahaEV/Properties/licenses.licx +++ b/ReportImp/ahaEV/Properties/licenses.licx @@ -0,0 +1 @@ +DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/Service/Plugins/PluginLoader.cs b/Service/Plugins/PluginLoader.cs index cae906095..0407307b7 100644 --- a/Service/Plugins/PluginLoader.cs +++ b/Service/Plugins/PluginLoader.cs @@ -51,7 +51,7 @@ namespace BeWo.Service.Plugins //t = "4950382346"; // Holsinger //t = "5973016645"; // Verein Lebensgestaltung Hanau //t = "7375324044"; // Diakonie KK Kleve - //t = "1441747891"; // BeWo Mobil Köln + t = "1441747891"; // BeWo Mobil Köln //t = "5120047701"; // Trialog //t = "3629696651"; // Soziale Dienste Niederrhein (SDN) //t = "9893557471"; // Caritas Frankfurt @@ -167,7 +167,7 @@ namespace BeWo.Service.Plugins //t = "7803602698"; // Taubblindendienst //t = "5518600303"; // Wetterleuchten e.V. //t = "4096649015"; // AWO Dortmund - //t = "3614251071"; // Pusteblume + t = "3614251071"; // Pusteblume //t = "7755740484"; // Sawo //t = "8275654834"; // Twg Jonathan //t = "6586058528"; // Freundeskreis Suchtkrankenhilfe e.V. (FFS) @@ -391,8 +391,8 @@ namespace BeWo.Service.Plugins //t = "7653029063"; // SkF Leverkusen JuHi //t = "1453324901"; // Akkurat //t = "5000000000"; - //t = "3788859817"; //Zukunft Leben (Stephan Hekermann) - + //t = "3788859817"; // Zukunft Leben (Stephan Hekermann) + //t = "2663321234"; // Aachener Laienhelfer Initiative e.V. return t; #else if (MultitenancyOperationContextExt.Current != null)