diff --git a/.gitignore b/.gitignore index 97bc03a0e..5a83c9164 100644 --- a/.gitignore +++ b/.gitignore @@ -646,3 +646,4 @@ obj /ReportImp/demo_Sozio/SoziotherapieRechnung.resx /ReportImp/demo_Sozio/demo_Sozio.csproj /BeWo/DebugConfig.txt +/logs/mobilelog.txt diff --git a/BeWo/BeWoApp.xaml.cs b/BeWo/BeWoApp.xaml.cs index c30111b75..b17bc77e7 100644 --- a/BeWo/BeWoApp.xaml.cs +++ b/BeWo/BeWoApp.xaml.cs @@ -672,6 +672,8 @@ namespace BeWo if (condition_base && (condition1 || condition2)) { url = DebugConfig.ServerUrl; + + return new Uri(url); } //return new Uri("https://app5.bewoplaner.de/service"); diff --git a/BeWoAllReports.sln b/BeWoAllReports.sln index d143b6d91..53332bf75 100644 --- a/BeWoAllReports.sln +++ b/BeWoAllReports.sln @@ -898,6 +898,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BeWoAuxilioRitter", "Report EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PeterVomBrocke", "ReportImp\PeterVomBrocke\PeterVomBrocke.csproj", "{886B622D-2C89-494B-BD3A-48F1E3A95197}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ChristopherusHausMID", "ReportImp\ChristopherusHausMID\ChristopherusHausMID.csproj", "{12876363-2375-49AE-84E5-52CAB4359F4E}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|.NET = Debug|.NET @@ -11061,6 +11063,30 @@ Global {886B622D-2C89-494B-BD3A-48F1E3A95197}.Release|Mixed Platforms.Build.0 = Release|Any CPU {886B622D-2C89-494B-BD3A-48F1E3A95197}.Release|x86.ActiveCfg = Release|Any CPU {886B622D-2C89-494B-BD3A-48F1E3A95197}.Release|x86.Build.0 = Release|Any CPU + {12876363-2375-49AE-84E5-52CAB4359F4E}.Debug|.NET.ActiveCfg = Debug|Any CPU + {12876363-2375-49AE-84E5-52CAB4359F4E}.Debug|.NET.Build.0 = Debug|Any CPU + {12876363-2375-49AE-84E5-52CAB4359F4E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {12876363-2375-49AE-84E5-52CAB4359F4E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {12876363-2375-49AE-84E5-52CAB4359F4E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {12876363-2375-49AE-84E5-52CAB4359F4E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {12876363-2375-49AE-84E5-52CAB4359F4E}.Debug|x86.ActiveCfg = Debug|Any CPU + {12876363-2375-49AE-84E5-52CAB4359F4E}.Debug|x86.Build.0 = Debug|Any CPU + {12876363-2375-49AE-84E5-52CAB4359F4E}.DebugRemote|.NET.ActiveCfg = Debug|Any CPU + {12876363-2375-49AE-84E5-52CAB4359F4E}.DebugRemote|.NET.Build.0 = Debug|Any CPU + {12876363-2375-49AE-84E5-52CAB4359F4E}.DebugRemote|Any CPU.ActiveCfg = Debug|Any CPU + {12876363-2375-49AE-84E5-52CAB4359F4E}.DebugRemote|Any CPU.Build.0 = Debug|Any CPU + {12876363-2375-49AE-84E5-52CAB4359F4E}.DebugRemote|Mixed Platforms.ActiveCfg = Debug|Any CPU + {12876363-2375-49AE-84E5-52CAB4359F4E}.DebugRemote|Mixed Platforms.Build.0 = Debug|Any CPU + {12876363-2375-49AE-84E5-52CAB4359F4E}.DebugRemote|x86.ActiveCfg = Debug|Any CPU + {12876363-2375-49AE-84E5-52CAB4359F4E}.DebugRemote|x86.Build.0 = Debug|Any CPU + {12876363-2375-49AE-84E5-52CAB4359F4E}.Release|.NET.ActiveCfg = Release|Any CPU + {12876363-2375-49AE-84E5-52CAB4359F4E}.Release|.NET.Build.0 = Release|Any CPU + {12876363-2375-49AE-84E5-52CAB4359F4E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {12876363-2375-49AE-84E5-52CAB4359F4E}.Release|Any CPU.Build.0 = Release|Any CPU + {12876363-2375-49AE-84E5-52CAB4359F4E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {12876363-2375-49AE-84E5-52CAB4359F4E}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {12876363-2375-49AE-84E5-52CAB4359F4E}.Release|x86.ActiveCfg = Release|Any CPU + {12876363-2375-49AE-84E5-52CAB4359F4E}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -11508,6 +11534,7 @@ Global {0AB07D34-D1B6-441F-8F1F-E5B310DA666E} = {D8A691C5-146D-4613-86CC-438F02FE9106} {D08B6F46-EB00-4A05-B1AB-A00E189C2C66} = {D8A691C5-146D-4613-86CC-438F02FE9106} {886B622D-2C89-494B-BD3A-48F1E3A95197} = {D8A691C5-146D-4613-86CC-438F02FE9106} + {12876363-2375-49AE-84E5-52CAB4359F4E} = {D8A691C5-146D-4613-86CC-438F02FE9106} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {FBE985BB-9F0F-4DBB-8F94-ABC37A803FF9} diff --git a/Data/Entities/InvoiceItem.cs b/Data/Entities/InvoiceItem.cs index 62adb3832..eee763828 100644 --- a/Data/Entities/InvoiceItem.cs +++ b/Data/Entities/InvoiceItem.cs @@ -265,5 +265,21 @@ namespace BeWo.Data.Entities public virtual AccountingIntervalType? ApprovalUnit { get; set; } + public virtual String CustomString1 { get; set; } + public virtual String CustomString2 { get; set; } + public virtual String CustomString3 { get; set; } + public virtual String CustomString4 { get; set; } + public virtual String CustomString5 { get; set; } + public virtual decimal? CustomNumber1 { get; set; } + public virtual decimal? CustomNumber2 { get; set; } + public virtual decimal? CustomNumber3 { get; set; } + public virtual decimal? CustomNumber4 { get; set; } + public virtual decimal? CustomNumber5 { get; set; } + public virtual DateTime? CustomDate1 { get; set; } + public virtual DateTime? CustomDate2 { get; set; } + public virtual DateTime? CustomDate3 { get; set; } + public virtual DateTime? CustomDate4 { get; set; } + public virtual DateTime? CustomDate5 { get; set; } + } } \ No newline at end of file diff --git a/Data/Mappings/InvoiceItem.hbm.xml b/Data/Mappings/InvoiceItem.hbm.xml index 93d6ebe6e..8fd6817a6 100644 --- a/Data/Mappings/InvoiceItem.hbm.xml +++ b/Data/Mappings/InvoiceItem.hbm.xml @@ -27,6 +27,21 @@ + + + + + + + + + + + + + + + diff --git a/Model/Changes_2025_01_28 InvoiceItem Custom Fields.txt b/Model/Changes_2025_01_28 InvoiceItem Custom Fields.txt new file mode 100644 index 000000000..b7a330930 --- /dev/null +++ b/Model/Changes_2025_01_28 InvoiceItem Custom Fields.txt @@ -0,0 +1,17 @@ +ALTER TABLE `InvoiceItem` +ADD COLUMN `CustomString1` VARCHAR(1024) NULL DEFAULT NULL, +ADD COLUMN `CustomString2` VARCHAR(1024) NULL DEFAULT NULL, +ADD COLUMN `CustomString3` VARCHAR(1024) NULL DEFAULT NULL, +ADD COLUMN `CustomString4` VARCHAR(1024) NULL DEFAULT NULL, +ADD COLUMN `CustomString5` VARCHAR(1024) NULL DEFAULT NULL, +ADD COLUMN `CustomNumber1` DECIMAL(18,10) NULL DEFAULT NULL, +ADD COLUMN `CustomNumber2` DECIMAL(18,10) NULL DEFAULT NULL, +ADD COLUMN `CustomNumber3` DECIMAL(18,10) NULL DEFAULT NULL, +ADD COLUMN `CustomNumber4` DECIMAL(18,10) NULL DEFAULT NULL, +ADD COLUMN `CustomNumber5` DECIMAL(18,10) NULL DEFAULT NULL, +ADD COLUMN `CustomDate1` datetime NULL DEFAULT NULL, +ADD COLUMN `CustomDate2` datetime NULL DEFAULT NULL, +ADD COLUMN `CustomDate3` datetime NULL DEFAULT NULL, +ADD COLUMN `CustomDate4` datetime NULL DEFAULT NULL, +ADD COLUMN `CustomDate5` datetime NULL DEFAULT NULL; + diff --git a/Report/ReportObjects/SbdStundenaufstellungRO.cs b/Report/ReportObjects/SbdStundenaufstellungRO.cs index fb9f5489c..1a996a2d4 100644 --- a/Report/ReportObjects/SbdStundenaufstellungRO.cs +++ b/Report/ReportObjects/SbdStundenaufstellungRO.cs @@ -57,7 +57,9 @@ namespace BeWo.Report.ReportObjects public DateTime StartDate { get; set; } public DateTime EndDate { get; set; } - + + public long EmployeeOid { get; set; } + public string EmployeeName { get; set; } public string EmployeePersonalNumber { get; set; } @@ -677,6 +679,13 @@ namespace BeWo.Report.ReportObjects if (schule != null) { lResult.Schule = MapperFactory.CompactOrganisationDC_Organisation.MapToNewDC(schule); + if (schule.Address != null) + { + lResult.Schule.Street = schule.Address.Street; + lResult.Schule.PostalCode = schule.Address.PostalCode; + lResult.Schule.Town = schule.Address.Town; + } + } foreach (var at in customer.AbsenceTimes) @@ -693,6 +702,7 @@ namespace BeWo.Report.ReportObjects } if (employee != null) { + lResult.EmployeeOid = employee.Oid.Value; lResult.EmployeePersonalNumber = employee.PersonnelNumber; lResult.EmployeeName = employee.Person.FirstName + " " + employee.Person.LastName; } @@ -831,6 +841,11 @@ namespace BeWo.Report.ReportObjects { detail.StundenplanUhrzeiten2 += CreateTimeRangeString(ae.UhrzeitVon, ae.UhrzeitBis); } + if (detail.ArbeitszeitEintraege == null) + { + detail.ArbeitszeitEintraege = new List(); + } + detail.ArbeitszeitEintraege.Add(MapperFactory.ArbeitszeitEintragDC_ArbeitszeitEintrag.MapToNewDC(ae)); } } } @@ -960,6 +975,7 @@ namespace BeWo.Report.ReportObjects public string StundenplanUhrzeiten2 { get; set; } public string IstUhrzeiten1 { get; set; } public string IstUhrzeiten2 { get; set; } + public IList ArbeitszeitEintraege { get; set; } } diff --git a/ReportImp/AkggMid/LeistungsnachweisHelper.cs b/ReportImp/AkggMid/LeistungsnachweisHelper.cs index a26aa9142..c686f93ac 100644 --- a/ReportImp/AkggMid/LeistungsnachweisHelper.cs +++ b/ReportImp/AkggMid/LeistungsnachweisHelper.cs @@ -185,7 +185,7 @@ namespace AkggMid if (abrAbwTagDict.ContainsKey(newSr.StartDate)) { var info = abrAbwTagDict[newSr.StartDate]; - newSr.Minutes = (double)info.MinutenLautStundenplan; + newSr.Minutes = (double)info.MinutenAbrechenbar; //newSr.Minutes = BerechneMinutenProTag(BerechneStundenProWoche(pRO, newSr.StartDate)); newSr.Notice = info.AbwesenheitsNotiz; newSr.Notice5 = "x"; @@ -265,17 +265,51 @@ namespace AkggMid { if (info.PruefenObDurch2Teilen) { - + if (info.Datum.Month == 11 && info.Datum.Day == 26) + { + int test = 0; + } + if (info.Datum.Month == 11 && info.Datum.Day == 6) + { + int test = 0; + } if (tandemInfos.ContainsKey(info.Datum)) { var tandemInfo = tandemInfos[info.Datum]; if (tandemInfo.IstAbrechenbar) { - info.MinutenLautStundenplan /= 2; + info.MinutenAbrechenbar /= 2; } } + else + { + info.MinutenAbrechenbar /= 2; + } } + if (info.PruefenObTandemBetreutWurde) + { + //bool wurdeBetreut = false; + //foreach (var sr in _tandemRO.Services) + //{ + // if (sr.StartDate.Date == info.Datum.Date) + // { + + // wurdeBetreut = true; + // } + //} + + ////Der andere Klient wurde betreut, daher darf hier nichts abgerechnet werden + //if (wurdeBetreut) + //{ + // info.MinutenAbrechenbar = 0; + //} + //else + //{ + // info.MinutenAbrechenbar = info.MaxMinutenLautStundenplan / 2; + //} + + } } } @@ -500,17 +534,17 @@ where scap2e.EmployeeOid = {0} and scap.Start <= '{1:yyyy-MM-dd}' and scap.EndDa return fehlendeRecords.OrderBy(r => r.StartDate); } - public bool IstAbwesend(List absenceTimes, DateTime date) + public AbsenceTime GetAbwesenheit(List absenceTimes, DateTime date) { foreach (var at in absenceTimes) { if (date >= at.Start && (!at.End.HasValue || date <= at.End)) { - return true; + return at; } } - return false; + return null; } //public Dictionary GetAllAbwesenheitsInfos() @@ -618,29 +652,110 @@ where scap2e.EmployeeOid = {0} and scap.Start <= '{1:yyyy-MM-dd}' and scap.EndDa // || (end > new DateTime(2023, 06, 30) && end <= new DateTime(2023, 07, 21) && gesamtAnzahl < maxAnzahlIntern + 1))) while (dtIterator <= end) { + if (dtIterator.Day == 20 && dtIterator.Month == 12) + { + int test = 0; + } + if (dtIterator.Month == 11 && dtIterator.Day == 26) + { + int test = 0; + } + if (dtIterator.Month == 11 && dtIterator.Day == 6) + { + int test = 0; + } //if (dtIterator.DayOfWeek != DayOfWeek.Saturday && dtIterator.DayOfWeek != DayOfWeek.Sunday && !serviceRecordDates.ContainsKey(String.Format("{0:dd.MM.yyyy}", dtIterator))) if (dtIterator.DayOfWeek != DayOfWeek.Saturday && dtIterator.DayOfWeek != DayOfWeek.Sunday && !vs.IstFeiertag(dtIterator)) { bool istTandem = false; bool istAbrechenbar = true; bool mussDurch2Teilen = false; - + bool pruefenObTandemBetreutWurde = false; if (tandemRo != null) { - //Bei Doppelbetreuung darf die Abwesenheit bei einem Kind nicht abgerechnet werden, außer beide Kinder sind krank - istTandem = true; - istAbrechenbar = false; + // Details zu den Abwesenheitskategorien bei Doppelbetreuung: + + //Wenn beide Schüler anwesend sind, werden die Betreuungszeiten geteilt. + //Wenn nur ein Schüler anwesend ist, erhält dieser die vollen Betreuungszeiten. + //Wenn beide Schüler abwesend sind, hängt die Abrechnung von den gewählten Abwesenheitskategorien und deren Bedingungen ab. - var aw = IstAbwesend(tandemAbsenceTimes, dtIterator); - if (aw) //info != null) + + //"JugA krank (Tag 1-6 abrechenbar)" und / oder "JugA sonst. Grund (Tag 1-6 abrechenbar)": + // Wenn beide Schüler diese Kategorie haben und noch Tage verfügbar sind, werden die hinterlegten Betreuungszeiten geteilt. + // Wenn einer der Schüler keine Tage mehr verfügbar hat, übernimmt der andere Schüler die vollen hinterlegten Betreuungszeiten. + + //"SozA krank (Tag 1-6 abrechenbar)" und / oder "SozA sonst. Grund (Tag 1-6 abrechenbar)": + // Die Regeln sind identisch wie bei der Kategorie "JugA". + + //Mischungen von Jugendamt und Sozialamt(z.B.ein Schüler mit "JugA krank" und der andere mit "SozA krank"): + // Es gelten dieselben Regeln wie oben beschrieben. + + //"SozA unter 24h krank (abrechenbar)" und / oder "SozA unter 24h sonst. Grund (abrechenbar)": + // Wenn beide Schüler diese Kategorien haben, werden die hinterlegten Betreuungszeiten geteilt. + // Wenn ein Schüler "SozA unter 24h krank" oder "SozA unter 24h sonst. Grund" und der andere Schüler eine andere Kategorie hat, übernimmt der Schüler mit "SozA unter 24h krank" oder "SozA unter 24h sonst. Grund" die vollen Betreuungszeiten. + + //"Abwesenheit nicht abrechenbar (SozA+JugA)": + // In diesem Fall stellt sich die Frage, ob es für den anderen Schüler möglich ist, die vollen hinterlegten Betreuungszeiten abzurechnen. + + + istTandem = true; + mussDurch2Teilen = true; + istAbrechenbar = false; + + + var at2 = GetAbwesenheit(tandemAbsenceTimes, dtIterator); + if (at2 != null) //info != null) { + if (at.AbsenceReason.Description.Contains("abrechenbar") && !at.AbsenceReason.Description.Contains("nicht abrechenbar") && at2.AbsenceReason.Description.Contains("nicht abrechenbar")) + { + //Klient hat eine abrechenbare Abwesenheit und zweiter Klient eine nicht abrechenbare Abwesenheit + istAbrechenbar = true; + mussDurch2Teilen = false; + } + else if (at.AbsenceReason.Description.Contains("nicht abrechenbar") && at2.AbsenceReason.Description.Contains("abrechenbar") && !at2.AbsenceReason.Description.Contains("nicht abrechenbar")) + { //Klient hat eine nicht brechenbare Abwesenheit aber zweiter Klient hat eine abrechenbare Abwesenheit + istAbrechenbar = false; + mussDurch2Teilen = false; + } + else if (at.AbsenceReason.Description.Contains("abrechenbar") && at2.AbsenceReason.Description.Contains("abrechenbar") && !at.AbsenceReason.Description.Contains("nicht abrechenbar") && !at2.AbsenceReason.Description.Contains("nicht abrechenbar")) + { + //Beide Klienten haben eine abrechenbare Abwesenheit + //Beide abwesend, also Betreuungszeit teilen + mussDurch2Teilen = true; + istAbrechenbar = true; + } //if (!info.IstAbrechenbar) //{ //mussDurch2Teilen = false; //} - mussDurch2Teilen = true; + + } + else + { + if (at.AbsenceReason.Description.Contains("abrechenbar") && !at.AbsenceReason.Description.Contains("nicht abrechenbar")) + { + pruefenObTandemBetreutWurde = true; + bool wurdeBetreut = false; + foreach (var sr in tandemRo.Services) + { + if (sr.StartDate.Date == dtIterator.Date) + { - istAbrechenbar = true; + wurdeBetreut = true; + } + } + + //Der andere Klient wurde betreut, daher darf hier nichts abgerechnet werden + if (wurdeBetreut) + { + istAbrechenbar = false; + } + else + { + istAbrechenbar = true; + mussDurch2Teilen = true; + } + } } } @@ -656,14 +771,15 @@ where scap2e.EmployeeOid = {0} and scap.Start <= '{1:yyyy-MM-dd}' and scap.EndDa info.MaxAbrechenbareTage = maxAnzahl; info.IstAbrechenbar = false; + info.PruefenObTandemBetreutWurde = pruefenObTandemBetreutWurde; + info.MaxMinutenLautStundenplan = stunden * 60; if (istAbrechenbar && gesamtAnzahl < maxAnzahlIntern) { info.IstAbrechenbar = true; - info.MinutenLautStundenplan = stunden * 60; + info.MinutenAbrechenbar = info.MaxMinutenLautStundenplan; if (mussDurch2Teilen) { info.PruefenObDurch2Teilen = true; - //info.MinutenLautStundenplan /= 2; } if (maxAnzahlIntern < Int32.MaxValue) { @@ -841,7 +957,8 @@ where scap2e.EmployeeOid = {0} and scap.Start <= '{1:yyyy-MM-dd}' and scap.EndDa { public AbsenceTimeDC AbsenceTime { get; set; } - public decimal MinutenLautStundenplan { get; set; } + public decimal MinutenAbrechenbar { get; set; } + public decimal MaxMinutenLautStundenplan { get; set; } public String AbwesenheitsNotiz { get; set; } public int NummerAbrechenbarerTag { get; set; } @@ -849,5 +966,7 @@ where scap2e.EmployeeOid = {0} and scap.Start <= '{1:yyyy-MM-dd}' and scap.EndDa public bool IstAbrechenbar { get; set; } public DateTime Datum { get; set; } public bool PruefenObDurch2Teilen { get; internal set; } + public bool PruefenObTandemBetreutWurde { get; internal set; } + } } diff --git a/ReportImp/BfpDus/Export/CustomCsvExporter.cs b/ReportImp/BfpDus/Export/CustomCsvExporter.cs index 653f686fa..8dafef046 100644 --- a/ReportImp/BfpDus/Export/CustomCsvExporter.cs +++ b/ReportImp/BfpDus/Export/CustomCsvExporter.cs @@ -321,7 +321,8 @@ Bezeichnung Saldenliste newEntry.Saldo = item.AmountPaid - item.BillableAmountInReportTimeSpan; - if (newEntry.Saldo != 0 && item.Costbearer2Supportconcept.StartDate >= ro.ReportStartDate) + //if (newEntry.Saldo != 0 && item.Costbearer2Supportconcept.StartDate >= ro.ReportStartDate) + if (item.Costbearer2Supportconcept.StartDate >= ro.ReportStartDate) { liste.Add(newEntry); } diff --git a/ReportImp/Biotop/CustomReportCreator.cs b/ReportImp/Biotop/CustomReportCreator.cs index 4dc4aadd0..b236376e1 100644 --- a/ReportImp/Biotop/CustomReportCreator.cs +++ b/ReportImp/Biotop/CustomReportCreator.cs @@ -5,6 +5,7 @@ using System.Text; using BeWo.Data.Access; using BeWo.Data.Entities; using BeWo.Report; +using BeWo.Report.DefaultReports; using BeWo.Report.ReportObjects; using BeWo.Service.DCEntityMapper; using BS.Shared.Core; @@ -16,6 +17,77 @@ namespace Biotop { public class CustomReportCreator : DefaultReportCreator { + public override XtraReport CreateQueryReport(long queryOid, string queryReportId) + { + if (queryOid == 500) + { + return CreateLwlPruefliste(CreateQueryRO(queryOid, queryReportId)); + + } + return base.CreateQueryReport(queryOid, queryReportId); + } + + private LwlPruefliste CreateLwlPruefliste(QueryRO queryRo) + { + var liste = new LwlPruefliste(); + + if (queryRo.Rows.Count > 0) + { + DateTime start = DateTime.MaxValue; + DateTime end = DateTime.MinValue; + + if (queryRo.Rows[0].Field1 != null) + { + DateTime.TryParse(queryRo.Rows[0].Field1.ToString(), out start); + } + if (queryRo.Rows[0].Field2 != null) + { + DateTime.TryParse(queryRo.Rows[0].Field2.ToString(), out end); + } + long? customerOid = null; + if (queryRo.Rows[0].Field3.ToString() == "0") + { + var masterReport = new LwlPruefliste(); + //masterReport.CreateDocument(); + + var customerList = DAOFactory.GenericDAO.GetAllActive(); + var customerListOrd = customerList.OrderBy(c => c.Person.LastNameFirstName).ToList(); + foreach (var c in customerListOrd) + { + var ro = LwlPrueflisteRO.Create(start, end, "9009969", c.Oid, "Landschaftsverband Westfalen-Lippe"); + if (ro.ServiceRecords != null && ro.ServiceRecords.Count > 0) + { + try + { + liste = new LwlPruefliste(); + liste.SetReportDataSource(ro); + liste.CreateDocument(); + masterReport.Pages.AddRange(liste.Pages); + } + catch + { + // ignore - z.B. kein Hilfeplan + } + } + } + return (LwlPruefliste)masterReport; + } + + if (queryRo.Rows[0].Field3 != null) + { + if (Int64.TryParse(queryRo.Rows[0].Field3.ToString(), out var oidOut)) + { + customerOid = oidOut; + } + var ro = LwlPrueflisteRO.Create(start, end, "9009969", customerOid, "Landschaftsverband Westfalen-Lippe"); + liste.SetReportDataSource(ro); + return liste; + } + } + + return liste; + } + public override XtraReport CreateSettlementReport(string dcId, long? invoiceBaseOid) { long result; @@ -40,5 +112,6 @@ namespace Biotop return base.CreateSettlementReport(dcId, invoiceBaseOid, false); } + } } diff --git a/ReportImp/ChristopherusHausMID/CHMitarbeiterstundenkontoBerechnung.cs b/ReportImp/ChristopherusHausMID/CHMitarbeiterstundenkontoBerechnung.cs new file mode 100644 index 000000000..426f711ff --- /dev/null +++ b/ReportImp/ChristopherusHausMID/CHMitarbeiterstundenkontoBerechnung.cs @@ -0,0 +1,33 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.Linq; +using BeWo.Data.Entities; +using BeWo.Report.ReportObjects; + + +namespace ChristopherusHausMID +{ + public class CHMitarbeiterstundenkontoBerechnung : MitarbeiterstundenkontoBerechnung + { + public override bool ShouldCreateDayDetails() + { + return true; + } + + public override MitarbeiterstundenkontoRO.DayDetail CreateDayDetail(DateTime date, MitarbeiterstundenkontoRO.EmployeeDetail ed) + { + var dd = base.CreateDayDetail(date, ed); + + dd.MaxHoursUntilBreak = null; + dd.MaxHoursUntilBreak2 = null; + dd.BreakMinutes = null; + dd.BreakMinutes2 = null; + + dd.NightStart = 22; + dd.NightEnd = 6; + + return dd; + } + } +} diff --git a/ReportImp/ChristopherusHausMID/ChristopherusHausMID.csproj b/ReportImp/ChristopherusHausMID/ChristopherusHausMID.csproj index 191e6a9df..c5bc76c6e 100644 --- a/ReportImp/ChristopherusHausMID/ChristopherusHausMID.csproj +++ b/ReportImp/ChristopherusHausMID/ChristopherusHausMID.csproj @@ -4,7 +4,7 @@ Debug AnyCPU - {C1FED668-ADB9-47E0-B589-1389618E1B6E} + {12876363-2375-49AE-84E5-52CAB4359F4E} Library Properties ChristopherusHausMID @@ -57,18 +57,32 @@ + + + + + + + Component + + + Leistungsnachweis.cs + True True Resources.resx - + Component - - RechnungSchuleBochum.cs + + Rechnung.cs + + + @@ -89,15 +103,19 @@ + + Leistungsnachweis.cs + ResXFileCodeGenerator Resources.Designer.cs - - RechnungSchuleBochum.cs + + Rechnung.cs Designer + \ No newline at end of file diff --git a/ReportImp/ChristopherusHausMID/CustomReportCreator.cs b/ReportImp/ChristopherusHausMID/CustomReportCreator.cs new file mode 100644 index 000000000..e0a5529f9 --- /dev/null +++ b/ReportImp/ChristopherusHausMID/CustomReportCreator.cs @@ -0,0 +1,23 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using BeWo.Data.Access; +using BeWo.Data.Entities; +using BeWo.Report; +using BeWo.Report.DefaultReports; +using BeWo.Report.ReportObjects; +using BeWo.Service.DCEntityMapper; +using DevExpress.XtraReports.UI; + +namespace ChristopherusHausMID.Reporting +{ + public class CustomReportCreator : DefaultReportCreator + { + public override XtraReport CreateSbdLeistungsnachweisForSingleCustomerReport(long customerOid, int month, int year, long orgaOid, long empOid, long serviceCategoryOid, int startDay, int endDay, bool checkServiceRecords, string bundesland) + { + return CreateReportForStundenaufstellungROs(SbdStundenaufstellungRO.Create(customerOid, month, year, orgaOid, empOid, serviceCategoryOid, startDay, endDay, true, "nrw", false)); + + } + } +} diff --git a/ReportImp/ChristopherusHausMID/Invoicing/CustomInvoiceCreation.cs b/ReportImp/ChristopherusHausMID/Invoicing/CustomInvoiceCreation.cs new file mode 100644 index 000000000..e7301a6b8 --- /dev/null +++ b/ReportImp/ChristopherusHausMID/Invoicing/CustomInvoiceCreation.cs @@ -0,0 +1,122 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using BeWo.Data.Access; +using BeWo.Data.Entities; +using BeWo.Report.ReportObjects; +using BeWo.Service.DCEntityMapper; +using BeWo.Service.Invoicing; +using BS.Shared; +using BS.Shared.Core; +using BS.Shared.DataContracts; +using BS.Shared.DataContracts.Compact; +using BS.Shared.Extensions; +using BS.Shared.Services; +using Service.Invoicing; + +namespace ChristopherusHausMID.Invoicing +{ + public class CustomInvoiceCreation : InvoiceCreation + { + //public override void SetInvoiceId(ServiceInvoice invoice) + //{ + // //invoice.InvoiceBase.InvoiceId = "SBD"; + // //invoice.InvoiceBase.InvoiceTypeText = ""; + //} + + public override List GenerateServiceInvoices(long costBearerOid, + DateTimeSpan invoicePeriod, + Dictionary> supportConcepts2ServiceRecords, bool splitInvoices) + { + var costBearer = DAOFactory.GenericDAO.LoadByID(costBearerOid); + var invoiceList = new List(); + + var invoiceCounter = 0; + ServiceInvoice invoice; + + + foreach (var iSupportConcept2ServiceRecords in supportConcepts2ServiceRecords) + { + invoice = CreateSingleInvoice(invoiceCounter, costBearer, invoicePeriod, iSupportConcept2ServiceRecords.Key, iSupportConcept2ServiceRecords.Value); + if (invoice != null) + { + + invoiceList.Add(invoice); + invoiceCounter++; + + } + } + + var result = invoiceList.Select(item => MapperFactory.ServiceInvoiceDC_ServiceInvoice.MapToNewDC(item)).ToList(); + return result.Count > 1 ? result.OrderBy(i => i.InvoiceBase.CustomerLastName).ToList() : result; + } + + public override IList CreateInvoiceItems(List serviceRecordsInPeriod, DateTimeSpan invoicePeriod, SupportConceptApprovalPeriod scap, Calculations calc) + { + var items = base.CreateInvoiceItems(serviceRecordsInPeriod, invoicePeriod, scap, calc); + + var anzahlAbwesenheitsTage = GetAbwesenheitsTage(scap.CostBearer2SupportConcept.SupportConcept.Customer, invoicePeriod); + + var berechnePoolItems = BerechnePoolItems(invoicePeriod, scap); + + foreach (var item in items) + { + item.CustomNumber1 = anzahlAbwesenheitsTage; + } + return items; + } + + private IList BerechnePoolItems(DateTimeSpan invoicePeriod, SupportConceptApprovalPeriod scap) + { + var items = new List(); + + var mainCustomer = scap.CostBearer2SupportConcept.SupportConcept.Customer; + //Suche Hauptbetreuung + Employee hauptbetreuung = mainCustomer.Employee2CustomerList.FirstOrDefault(e2c => e2c.IsActive == ActivationTypeId.Active && + (!e2c.StartDate.HasValue || e2c.StartDate.Value.Date <= invoicePeriod.EndDate) && (!e2c.EndDate.HasValue || e2c.EndDate.Value.Date >= invoicePeriod.StartDate) && + e2c.ValueList.Any(b => b.Entry.Type.Equals(ValueListEntryType.StaffRoleType) && b.Entry.Value.ToLower().Contains("hauptbetreu")))?.Employee; + + if (hauptbetreuung != null) + { + var allCustomer = hauptbetreuung.Employee2CustomerList.Select(e2c => e2c.Customer).ToList(); + //Wenn mehrere Kinder betreut werden, dann ändert sich der pool Faktor + if (allCustomer.Count > 1) + { + var ii = new InvoiceItem(); + + + foreach (var c in allCustomer) + { + if (c.Oid != mainCustomer.Oid) + { + + } + } + } + } + + return items; + } + + public override InvoiceItem CreateInvoiceItem(ServiceRecordDC iServiceRecord, SupportConceptApprovalPeriod scap, Calculations calc) + { + return base.CreateInvoiceItem(iServiceRecord, scap, calc); + } + + private decimal GetAbwesenheitsTage(Customer customer, DateTimeSpan invoicePeriod) + { + int tage = 0; + + foreach (var at in customer.AbsenceTimes) + { + if ((!at.Start.HasValue || at.Start.Value.Date <= invoicePeriod.EndDate) && (!at.End.HasValue || at.End.Value.Date >= invoicePeriod.StartDate)) + { + tage++; + } + } + + return tage; + } + + } +} diff --git a/ReportImp/ChristopherusHausMID/Invoicing/CustomInvoiceFactory.cs b/ReportImp/ChristopherusHausMID/Invoicing/CustomInvoiceFactory.cs new file mode 100644 index 000000000..26d279094 --- /dev/null +++ b/ReportImp/ChristopherusHausMID/Invoicing/CustomInvoiceFactory.cs @@ -0,0 +1,31 @@ +using System; +using System.Collections.Generic; +using BeWo.Data.Access; +using BeWo.Data.Entities; +using BeWo.Service.Invoicing; +using BS.Shared.DataContracts; +using BS.Shared.DataContracts.Compact; + +namespace ChristopherusHausMID.Invoicing +{ + public class CustomInvoiceFactory : InvoiceFactory + { + public override InvoiceCreation CreateInvoiceCreator(string specificId, string tenant, Dictionary> supportConcepts2ServiceRecords) + { + return new CustomInvoiceCreation(); + + + } + + // private InvoiceCreation GetInvoiceCreatorForCategory(String catName) + // { + // if (!String.IsNullOrEmpty(catName)) + // { + // String cat = catName.ToLower().Trim(); + // if (cat.IndexOf("assistenz") >= 0) + // return new CustomInvoiceCreation(); + // } + // return null; + // } + } +} diff --git a/ReportImp/ChristopherusHausMID/Invoicing/PoolHelper.cs b/ReportImp/ChristopherusHausMID/Invoicing/PoolHelper.cs new file mode 100644 index 000000000..9c302043a --- /dev/null +++ b/ReportImp/ChristopherusHausMID/Invoicing/PoolHelper.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ChristopherusHausMID.Invoicing +{ + public class PoolHelper + { + } +} diff --git a/ReportImp/ChristopherusHausMID/Leistungsnachweis.cs b/ReportImp/ChristopherusHausMID/Leistungsnachweis.cs new file mode 100644 index 000000000..905b4a630 --- /dev/null +++ b/ReportImp/ChristopherusHausMID/Leistungsnachweis.cs @@ -0,0 +1,118 @@ +using System; +using System.Collections.Generic; +using BeWo.Report.ReportObjects; +using BeWo.Report; +using DevExpress.XtraReports.UI; +using System.Data; +using BS.Shared.Core; +using BeWo.Data.Access; +using BeWo.Data.Entities; +using System.Linq; + +namespace ChristopherusHausMID +{ + public partial class Leistungsnachweis : DevExpress.XtraReports.UI.XtraReport, IBeWoReport + { + public Leistungsnachweis() + { + InitializeComponent(); + + } + + public void SetReportDataSource(SbdStundenaufstellungRO pRO) + { + cellDatum.Text = String.Format("{0:dd.MM.yyyy}", DateTime.Now); + decimal poolFaktor = 1; // Faktor bei 1:1 Betreuung + + String klienten = ""; + String klassen = ""; + String bewilligungen = ""; + + if (pRO.EmployeeOid > 0 && pRO.CustomerOid > 0) + { + + + var mainCustomer = DAOFactory.GenericDAO.LoadByID(pRO.CustomerOid); + var emp = DAOFactory.GenericDAO.LoadByID(pRO.EmployeeOid); + + klienten = mainCustomer.Person.FirstNameLastName; + klassen = mainCustomer.Childs; //CB: Ich habe das Feld "Kinder" bei denen in "Klasse" umbenannt + if (pRO.ApprovedPerWeek == 0) + { + pRO.ApprovedPerWeek = GetAktuelleBewilligung(mainCustomer, pRO.StartDate); + } + bewilligungen = String.Format("{0:0.00}", pRO.ApprovedPerWeek); + + var allCustomer = emp.Employee2CustomerList.Select(e2c => e2c.Customer).ToList(); + //Wenn mehrere Kinder betreut werden, dann ändert sich der pool Faktor und die Kinder müssen mit aufgelistet werden + if (allCustomer.Count > 1) + { + poolFaktor = (10 + allCustomer.Count) / 10m; //bei zwei Kindern Faktor 1,2, bei drei Kindern 1,3 etc. + + foreach (var c in allCustomer) + { + //Alle betreuten Kinder, für den der Beleg nicht gedruckt wurde, müssen mit Namen aufgeführt werden. + if (c.Oid != pRO.CustomerOid) + { + klienten += "\n"; + klienten += c.Person.FirstNameLastName; + + klassen += "\n"; + klassen += c.Childs; + + decimal bewilligt = GetAktuelleBewilligung(c, pRO.StartDate); + bewilligungen += "\n"; + bewilligungen += String.Format("{0:0.00}", bewilligt); + } + } + } + } + + cellKinder.Text = klienten; + cellKlasse.Text = klassen; + cellBewilligung.Text = bewilligungen; + + foreach (var item in pRO.Services) + { + if (item.ArbeitszeitEintraege != null && item.ArbeitszeitEintraege.Count > 0) + { + item.StundenplanUhrzeiten1 = String.Format(item.ArbeitszeitEintraege[0].UhrzeitVon); + item.StundenplanUhrzeiten2 = String.Format(item.ArbeitszeitEintraege[item.ArbeitszeitEintraege.Count - 1].UhrzeitBis); + } + if (item.ServiceRecordOid > 0) + { + item.IstUhrzeiten1 = String.Format("{0:HH:mm}", item.StartDate); + item.IstUhrzeiten2 = String.Format("{0:HH:mm}", item.EndDate); + } + if (item.Minutes > 0) + { + item.Notice5 = String.Format("{0:0.0}", poolFaktor); + } + + } + this.bindingSource1.DataSource = pRO; + } + + private decimal GetAktuelleBewilligung(Customer c, DateTime datum) + { + var scList = c.SupportConcepts; + + foreach (var sc in scList) + { + foreach (var c2s in sc.CostBearer2SupportConceptList) + { + foreach (var scap in c2s.ApprovalPeriodList) + { + if (scap.StartDate <= datum && datum <= scap.EndDate && scap.ApprovedBEPerInterval.HasValue) + { + return scap.ApprovedBEPerInterval.Value; + } + } + } + } + + return 0; + } + } + +} diff --git a/ReportImp/ChristopherusHausMID/Leistungsnachweis.designer.cs b/ReportImp/ChristopherusHausMID/Leistungsnachweis.designer.cs new file mode 100644 index 000000000..20c5ee561 --- /dev/null +++ b/ReportImp/ChristopherusHausMID/Leistungsnachweis.designer.cs @@ -0,0 +1,1125 @@ +using BeWo.Report.ReportObjects; +namespace ChristopherusHausMID +{ + partial class Leistungsnachweis + { + /// + /// 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(); + DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary(); + DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark(); + this.Detail = new DevExpress.XtraReports.UI.DetailBand(); + this.xrTableDetail = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRowDetail = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell33 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell34 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell38 = new DevExpress.XtraReports.UI.XRTableCell(); + this.ruleIstFerien = new DevExpress.XtraReports.UI.FormattingRule(); + 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.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); + this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); + this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); + this.xrTable2 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); + this.cellKinder = new DevExpress.XtraReports.UI.XRTableCell(); + this.cellKlasse = new DevExpress.XtraReports.UI.XRTableCell(); + this.cellBewilligung = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell(); + this.DetailReport2 = new DevExpress.XtraReports.UI.DetailReportBand(); + this.Detail3 = new DevExpress.XtraReports.UI.DetailBand(); + this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow7 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell32 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell36 = new DevExpress.XtraReports.UI.XRTableCell(); + this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); + this.xrTable3 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell37 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell42 = new DevExpress.XtraReports.UI.XRTableCell(); + this.GroupFooter2 = new DevExpress.XtraReports.UI.GroupFooterBand(); + this.xrTable4 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow9 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow(); + this.cellDatum = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell39 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow11 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell40 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell41 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell44 = new DevExpress.XtraReports.UI.XRTableCell(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.fieldStd = new DevExpress.XtraReports.UI.CalculatedField(); + this.fieldTotalStd = new DevExpress.XtraReports.UI.CalculatedField(); + this.fieldIstStunden = new DevExpress.XtraReports.UI.CalculatedField(); + ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).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; + // + // xrTableDetail + // + this.xrTableDetail.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableDetail.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); + this.xrTableDetail.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrTableDetail.Name = "xrTableDetail"; + this.xrTableDetail.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRowDetail}); + this.xrTableDetail.SizeF = new System.Drawing.SizeF(745F, 20F); + this.xrTableDetail.StylePriority.UseBorders = false; + this.xrTableDetail.StylePriority.UseFont = false; + this.xrTableDetail.StylePriority.UsePadding = false; + this.xrTableDetail.StylePriority.UseTextAlignment = false; + this.xrTableDetail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + // + // xrTableRowDetail + // + this.xrTableRowDetail.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell7, + this.xrTableCell3, + this.xrTableCell33, + this.xrTableCell10, + this.xrTableCell13, + this.xrTableCell9, + this.xrTableCell11, + this.xrTableCell8, + this.xrTableCell34, + this.xrTableCell38}); + this.xrTableRowDetail.FormattingRules.Add(this.ruleIstFerien); + this.xrTableRowDetail.Name = "xrTableRowDetail"; + this.xrTableRowDetail.Weight = 0.8D; + // + // xrTableCell7 + // + this.xrTableCell7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.StartDate")}); + this.xrTableCell7.Name = "xrTableCell7"; + this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 2, 0, 0, 100F); + this.xrTableCell7.StylePriority.UsePadding = false; + this.xrTableCell7.StylePriority.UseTextAlignment = false; + this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell7.TextFormatString = "{0:dd}"; + this.xrTableCell7.Weight = 0.041379318093471569D; + // + // xrTableCell3 + // + this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.StartDate")}); + this.xrTableCell3.Name = "xrTableCell3"; + this.xrTableCell3.StylePriority.UseFont = false; + this.xrTableCell3.StylePriority.UsePadding = false; + this.xrTableCell3.StylePriority.UseTextAlignment = false; + this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell3.TextFormatString = "{0:ddd}"; + this.xrTableCell3.Weight = 0.041379318093471576D; + // + // xrTableCell33 + // + this.xrTableCell33.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.StundenplanUhrzeiten1")}); + this.xrTableCell33.Name = "xrTableCell33"; + this.xrTableCell33.Weight = 0.082758640197474614D; + // + // xrTableCell10 + // + this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.StundenplanUhrzeiten2")}); + this.xrTableCell10.Name = "xrTableCell10"; + this.xrTableCell10.StylePriority.UseTextAlignment = false; + this.xrTableCell10.Weight = 0.082758640197474628D; + // + // xrTableCell13 + // + this.xrTableCell13.Name = "xrTableCell13"; + this.xrTableCell13.Weight = 0.041379318490266874D; + // + // xrTableCell9 + // + this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.IstUhrzeiten1", "{0:0.00}")}); + this.xrTableCell9.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell9.Name = "xrTableCell9"; + this.xrTableCell9.StylePriority.UseFont = false; + this.xrTableCell9.StylePriority.UseTextAlignment = false; + this.xrTableCell9.Weight = 0.082758637632387472D; + // + // xrTableCell11 + // + this.xrTableCell11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.IstUhrzeiten2")}); + this.xrTableCell11.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell11.Name = "xrTableCell11"; + this.xrTableCell11.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 3, 0, 0, 100F); + this.xrTableCell11.StylePriority.UseFont = false; + this.xrTableCell11.StylePriority.UsePadding = false; + this.xrTableCell11.Weight = 0.096551744452217175D; + // + // xrTableCell8 + // + this.xrTableCell8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice")}); + this.xrTableCell8.Name = "xrTableCell8"; + this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 3, 0, 0, 100F); + this.xrTableCell8.StylePriority.UsePadding = false; + this.xrTableCell8.StylePriority.UseTextAlignment = false; + this.xrTableCell8.Weight = 0.36551731898236622D; + // + // xrTableCell34 + // + this.xrTableCell34.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice5")}); + this.xrTableCell34.Multiline = true; + this.xrTableCell34.Name = "xrTableCell34"; + this.xrTableCell34.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 3, 0, 0, 100F); + this.xrTableCell34.StylePriority.UsePadding = false; + this.xrTableCell34.StylePriority.UseTextAlignment = false; + this.xrTableCell34.Weight = 0.090804588890990648D; + // + // xrTableCell38 + // + this.xrTableCell38.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.fieldIstStunden")}); + this.xrTableCell38.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell38.Multiline = true; + this.xrTableCell38.Name = "xrTableCell38"; + this.xrTableCell38.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 3, 0, 0, 100F); + this.xrTableCell38.StylePriority.UseFont = false; + this.xrTableCell38.StylePriority.UsePadding = false; + this.xrTableCell38.StylePriority.UseTextAlignment = false; + this.xrTableCell38.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell38.TextFormatString = "{0:0.00}"; + this.xrTableCell38.Weight = 0.1022989003325399D; + // + // ruleIstFerien + // + this.ruleIstFerien.Condition = "[IstSamstag] Or [IstSonntag] Or [IstFeiertag] Or [IstFerien]"; + this.ruleIstFerien.DataMember = "Services"; + this.ruleIstFerien.Formatting.BackColor = System.Drawing.Color.LightSteelBlue; + this.ruleIstFerien.Name = "ruleIstFerien"; + // + // 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.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold); + this.topMarginBand1.HeightF = 50F; + this.topMarginBand1.Name = "topMarginBand1"; + this.topMarginBand1.StylePriority.UseFont = false; + // + // xrLabel4 + // + this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Arial", 14F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrLabel4.Name = "xrLabel4"; + this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel4.SizeF = new System.Drawing.SizeF(737F, 27.08334F); + this.xrLabel4.StylePriority.UseFont = false; + this.xrLabel4.StylePriority.UseTextAlignment = false; + this.xrLabel4.Text = "Leistungsnachweis [StartDate!MMMM yyyy]"; + this.xrLabel4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + // + // bottomMarginBand1 + // + this.bottomMarginBand1.HeightF = 40F; + this.bottomMarginBand1.Name = "bottomMarginBand1"; + // + // ReportHeader + // + this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable2, + this.xrLabel4}); + this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold); + this.ReportHeader.HeightF = 192.5F; + this.ReportHeader.Name = "ReportHeader"; + this.ReportHeader.StylePriority.UseFont = false; + // + // 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.LocationFloat = new DevExpress.Utils.PointFloat(0F, 42.5F); + this.xrTable2.Name = "xrTable2"; + this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow2, + this.xrTableRow3, + this.xrTableRow4}); + this.xrTable2.SizeF = new System.Drawing.SizeF(745F, 150F); + this.xrTable2.StylePriority.UseBorders = false; + this.xrTable2.StylePriority.UseFont = false; + this.xrTable2.StylePriority.UsePadding = false; + this.xrTable2.StylePriority.UseTextAlignment = false; + this.xrTable2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + // + // xrTableRow2 + // + this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell1, + this.cellKinder, + this.cellKlasse, + this.cellBewilligung}); + this.xrTableRow2.Name = "xrTableRow2"; + this.xrTableRow2.StylePriority.UseBorders = false; + this.xrTableRow2.Weight = 1.3333333333333335D; + // + // xrTableCell1 + // + this.xrTableCell1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell1.Name = "xrTableCell1"; + this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(10, 0, 0, 0, 100F); + this.xrTableCell1.StylePriority.UseBorders = false; + this.xrTableCell1.StylePriority.UseFont = false; + this.xrTableCell1.StylePriority.UsePadding = false; + this.xrTableCell1.StylePriority.UseTextAlignment = false; + this.xrTableCell1.Text = "Klient"; + this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell1.Weight = 0.24827596671644431D; + // + // cellKinder + // + this.cellKinder.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.cellKinder.Multiline = true; + this.cellKinder.Name = "cellKinder"; + this.cellKinder.StylePriority.UseBorders = false; + this.cellKinder.StylePriority.UseTextAlignment = false; + this.cellKinder.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.cellKinder.Weight = 0.49827411509664216D; + // + // cellKlasse + // + this.cellKlasse.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.cellKlasse.Font = new DevExpress.Drawing.DXFont("Arial", 11F); + this.cellKlasse.Multiline = true; + this.cellKlasse.Name = "cellKlasse"; + this.cellKlasse.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 3, 0, 0, 100F); + this.cellKlasse.StylePriority.UseBorders = false; + this.cellKlasse.StylePriority.UseFont = false; + this.cellKlasse.StylePriority.UsePadding = false; + this.cellKlasse.StylePriority.UseTextAlignment = false; + this.cellKlasse.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.cellKlasse.Weight = 0.17873760844504966D; + // + // cellBewilligung + // + this.cellBewilligung.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.cellBewilligung.Multiline = true; + this.cellBewilligung.Name = "cellBewilligung"; + this.cellBewilligung.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 3, 0, 0, 100F); + this.cellBewilligung.StylePriority.UseBorders = false; + this.cellBewilligung.StylePriority.UsePadding = false; + this.cellBewilligung.StylePriority.UseTextAlignment = false; + this.cellBewilligung.Weight = 0.10229891689843183D; + // + // xrTableRow3 + // + this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell2, + this.xrTableCell18, + this.xrTableCell19, + this.xrTableCell20}); + this.xrTableRow3.Name = "xrTableRow3"; + this.xrTableRow3.StylePriority.UseBorders = false; + this.xrTableRow3.Weight = 1.3333333333333335D; + // + // xrTableCell2 + // + this.xrTableCell2.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell2.Multiline = true; + this.xrTableCell2.Name = "xrTableCell2"; + this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(10, 0, 0, 0, 100F); + this.xrTableCell2.StylePriority.UseBorders = false; + this.xrTableCell2.StylePriority.UseFont = false; + this.xrTableCell2.StylePriority.UsePadding = false; + this.xrTableCell2.StylePriority.UseTextAlignment = false; + this.xrTableCell2.Text = "Schule"; + this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell2.Weight = 0.24827596671644431D; + // + // xrTableCell18 + // + this.xrTableCell18.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell18.Multiline = true; + this.xrTableCell18.Name = "xrTableCell18"; + this.xrTableCell18.StylePriority.UseBorders = false; + this.xrTableCell18.StylePriority.UseTextAlignment = false; + this.xrTableCell18.Text = "[Schule.Name]\r\n[Schule.PostalCode] [Schule.Town], [Schule.Street]"; + this.xrTableCell18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell18.Weight = 0.49827411509664216D; + // + // xrTableCell19 + // + this.xrTableCell19.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell19.Font = new DevExpress.Drawing.DXFont("Arial", 11F); + this.xrTableCell19.Multiline = true; + this.xrTableCell19.Name = "xrTableCell19"; + this.xrTableCell19.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 3, 0, 0, 100F); + this.xrTableCell19.StylePriority.UseBorders = false; + this.xrTableCell19.StylePriority.UseFont = false; + this.xrTableCell19.StylePriority.UsePadding = false; + this.xrTableCell19.StylePriority.UseTextAlignment = false; + this.xrTableCell19.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell19.Weight = 0.17873760844504966D; + // + // xrTableCell20 + // + this.xrTableCell20.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell20.Multiline = true; + this.xrTableCell20.Name = "xrTableCell20"; + this.xrTableCell20.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 3, 0, 0, 100F); + this.xrTableCell20.StylePriority.UseBorders = false; + this.xrTableCell20.StylePriority.UsePadding = false; + this.xrTableCell20.StylePriority.UseTextAlignment = false; + this.xrTableCell20.Weight = 0.10229891689843183D; + // + // xrTableRow4 + // + this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell21, + this.xrTableCell24, + this.xrTableCell25, + this.xrTableCell30}); + this.xrTableRow4.Name = "xrTableRow4"; + this.xrTableRow4.StylePriority.UseBorders = false; + this.xrTableRow4.Weight = 1.3333333333333335D; + // + // xrTableCell21 + // + this.xrTableCell21.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell21.Multiline = true; + this.xrTableCell21.Name = "xrTableCell21"; + this.xrTableCell21.Padding = new DevExpress.XtraPrinting.PaddingInfo(10, 0, 0, 0, 100F); + this.xrTableCell21.StylePriority.UseBorders = false; + this.xrTableCell21.StylePriority.UseFont = false; + this.xrTableCell21.StylePriority.UsePadding = false; + this.xrTableCell21.StylePriority.UseTextAlignment = false; + this.xrTableCell21.Text = "Schulbegleiter/in"; + this.xrTableCell21.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell21.Weight = 0.24827596671644431D; + // + // xrTableCell24 + // + this.xrTableCell24.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell24.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeName")}); + this.xrTableCell24.Multiline = true; + this.xrTableCell24.Name = "xrTableCell24"; + this.xrTableCell24.StylePriority.UseBorders = false; + this.xrTableCell24.StylePriority.UseTextAlignment = false; + this.xrTableCell24.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell24.Weight = 0.49827411509664216D; + // + // xrTableCell25 + // + this.xrTableCell25.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell25.Font = new DevExpress.Drawing.DXFont("Arial", 11F); + this.xrTableCell25.Multiline = true; + this.xrTableCell25.Name = "xrTableCell25"; + this.xrTableCell25.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 3, 0, 0, 100F); + this.xrTableCell25.StylePriority.UseBorders = false; + this.xrTableCell25.StylePriority.UseFont = false; + this.xrTableCell25.StylePriority.UsePadding = false; + this.xrTableCell25.StylePriority.UseTextAlignment = false; + this.xrTableCell25.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell25.Weight = 0.17873760844504966D; + // + // xrTableCell30 + // + this.xrTableCell30.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell30.Multiline = true; + this.xrTableCell30.Name = "xrTableCell30"; + this.xrTableCell30.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 3, 0, 0, 100F); + this.xrTableCell30.StylePriority.UseBorders = false; + this.xrTableCell30.StylePriority.UsePadding = false; + this.xrTableCell30.StylePriority.UseTextAlignment = false; + this.xrTableCell30.Weight = 0.10229891689843183D; + // + // DetailReport2 + // + this.DetailReport2.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail3, + this.GroupHeader1, + this.GroupFooter1, + this.GroupFooter2}); + this.DetailReport2.DataMember = "Services"; + this.DetailReport2.DataSource = this.bindingSource1; + this.DetailReport2.Level = 0; + this.DetailReport2.Name = "DetailReport2"; + // + // Detail3 + // + this.Detail3.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTableDetail}); + this.Detail3.HeightF = 20F; + this.Detail3.Name = "Detail3"; + // + // GroupHeader1 + // + this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable1}); + this.GroupHeader1.HeightF = 34F; + this.GroupHeader1.Name = "GroupHeader1"; + // + // xrTable1 + // + this.xrTable1.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTable1.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrTable1.Name = "xrTable1"; + this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow1, + this.xrTableRow7}); + this.xrTable1.SizeF = new System.Drawing.SizeF(745F, 34F); + this.xrTable1.StylePriority.UseBorders = false; + this.xrTable1.StylePriority.UseFont = false; + this.xrTable1.StylePriority.UsePadding = false; + this.xrTable1.StylePriority.UseTextAlignment = false; + this.xrTable1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + // + // xrTableRow1 + // + this.xrTableRow1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell4, + this.xrTableCell22, + this.xrTableCell5, + this.xrTableCell6, + this.xrTableCell14, + this.xrTableCell35}); + this.xrTableRow1.Name = "xrTableRow1"; + this.xrTableRow1.StylePriority.UseBorders = false; + this.xrTableRow1.Weight = 0.45333333333333337D; + // + // xrTableCell4 + // + this.xrTableCell4.Font = new DevExpress.Drawing.DXFont("Arial", 9F); + this.xrTableCell4.Name = "xrTableCell4"; + this.xrTableCell4.StylePriority.UseFont = false; + this.xrTableCell4.StylePriority.UseTextAlignment = false; + this.xrTableCell4.Text = "Vorgabe Schulzeit lt. Std. Plan"; + this.xrTableCell4.Weight = 0.24827595043949735D; + // + // xrTableCell22 + // + this.xrTableCell22.Name = "xrTableCell22"; + this.xrTableCell22.Weight = 0.04137932695466718D; + // + // xrTableCell5 + // + this.xrTableCell5.Name = "xrTableCell5"; + this.xrTableCell5.StylePriority.UseTextAlignment = false; + this.xrTableCell5.Text = "abweich. Zeiten"; + this.xrTableCell5.Weight = 0.17931040305494861D; + // + // xrTableCell6 + // + this.xrTableCell6.Name = "xrTableCell6"; + this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 3, 0, 0, 100F); + this.xrTableCell6.StylePriority.UsePadding = false; + this.xrTableCell6.StylePriority.UseTextAlignment = false; + this.xrTableCell6.Text = "Bemerkungen"; + this.xrTableCell6.Weight = 0.36551739348431195D; + // + // xrTableCell14 + // + this.xrTableCell14.Multiline = true; + this.xrTableCell14.Name = "xrTableCell14"; + this.xrTableCell14.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 3, 0, 0, 100F); + this.xrTableCell14.StylePriority.UsePadding = false; + this.xrTableCell14.StylePriority.UseTextAlignment = false; + this.xrTableCell14.Text = "Pool"; + this.xrTableCell14.Weight = 0.090804609874047371D; + // + // xrTableCell35 + // + this.xrTableCell35.Multiline = true; + this.xrTableCell35.Name = "xrTableCell35"; + this.xrTableCell35.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 3, 0, 0, 100F); + this.xrTableCell35.StylePriority.UsePadding = false; + this.xrTableCell35.StylePriority.UseTextAlignment = false; + this.xrTableCell35.Text = "Ist"; + this.xrTableCell35.Weight = 0.10229892334909546D; + // + // xrTableRow7 + // + this.xrTableRow7.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableRow7.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell26, + this.xrTableCell32, + this.xrTableCell27, + this.xrTableCell28, + this.xrTableCell29, + this.xrTableCell12, + this.xrTableCell31, + this.xrTableCell23, + this.xrTableCell36}); + this.xrTableRow7.Name = "xrTableRow7"; + this.xrTableRow7.StylePriority.UseBorders = false; + this.xrTableRow7.Weight = 0.45333333333333337D; + // + // xrTableCell26 + // + this.xrTableCell26.Name = "xrTableCell26"; + this.xrTableCell26.Padding = new DevExpress.XtraPrinting.PaddingInfo(10, 0, 0, 0, 100F); + this.xrTableCell26.StylePriority.UsePadding = false; + this.xrTableCell26.StylePriority.UseTextAlignment = false; + this.xrTableCell26.Text = "Tag"; + this.xrTableCell26.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell26.Weight = 0.082758653115741931D; + // + // xrTableCell32 + // + this.xrTableCell32.Name = "xrTableCell32"; + this.xrTableCell32.Text = "von"; + this.xrTableCell32.Weight = 0.08275864866187771D; + // + // xrTableCell27 + // + this.xrTableCell27.Name = "xrTableCell27"; + this.xrTableCell27.Text = "bis"; + this.xrTableCell27.Weight = 0.082758648661877737D; + // + // xrTableCell28 + // + this.xrTableCell28.Name = "xrTableCell28"; + this.xrTableCell28.Weight = 0.041379321693013726D; + // + // xrTableCell29 + // + this.xrTableCell29.Name = "xrTableCell29"; + this.xrTableCell29.Text = "von"; + this.xrTableCell29.Weight = 0.082758652378680977D; + // + // xrTableCell12 + // + this.xrTableCell12.Multiline = true; + this.xrTableCell12.Name = "xrTableCell12"; + this.xrTableCell12.Text = "bis"; + this.xrTableCell12.Weight = 0.096551755937921077D; + // + // xrTableCell31 + // + this.xrTableCell31.Name = "xrTableCell31"; + this.xrTableCell31.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 3, 0, 0, 100F); + this.xrTableCell31.StylePriority.UsePadding = false; + this.xrTableCell31.Text = "zur Abweichung"; + this.xrTableCell31.Weight = 0.36551747767076714D; + // + // xrTableCell23 + // + this.xrTableCell23.Multiline = true; + this.xrTableCell23.Name = "xrTableCell23"; + this.xrTableCell23.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 3, 0, 0, 100F); + this.xrTableCell23.StylePriority.UsePadding = false; + this.xrTableCell23.Text = "Faktor"; + this.xrTableCell23.Weight = 0.090804520425938742D; + // + // xrTableCell36 + // + this.xrTableCell36.Multiline = true; + this.xrTableCell36.Name = "xrTableCell36"; + this.xrTableCell36.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 3, 0, 0, 100F); + this.xrTableCell36.StylePriority.UsePadding = false; + this.xrTableCell36.Text = "Stunden"; + this.xrTableCell36.Weight = 0.10229892861074891D; + // + // GroupFooter1 + // + this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable3}); + this.GroupFooter1.HeightF = 25F; + this.GroupFooter1.Name = "GroupFooter1"; + // + // xrTable3 + // + this.xrTable3.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrTable3.Name = "xrTable3"; + this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow5}); + this.xrTable3.SizeF = new System.Drawing.SizeF(747F, 25F); + this.xrTable3.StylePriority.UseBorders = false; + this.xrTable3.StylePriority.UseFont = false; + this.xrTable3.StylePriority.UsePadding = false; + this.xrTable3.StylePriority.UseTextAlignment = false; + this.xrTable3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + // + // xrTableRow5 + // + this.xrTableRow5.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell37, + this.xrTableCell42}); + this.xrTableRow5.Name = "xrTableRow5"; + this.xrTableRow5.StylePriority.UseBorders = false; + this.xrTableRow5.Weight = 0.66666666666666685D; + // + // xrTableCell37 + // + this.xrTableCell37.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell37.Name = "xrTableCell37"; + this.xrTableCell37.Padding = new DevExpress.XtraPrinting.PaddingInfo(10, 0, 0, 0, 100F); + this.xrTableCell37.StylePriority.UseBorders = false; + this.xrTableCell37.StylePriority.UseFont = false; + this.xrTableCell37.StylePriority.UsePadding = false; + this.xrTableCell37.StylePriority.UseTextAlignment = false; + this.xrTableCell37.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell37.Weight = 1.8456206909269826D; + // + // xrTableCell42 + // + this.xrTableCell42.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell42.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.fieldIstStunden")}); + this.xrTableCell42.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell42.Multiline = true; + this.xrTableCell42.Name = "xrTableCell42"; + this.xrTableCell42.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 3, 0, 0, 100F); + this.xrTableCell42.StylePriority.UseBorders = false; + this.xrTableCell42.StylePriority.UseFont = false; + this.xrTableCell42.StylePriority.UsePadding = false; + this.xrTableCell42.StylePriority.UseTextAlignment = false; + xrSummary1.FormatString = "{0:0.00}"; + xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.xrTableCell42.Summary = xrSummary1; + this.xrTableCell42.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell42.Weight = 0.20955252338615338D; + // + // GroupFooter2 + // + this.GroupFooter2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable4}); + this.GroupFooter2.HeightF = 150F; + this.GroupFooter2.Level = 1; + this.GroupFooter2.Name = "GroupFooter2"; + // + // xrTable4 + // + this.xrTable4.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | 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.xrTableRow9, + this.xrTableRow10, + this.xrTableRow11}); + this.xrTable4.SizeF = new System.Drawing.SizeF(605F, 150F); + this.xrTable4.StylePriority.UseBorders = false; + this.xrTable4.StylePriority.UseFont = false; + this.xrTable4.StylePriority.UsePadding = false; + this.xrTable4.StylePriority.UseTextAlignment = false; + this.xrTable4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + // + // xrTableRow9 + // + this.xrTableRow9.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell15}); + this.xrTableRow9.Name = "xrTableRow9"; + this.xrTableRow9.StylePriority.UseBorders = false; + this.xrTableRow9.Weight = 0.66666666666666685D; + // + // xrTableCell15 + // + this.xrTableCell15.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell15.Name = "xrTableCell15"; + this.xrTableCell15.Padding = new DevExpress.XtraPrinting.PaddingInfo(10, 0, 0, 0, 100F); + this.xrTableCell15.StylePriority.UseBorders = false; + this.xrTableCell15.StylePriority.UseFont = false; + this.xrTableCell15.StylePriority.UsePadding = false; + this.xrTableCell15.StylePriority.UseTextAlignment = false; + this.xrTableCell15.Text = "Die Richtigkeit der eingetragenen Zeiten wird hiermit bestätigt"; + this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell15.Weight = 1.027586607156568D; + // + // xrTableRow10 + // + this.xrTableRow10.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.cellDatum, + this.xrTableCell17, + this.xrTableCell39}); + this.xrTableRow10.Name = "xrTableRow10"; + this.xrTableRow10.StylePriority.UseBorders = false; + this.xrTableRow10.Weight = 2.6666666666666665D; + // + // cellDatum + // + this.cellDatum.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.cellDatum.Font = new DevExpress.Drawing.DXFont("Arial", 12F); + this.cellDatum.Multiline = true; + this.cellDatum.Name = "cellDatum"; + this.cellDatum.Padding = new DevExpress.XtraPrinting.PaddingInfo(10, 0, 0, 0, 100F); + this.cellDatum.StylePriority.UseBorders = false; + this.cellDatum.StylePriority.UseFont = false; + this.cellDatum.StylePriority.UsePadding = false; + this.cellDatum.StylePriority.UseTextAlignment = false; + this.cellDatum.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; + this.cellDatum.Weight = 0.20381883424162064D; + // + // xrTableCell17 + // + this.xrTableCell17.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell17.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell17.Multiline = true; + this.xrTableCell17.Name = "xrTableCell17"; + this.xrTableCell17.StylePriority.UseBorders = false; + this.xrTableCell17.StylePriority.UseFont = false; + this.xrTableCell17.StylePriority.UseTextAlignment = false; + this.xrTableCell17.Text = "Unterschrift Leitung Schulbegleitung"; + this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell17.Weight = 0.48388245588586465D; + // + // xrTableCell39 + // + this.xrTableCell39.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell39.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell39.Multiline = true; + this.xrTableCell39.Name = "xrTableCell39"; + this.xrTableCell39.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 3, 0, 0, 100F); + this.xrTableCell39.StylePriority.UseBorders = false; + this.xrTableCell39.StylePriority.UseFont = false; + this.xrTableCell39.StylePriority.UsePadding = false; + this.xrTableCell39.StylePriority.UseTextAlignment = false; + this.xrTableCell39.Text = "Unterschrift Schulverwaltung"; + this.xrTableCell39.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell39.Weight = 0.33988531702908265D; + // + // xrTableRow11 + // + this.xrTableRow11.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell40, + this.xrTableCell41, + this.xrTableCell44}); + this.xrTableRow11.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableRow11.Name = "xrTableRow11"; + this.xrTableRow11.StylePriority.UseBorders = false; + this.xrTableRow11.StylePriority.UseFont = false; + this.xrTableRow11.Weight = 0.66666666666666685D; + // + // xrTableCell40 + // + this.xrTableCell40.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell40.Multiline = true; + this.xrTableCell40.Name = "xrTableCell40"; + this.xrTableCell40.Padding = new DevExpress.XtraPrinting.PaddingInfo(10, 0, 0, 0, 100F); + this.xrTableCell40.StylePriority.UseBorders = false; + this.xrTableCell40.StylePriority.UseFont = false; + this.xrTableCell40.StylePriority.UsePadding = false; + this.xrTableCell40.StylePriority.UseTextAlignment = false; + this.xrTableCell40.Text = "Datum"; + this.xrTableCell40.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell40.Weight = 0.20381883424162064D; + // + // xrTableCell41 + // + this.xrTableCell41.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell41.Multiline = true; + this.xrTableCell41.Name = "xrTableCell41"; + this.xrTableCell41.StylePriority.UseBorders = false; + this.xrTableCell41.StylePriority.UseTextAlignment = false; + this.xrTableCell41.Text = "Name in Druckbuchstaben"; + this.xrTableCell41.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell41.Weight = 0.48388245588586465D; + // + // xrTableCell44 + // + this.xrTableCell44.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell44.Font = new DevExpress.Drawing.DXFont("Arial", 11F); + this.xrTableCell44.Multiline = true; + this.xrTableCell44.Name = "xrTableCell44"; + this.xrTableCell44.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 3, 0, 0, 100F); + this.xrTableCell44.StylePriority.UseBorders = false; + this.xrTableCell44.StylePriority.UseFont = false; + this.xrTableCell44.StylePriority.UsePadding = false; + this.xrTableCell44.StylePriority.UseTextAlignment = false; + this.xrTableCell44.Text = "Name in Druckbuchstaben"; + this.xrTableCell44.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell44.Weight = 0.33988531702908265D; + // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SbdStundenaufstellungRO); + // + // fieldStd + // + this.fieldStd.DataMember = "Services"; + this.fieldStd.Expression = "Iif([Minutes] > 0, [Minutes] / 60, ?)"; + this.fieldStd.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; + this.fieldStd.Name = "fieldStd"; + // + // fieldTotalStd + // + this.fieldTotalStd.Expression = "[TotalFLM] / 60"; + this.fieldTotalStd.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; + this.fieldTotalStd.Name = "fieldTotalStd"; + // + // fieldIstStunden + // + this.fieldIstStunden.DataMember = "Services"; + this.fieldIstStunden.Expression = "Iif([Minutes] > 0, [Minutes] / 60, ?)"; + this.fieldIstStunden.Name = "fieldIstStunden"; + // + // Leistungsnachweis + // + this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail, + this.topMarginBand1, + this.bottomMarginBand1, + this.ReportHeader, + this.DetailReport2}); + this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] { + this.fieldFLS, + this.fieldStd, + this.fieldTotalStd, + this.fieldIstStunden}); + this.DataSource = this.bindingSource1; + this.DisplayName = "Stundenzettel"; + this.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); + this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] { + this.ruleIstFerien}); + this.Margins = new DevExpress.Drawing.DXMargins(40F, 40F, 50F, 40F); + 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"; + xrWatermark1.Id = "Watermark1"; + this.Watermarks.Add(xrWatermark1); + ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); + + } + + #endregion + + private DevExpress.XtraReports.UI.DetailBand Detail; + private System.Windows.Forms.BindingSource bindingSource1; + private DevExpress.XtraReports.UI.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 xrTableDetail; + private DevExpress.XtraReports.UI.XRTableRow xrTableRowDetail; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell3; + private DevExpress.XtraReports.UI.CalculatedField fieldFLS; + private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1; + private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell10; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell9; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell8; + private DevExpress.XtraReports.UI.XRLabel xrLabel4; + private DevExpress.XtraReports.UI.FormattingRule ruleIstFerien; + private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader; + private DevExpress.XtraReports.UI.DetailReportBand DetailReport2; + private DevExpress.XtraReports.UI.DetailBand Detail3; + private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader1; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell7; + private DevExpress.XtraReports.UI.XRTable xrTable1; + private DevExpress.XtraReports.UI.CalculatedField fieldStd; + private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1; + private DevExpress.XtraReports.UI.CalculatedField fieldTotalStd; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow1; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell4; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell22; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell5; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell6; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow7; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell26; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell32; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell27; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell28; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell29; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell31; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell33; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell13; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell11; + private DevExpress.XtraReports.UI.XRTable xrTable2; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow2; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell1; + private DevExpress.XtraReports.UI.XRTableCell cellKinder; + private DevExpress.XtraReports.UI.XRTableCell cellKlasse; + private DevExpress.XtraReports.UI.XRTableCell cellBewilligung; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow3; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell2; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell18; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell19; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell20; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow4; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell21; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell24; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell25; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell30; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell12; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell34; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell14; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell23; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell35; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell36; + private DevExpress.XtraReports.UI.XRTable xrTable3; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow5; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell37; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell38; + private DevExpress.XtraReports.UI.CalculatedField fieldIstStunden; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell42; + private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter2; + private DevExpress.XtraReports.UI.XRTable xrTable4; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow9; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell15; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow10; + private DevExpress.XtraReports.UI.XRTableCell cellDatum; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell17; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell39; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow11; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell40; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell41; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell44; + } +} diff --git a/ReportImp/ChristopherusHausMID/Leistungsnachweis.resx b/ReportImp/ChristopherusHausMID/Leistungsnachweis.resx new file mode 100644 index 000000000..d58980a38 --- /dev/null +++ b/ReportImp/ChristopherusHausMID/Leistungsnachweis.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/ChristopherusHausMID/RechnungSchuleBochum.Designer.cs b/ReportImp/ChristopherusHausMID/Rechnung.Designer.cs similarity index 70% rename from ReportImp/ChristopherusHausMID/RechnungSchuleBochum.Designer.cs rename to ReportImp/ChristopherusHausMID/Rechnung.Designer.cs index 8d1db7e3d..919764d37 100644 --- a/ReportImp/ChristopherusHausMID/RechnungSchuleBochum.Designer.cs +++ b/ReportImp/ChristopherusHausMID/Rechnung.Designer.cs @@ -1,7 +1,7 @@ using BeWo.Report.ReportObjects; namespace ChristopherusHausMID { - partial class Sammelrechnung + partial class Rechnung { /// /// Required designer variable. @@ -29,17 +29,19 @@ namespace ChristopherusHausMID private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary(); - DevExpress.XtraReports.UI.XRSummary xrSummary5 = new DevExpress.XtraReports.UI.XRSummary(); DevExpress.XtraReports.UI.XRSummary xrSummary2 = new DevExpress.XtraReports.UI.XRSummary(); DevExpress.XtraReports.UI.XRSummary xrSummary3 = new DevExpress.XtraReports.UI.XRSummary(); DevExpress.XtraReports.UI.XRSummary xrSummary4 = new DevExpress.XtraReports.UI.XRSummary(); + DevExpress.XtraReports.UI.XRSummary xrSummary5 = new DevExpress.XtraReports.UI.XRSummary(); + DevExpress.XtraReports.UI.XRSummary xrSummary6 = new DevExpress.XtraReports.UI.XRSummary(); + DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary(); DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Sammelrechnung)); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Rechnung)); this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule(); this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); + this.lblAdresse = new DevExpress.XtraReports.UI.XRLabel(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.GroupFooter = new DevExpress.XtraReports.UI.GroupFooterBand(); this.ruleNoticeNull = new DevExpress.XtraReports.UI.FormattingRule(); @@ -61,12 +63,10 @@ namespace ChristopherusHausMID this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrLabel19 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel18 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblSchule = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblKategorie = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); this.lblBewilligungVom = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); @@ -74,13 +74,10 @@ namespace ChristopherusHausMID this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); - this.DetailReport2 = new DevExpress.XtraReports.UI.DetailReportBand(); - this.Detail3 = new DevExpress.XtraReports.UI.DetailBand(); this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -97,11 +94,22 @@ namespace ChristopherusHausMID this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell(); - this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.fieldAnteilAnRechnung = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldSummeStunden = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldBetragAllerStunden = new DevExpress.XtraReports.UI.CalculatedField(); this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand(); + this.xrLabel25 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel26 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel27 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel28 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel20 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel21 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel22 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel23 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel24 = new DevExpress.XtraReports.UI.XRLabel(); this.xrTable3 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell43 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -118,29 +126,35 @@ namespace ChristopherusHausMID this.xrTableCell54 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell55 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell56 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrLabel21 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel22 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel23 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel24 = new DevExpress.XtraReports.UI.XRLabel(); this.GroupFooter2 = new DevExpress.XtraReports.UI.GroupFooterBand(); - this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel20 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel25 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel26 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel27 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel28 = new DevExpress.XtraReports.UI.XRLabel(); this.fieldAbweichungIstSoll = new DevExpress.XtraReports.UI.CalculatedField(); + this.xrTable2 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell32 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell33 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell34 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell36 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell38 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell39 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell40 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell41 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell42 = new DevExpress.XtraReports.UI.XRTableCell(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail // + this.Detail.Expanded = false; this.Detail.HeightF = 0F; this.Detail.Name = "Detail"; this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); @@ -162,9 +176,21 @@ namespace ChristopherusHausMID // topMarginBand1 // this.topMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrLabel7}); + this.lblAdresse}); this.topMarginBand1.HeightF = 309.375F; this.topMarginBand1.Name = "topMarginBand1"; + // + // lblAdresse + // + this.lblAdresse.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.lblAdresse.LocationFloat = new DevExpress.Utils.PointFloat(17.5F, 226F); + this.lblAdresse.Multiline = true; + this.lblAdresse.Name = "lblAdresse"; + this.lblAdresse.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblAdresse.SizeF = new System.Drawing.SizeF(419.3311F, 83.37502F); + this.lblAdresse.StylePriority.UseFont = false; + this.lblAdresse.Text = "[RecipientOrganisation]\r\n[RecipientContactPerson]\r\n[RecipientDivision]\r\n[Recipien" + + "tStreet]\r\n[RecipientPostCodeAndTown]"; // // bottomMarginBand1 // @@ -185,14 +211,13 @@ namespace ChristopherusHausMID // Page1 // this.Page1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable2, this.xrTable5, this.xrLabel19, - this.xrLabel18, - this.xrLabel17, - this.xrLabel16, + this.lblSchule, this.xrLabel13, this.xrLabel12, - this.xrLabel9, + this.lblKategorie, this.xrLabel11, this.lblBewilligungVom, this.xrLabel10, @@ -202,18 +227,20 @@ namespace ChristopherusHausMID this.xrLabel5, this.xrLabel3, this.xrLabel2}); - this.Page1.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); - this.Page1.HeightF = 355.1663F; + this.Page1.HeightF = 366.2079F; this.Page1.Name = "Page1"; this.Page1.StylePriority.UseFont = false; // // xrTable5 // + this.xrTable5.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right))); this.xrTable5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 279.6658F); this.xrTable5.Name = "xrTable5"; this.xrTable5.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow23}); - this.xrTable5.SizeF = new System.Drawing.SizeF(764.9999F, 75.50049F); + this.xrTable5.SizeF = new System.Drawing.SizeF(764.9999F, 60F); + this.xrTable5.StylePriority.UseBorders = false; // // xrTableRow23 // @@ -233,18 +260,14 @@ namespace ChristopherusHausMID this.xrTableCell12, this.xrTableCell13}); this.xrTableRow23.Name = "xrTableRow23"; - this.xrTableRow23.Weight = 1D; + this.xrTableRow23.Weight = 0.79469684721099432D; // // xrTableCell37 // this.xrTableCell37.BackColor = System.Drawing.Color.Transparent; this.xrTableCell37.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell37.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell37.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell37.Font = new DevExpress.Drawing.DXFont("Arial", 7F, DevExpress.Drawing.DXFontStyle.Bold); this.xrTableCell37.Name = "xrTableCell37"; - this.xrTableCell37.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); this.xrTableCell37.StylePriority.UseBackColor = false; this.xrTableCell37.StylePriority.UseBorderColor = false; this.xrTableCell37.StylePriority.UseBorders = false; @@ -259,13 +282,9 @@ namespace ChristopherusHausMID // this.xrTableCell1.BackColor = System.Drawing.Color.Transparent; this.xrTableCell1.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell1.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell1.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell1.Font = new DevExpress.Drawing.DXFont("Arial", 7F, DevExpress.Drawing.DXFontStyle.Bold); this.xrTableCell1.Multiline = true; this.xrTableCell1.Name = "xrTableCell1"; - this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); this.xrTableCell1.StylePriority.UseBackColor = false; this.xrTableCell1.StylePriority.UseBorderColor = false; this.xrTableCell1.StylePriority.UseBorders = false; @@ -280,76 +299,60 @@ namespace ChristopherusHausMID // this.xrTableCell2.BackColor = System.Drawing.Color.Transparent; this.xrTableCell2.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell2.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell2.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell2.Font = new DevExpress.Drawing.DXFont("Arial", 7F, DevExpress.Drawing.DXFontStyle.Bold); this.xrTableCell2.Multiline = true; this.xrTableCell2.Name = "xrTableCell2"; - this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); this.xrTableCell2.StylePriority.UseBackColor = false; this.xrTableCell2.StylePriority.UseBorderColor = false; this.xrTableCell2.StylePriority.UseBorders = false; this.xrTableCell2.StylePriority.UseFont = false; this.xrTableCell2.StylePriority.UsePadding = false; this.xrTableCell2.StylePriority.UseTextAlignment = false; - this.xrTableCell2.Text = "bewilligte\r\nStunden\r\npro\r\nWoche"; + this.xrTableCell2.Text = "bewilligte\r\nStunden\r\npro Woche"; this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell2.Weight = 1.8434238902708935D; + this.xrTableCell2.Weight = 1.9334990537876378D; // // xrTableCell3 // this.xrTableCell3.BackColor = System.Drawing.Color.Transparent; this.xrTableCell3.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell3.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell3.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell3.Font = new DevExpress.Drawing.DXFont("Arial", 7F, DevExpress.Drawing.DXFontStyle.Bold); this.xrTableCell3.Multiline = true; this.xrTableCell3.Name = "xrTableCell3"; - this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); this.xrTableCell3.StylePriority.UseBackColor = false; this.xrTableCell3.StylePriority.UseBorderColor = false; this.xrTableCell3.StylePriority.UseBorders = false; this.xrTableCell3.StylePriority.UseFont = false; this.xrTableCell3.StylePriority.UsePadding = false; this.xrTableCell3.StylePriority.UseTextAlignment = false; - this.xrTableCell3.Text = "Fehltage"; + this.xrTableCell3.Text = "Fehl-\r\ntage"; this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell3.Weight = 1.7723740103520469D; + this.xrTableCell3.Weight = 1.2889993735091139D; // // xrTableCell4 // this.xrTableCell4.BackColor = System.Drawing.Color.Transparent; this.xrTableCell4.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell4.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell4.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell4.Font = new DevExpress.Drawing.DXFont("Arial", 7F, DevExpress.Drawing.DXFontStyle.Bold); this.xrTableCell4.Multiline = true; this.xrTableCell4.Name = "xrTableCell4"; - this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); this.xrTableCell4.StylePriority.UseBackColor = false; this.xrTableCell4.StylePriority.UseBorderColor = false; this.xrTableCell4.StylePriority.UseBorders = false; this.xrTableCell4.StylePriority.UseFont = false; this.xrTableCell4.StylePriority.UsePadding = false; this.xrTableCell4.StylePriority.UseTextAlignment = false; - this.xrTableCell4.Text = "Anteil \r\nan\r\nRechnung"; + this.xrTableCell4.Text = "Rechnungs-\r\nanteil"; this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell4.Weight = 1.9334989184548541D; + this.xrTableCell4.Weight = 1.9334989184548546D; // // xrTableCell5 // this.xrTableCell5.BackColor = System.Drawing.Color.Transparent; this.xrTableCell5.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell5.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell5.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell5.Font = new DevExpress.Drawing.DXFont("Arial", 7F, DevExpress.Drawing.DXFontStyle.Bold); this.xrTableCell5.Multiline = true; this.xrTableCell5.Name = "xrTableCell5"; - this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); this.xrTableCell5.StylePriority.UseBackColor = false; this.xrTableCell5.StylePriority.UseBorderColor = false; this.xrTableCell5.StylePriority.UseBorders = false; @@ -358,166 +361,134 @@ namespace ChristopherusHausMID this.xrTableCell5.StylePriority.UseTextAlignment = false; this.xrTableCell5.Text = "Stunden-satz"; this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell5.Weight = 1.7401490287314854D; + this.xrTableCell5.Weight = 1.6112492157209792D; // // xrTableCell6 // this.xrTableCell6.BackColor = System.Drawing.Color.Transparent; this.xrTableCell6.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell6.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell6.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell6.Font = new DevExpress.Drawing.DXFont("Arial", 7F, DevExpress.Drawing.DXFontStyle.Bold); this.xrTableCell6.Multiline = true; this.xrTableCell6.Name = "xrTableCell6"; - this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); this.xrTableCell6.StylePriority.UseBackColor = false; this.xrTableCell6.StylePriority.UseBorderColor = false; this.xrTableCell6.StylePriority.UseBorders = false; this.xrTableCell6.StylePriority.UseFont = false; this.xrTableCell6.StylePriority.UsePadding = false; this.xrTableCell6.StylePriority.UseTextAlignment = false; - this.xrTableCell6.Text = "5%\r\nStunden \r\nFaktor \r\n1,0"; + this.xrTableCell6.Text = "5%\r\nStunden \r\nFaktor 1,0"; this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell6.Weight = 1.6112489904513003D; + this.xrTableCell6.Weight = 1.7401491722474813D; // // xrTableCell7 // this.xrTableCell7.BackColor = System.Drawing.Color.Transparent; this.xrTableCell7.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell7.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell7.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell7.Font = new DevExpress.Drawing.DXFont("Arial", 7F, DevExpress.Drawing.DXFontStyle.Bold); this.xrTableCell7.Multiline = true; this.xrTableCell7.Name = "xrTableCell7"; - this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); this.xrTableCell7.StylePriority.UseBackColor = false; this.xrTableCell7.StylePriority.UseBorderColor = false; this.xrTableCell7.StylePriority.UseBorders = false; this.xrTableCell7.StylePriority.UseFont = false; this.xrTableCell7.StylePriority.UsePadding = false; this.xrTableCell7.StylePriority.UseTextAlignment = false; - this.xrTableCell7.Text = "betreute\r\nStunden\r\nFaktor \r\n1,0"; + this.xrTableCell7.Text = "betreute\r\nStunden\r\nFaktor 1,0"; this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell7.Weight = 1.6112489904513003D; + this.xrTableCell7.Weight = 1.7401491722474816D; // // xrTableCell8 // this.xrTableCell8.BackColor = System.Drawing.Color.Transparent; this.xrTableCell8.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell8.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell8.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell8.Font = new DevExpress.Drawing.DXFont("Arial", 7F, DevExpress.Drawing.DXFontStyle.Bold); this.xrTableCell8.Multiline = true; this.xrTableCell8.Name = "xrTableCell8"; - this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); this.xrTableCell8.StylePriority.UseBackColor = false; this.xrTableCell8.StylePriority.UseBorderColor = false; this.xrTableCell8.StylePriority.UseBorders = false; this.xrTableCell8.StylePriority.UseFont = false; this.xrTableCell8.StylePriority.UsePadding = false; this.xrTableCell8.StylePriority.UseTextAlignment = false; - this.xrTableCell8.Text = "betreute\r\nStunden\r\nFaktor \r\n1,1"; + this.xrTableCell8.Text = "betreute\r\nStunden\r\nFaktor 1,1"; this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell8.Weight = 1.6112491133798452D; + this.xrTableCell8.Weight = 1.7401491722474676D; // // xrTableCell9 // this.xrTableCell9.BackColor = System.Drawing.Color.Transparent; this.xrTableCell9.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell9.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell9.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell9.Font = new DevExpress.Drawing.DXFont("Arial", 7F, DevExpress.Drawing.DXFontStyle.Bold); this.xrTableCell9.Multiline = true; this.xrTableCell9.Name = "xrTableCell9"; - this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); this.xrTableCell9.StylePriority.UseBackColor = false; this.xrTableCell9.StylePriority.UseBorderColor = false; this.xrTableCell9.StylePriority.UseBorders = false; this.xrTableCell9.StylePriority.UseFont = false; this.xrTableCell9.StylePriority.UsePadding = false; this.xrTableCell9.StylePriority.UseTextAlignment = false; - this.xrTableCell9.Text = "betreute\r\nStunden\r\nFaktor \r\n1,2"; + this.xrTableCell9.Text = "betreute\r\nStunden\r\nFaktor 1,2"; this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell9.Weight = 1.6112491133798457D; + this.xrTableCell9.Weight = 1.7401491722474682D; // // xrTableCell10 // this.xrTableCell10.BackColor = System.Drawing.Color.Transparent; this.xrTableCell10.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell10.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell10.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell10.Font = new DevExpress.Drawing.DXFont("Arial", 7F, DevExpress.Drawing.DXFontStyle.Bold); this.xrTableCell10.Multiline = true; this.xrTableCell10.Name = "xrTableCell10"; - this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); this.xrTableCell10.StylePriority.UseBackColor = false; this.xrTableCell10.StylePriority.UseBorderColor = false; this.xrTableCell10.StylePriority.UseBorders = false; this.xrTableCell10.StylePriority.UseFont = false; this.xrTableCell10.StylePriority.UsePadding = false; this.xrTableCell10.StylePriority.UseTextAlignment = false; - this.xrTableCell10.Text = "betreute\r\nStunden\r\nFaktor \r\n1,3"; + this.xrTableCell10.Text = "betreute\r\nStunden\r\nFaktor 1,3"; this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell10.Weight = 1.6112491133798452D; + this.xrTableCell10.Weight = 1.740149172247468D; // // xrTableCell11 // this.xrTableCell11.BackColor = System.Drawing.Color.Transparent; this.xrTableCell11.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell11.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell11.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell11.Font = new DevExpress.Drawing.DXFont("Arial", 7F, DevExpress.Drawing.DXFontStyle.Bold); this.xrTableCell11.Multiline = true; this.xrTableCell11.Name = "xrTableCell11"; - this.xrTableCell11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); this.xrTableCell11.StylePriority.UseBackColor = false; this.xrTableCell11.StylePriority.UseBorderColor = false; this.xrTableCell11.StylePriority.UseBorders = false; this.xrTableCell11.StylePriority.UseFont = false; this.xrTableCell11.StylePriority.UsePadding = false; this.xrTableCell11.StylePriority.UseTextAlignment = false; - this.xrTableCell11.Text = "betreute\r\nStunden\r\nFaktor \r\n1,4"; + this.xrTableCell11.Text = "betreute\r\nStunden\r\nFaktor 1,4"; this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell11.Weight = 1.6112493592369357D; + this.xrTableCell11.Weight = 1.7401491722474414D; // // xrTableCell12 // this.xrTableCell12.BackColor = System.Drawing.Color.Transparent; this.xrTableCell12.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell12.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell12.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell12.Font = new DevExpress.Drawing.DXFont("Arial", 7F, DevExpress.Drawing.DXFontStyle.Bold); this.xrTableCell12.Multiline = true; this.xrTableCell12.Name = "xrTableCell12"; - this.xrTableCell12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); this.xrTableCell12.StylePriority.UseBackColor = false; this.xrTableCell12.StylePriority.UseBorderColor = false; this.xrTableCell12.StylePriority.UseBorders = false; this.xrTableCell12.StylePriority.UseFont = false; this.xrTableCell12.StylePriority.UsePadding = false; this.xrTableCell12.StylePriority.UseTextAlignment = false; - this.xrTableCell12.Text = "gerun-dete\r\nStunden\r\nFaktor\r\n1,5\r\n"; + this.xrTableCell12.Text = "gerun-dete\r\nStunden\r\nFakto 1,5\r\n"; this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell12.Weight = 1.6112493592369357D; + this.xrTableCell12.Weight = 1.7401491722474418D; // // xrTableCell13 // this.xrTableCell13.BackColor = System.Drawing.Color.Transparent; this.xrTableCell13.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell13.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell13.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell13.Font = new DevExpress.Drawing.DXFont("Arial", 7F, DevExpress.Drawing.DXFontStyle.Bold); this.xrTableCell13.Multiline = true; this.xrTableCell13.Name = "xrTableCell13"; - this.xrTableCell13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); this.xrTableCell13.StylePriority.UseBackColor = false; this.xrTableCell13.StylePriority.UseBorderColor = false; this.xrTableCell13.StylePriority.UseBorders = false; @@ -526,84 +497,67 @@ namespace ChristopherusHausMID this.xrTableCell13.StylePriority.UseTextAlignment = false; this.xrTableCell13.Text = "Gesamt"; this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell13.Weight = 2.5189911315193161D; + this.xrTableCell13.Weight = 2.138890251639769D; // // xrLabel19 // this.xrLabel19.BackColor = System.Drawing.Color.Transparent; - this.xrLabel19.CanShrink = true; - this.xrLabel19.Font = new DevExpress.Drawing.DXFont("Arial", 10F, ((DevExpress.Drawing.DXFontStyle)((DevExpress.Drawing.DXFontStyle.Bold | DevExpress.Drawing.DXFontStyle.Underline)))); - this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(0F, 257.7498F); + this.xrLabel19.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrLabel19.Font = new DevExpress.Drawing.DXFont("Arial", 9F, ((DevExpress.Drawing.DXFontStyle)((DevExpress.Drawing.DXFontStyle.Bold | DevExpress.Drawing.DXFontStyle.Underline)))); + this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(0F, 252.4583F); this.xrLabel19.Name = "xrLabel19"; - this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel19.SizeF = new System.Drawing.SizeF(213.4167F, 20.00003F); + this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 3, 100F); + this.xrLabel19.SizeF = new System.Drawing.SizeF(765.0002F, 27.20747F); this.xrLabel19.StylePriority.UseBackColor = false; + this.xrLabel19.StylePriority.UseBorders = false; this.xrLabel19.StylePriority.UseFont = false; + this.xrLabel19.StylePriority.UsePadding = false; + this.xrLabel19.StylePriority.UseTextAlignment = false; this.xrLabel19.Text = "Klient"; + this.xrLabel19.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft; this.xrLabel19.WordWrap = false; // - // xrLabel18 + // lblSchule // - this.xrLabel18.BackColor = System.Drawing.Color.Transparent; - this.xrLabel18.CanShrink = true; - this.xrLabel18.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(0F, 232.4584F); - this.xrLabel18.Name = "xrLabel18"; - this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel18.SizeF = new System.Drawing.SizeF(212.4167F, 20.00003F); - this.xrLabel18.StylePriority.UseBackColor = false; - this.xrLabel18.StylePriority.UseFont = false; - this.xrLabel18.Text = "44805 Bochum"; - this.xrLabel18.WordWrap = false; - // - // xrLabel17 - // - this.xrLabel17.BackColor = System.Drawing.Color.Transparent; - this.xrLabel17.CanShrink = true; - this.xrLabel17.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(0F, 212.4584F); - this.xrLabel17.Name = "xrLabel17"; - this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel17.SizeF = new System.Drawing.SizeF(212.4167F, 20.00003F); - this.xrLabel17.StylePriority.UseBackColor = false; - this.xrLabel17.StylePriority.UseFont = false; - this.xrLabel17.Text = "Gerther Str. 31"; - this.xrLabel17.WordWrap = false; - // - // xrLabel16 - // - this.xrLabel16.BackColor = System.Drawing.Color.Transparent; - this.xrLabel16.CanShrink = true; - this.xrLabel16.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(0F, 192.4583F); - this.xrLabel16.Name = "xrLabel16"; - this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel16.SizeF = new System.Drawing.SizeF(212.4167F, 20.00003F); - this.xrLabel16.StylePriority.UseBackColor = false; - this.xrLabel16.StylePriority.UseFont = false; - this.xrLabel16.Text = "Christopherus-Schule Bochum"; - this.xrLabel16.WordWrap = false; + this.lblSchule.BackColor = System.Drawing.Color.Transparent; + this.lblSchule.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right))); + this.lblSchule.Font = new DevExpress.Drawing.DXFont("Arial", 9F); + this.lblSchule.LocationFloat = new DevExpress.Utils.PointFloat(0F, 192.4583F); + this.lblSchule.Multiline = true; + this.lblSchule.Name = "lblSchule"; + this.lblSchule.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblSchule.SizeF = new System.Drawing.SizeF(765F, 60F); + this.lblSchule.StylePriority.UseBackColor = false; + this.lblSchule.StylePriority.UseBorders = false; + this.lblSchule.StylePriority.UseFont = false; + this.lblSchule.Text = "Schule"; // // xrLabel13 // this.xrLabel13.BackColor = System.Drawing.Color.Transparent; - this.xrLabel13.CanShrink = true; - this.xrLabel13.Font = new DevExpress.Drawing.DXFont("Arial", 10F, ((DevExpress.Drawing.DXFontStyle)((DevExpress.Drawing.DXFontStyle.Bold | DevExpress.Drawing.DXFontStyle.Underline)))); - this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0F, 172.4583F); + this.xrLabel13.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrLabel13.Font = new DevExpress.Drawing.DXFont("Arial", 9F, ((DevExpress.Drawing.DXFontStyle)((DevExpress.Drawing.DXFontStyle.Bold | DevExpress.Drawing.DXFontStyle.Underline)))); + this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0F, 159.0415F); this.xrLabel13.Name = "xrLabel13"; this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel13.SizeF = new System.Drawing.SizeF(213.4167F, 20.00003F); + this.xrLabel13.SizeF = new System.Drawing.SizeF(764.9998F, 33.41679F); this.xrLabel13.StylePriority.UseBackColor = false; + this.xrLabel13.StylePriority.UseBorders = false; this.xrLabel13.StylePriority.UseFont = false; + this.xrLabel13.StylePriority.UseTextAlignment = false; this.xrLabel13.Text = "Einsatzort"; + this.xrLabel13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft; this.xrLabel13.WordWrap = false; // // xrLabel12 // this.xrLabel12.BackColor = System.Drawing.Color.Transparent; - this.xrLabel12.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrLabel12.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrLabel12.CanShrink = true; - this.xrLabel12.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel12.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold); this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 139.0415F); this.xrLabel12.Name = "xrLabel12"; this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -617,32 +571,32 @@ namespace ChristopherusHausMID this.xrLabel12.TextTrimming = DevExpress.Drawing.DXStringTrimming.None; this.xrLabel12.WordWrap = false; // - // xrLabel9 + // lblKategorie // - this.xrLabel9.BackColor = System.Drawing.Color.Transparent; - this.xrLabel9.CanShrink = true; - this.xrLabel9.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(490.0001F, 110.4167F); - this.xrLabel9.Name = "xrLabel9"; - this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel9.SizeF = new System.Drawing.SizeF(157.2084F, 28.62479F); - this.xrLabel9.StylePriority.UseBackColor = false; - this.xrLabel9.StylePriority.UseFont = false; - this.xrLabel9.Text = "Kategorie II"; - this.xrLabel9.WordWrap = false; + this.lblKategorie.BackColor = System.Drawing.Color.Transparent; + this.lblKategorie.CanShrink = true; + this.lblKategorie.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.lblKategorie.LocationFloat = new DevExpress.Utils.PointFloat(490.0001F, 110.4167F); + this.lblKategorie.Name = "lblKategorie"; + this.lblKategorie.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblKategorie.SizeF = new System.Drawing.SizeF(157.2084F, 28.62479F); + this.lblKategorie.StylePriority.UseBackColor = false; + this.lblKategorie.StylePriority.UseFont = false; + this.lblKategorie.Text = "Kategorie II"; + this.lblKategorie.WordWrap = false; // // xrLabel11 // this.xrLabel11.BackColor = System.Drawing.Color.Transparent; this.xrLabel11.CanShrink = true; this.xrLabel11.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(489.9998F, 79.99992F); + this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(489.9998F, 79.9999F); this.xrLabel11.Name = "xrLabel11"; this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel11.SizeF = new System.Drawing.SizeF(157.2084F, 20.00002F); + this.xrLabel11.SizeF = new System.Drawing.SizeF(265.0002F, 20.00001F); this.xrLabel11.StylePriority.UseBackColor = false; this.xrLabel11.StylePriority.UseFont = false; - this.xrLabel11.Text = "AZ [CustomerReferenceNumber]"; + this.xrLabel11.Text = "Vers.-Nr. [ServiceInvoice.CustomerInsuranceNumber]"; this.xrLabel11.WordWrap = false; // // lblBewilligungVom @@ -650,12 +604,12 @@ namespace ChristopherusHausMID this.lblBewilligungVom.BackColor = System.Drawing.Color.Transparent; this.lblBewilligungVom.CanShrink = true; this.lblBewilligungVom.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDateTime")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoice.ApprovalDate")}); this.lblBewilligungVom.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.lblBewilligungVom.LocationFloat = new DevExpress.Utils.PointFloat(647.2088F, 59.99991F); + this.lblBewilligungVom.LocationFloat = new DevExpress.Utils.PointFloat(619.3317F, 59.9999F); this.lblBewilligungVom.Name = "lblBewilligungVom"; this.lblBewilligungVom.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.lblBewilligungVom.SizeF = new System.Drawing.SizeF(101.0001F, 20.00002F); + this.lblBewilligungVom.SizeF = new System.Drawing.SizeF(135.669F, 20.00002F); this.lblBewilligungVom.StylePriority.UseBackColor = false; this.lblBewilligungVom.StylePriority.UseFont = false; this.lblBewilligungVom.StylePriority.UseTextAlignment = false; @@ -668,10 +622,10 @@ namespace ChristopherusHausMID this.xrLabel10.BackColor = System.Drawing.Color.Transparent; this.xrLabel10.CanShrink = true; this.xrLabel10.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(489.9998F, 59.99991F); + this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(489.9998F, 59.9999F); this.xrLabel10.Name = "xrLabel10"; this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel10.SizeF = new System.Drawing.SizeF(157.2084F, 20.00002F); + this.xrLabel10.SizeF = new System.Drawing.SizeF(129.3311F, 20.00001F); this.xrLabel10.StylePriority.UseBackColor = false; this.xrLabel10.StylePriority.UseFont = false; this.xrLabel10.Text = "Bewilligung vom"; @@ -681,14 +635,14 @@ namespace ChristopherusHausMID // this.xrLabel6.BackColor = System.Drawing.Color.Transparent; this.xrLabel6.CanShrink = true; - this.xrLabel6.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(490F, 39.99996F); + this.xrLabel6.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(490F, 39.99995F); this.xrLabel6.Name = "xrLabel6"; this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel6.SizeF = new System.Drawing.SizeF(157.2084F, 20.00002F); + this.xrLabel6.SizeF = new System.Drawing.SizeF(129.3311F, 20.00002F); this.xrLabel6.StylePriority.UseBackColor = false; this.xrLabel6.StylePriority.UseFont = false; - this.xrLabel6.Text = "Abrechnungsmonat"; + this.xrLabel6.Text = "Abr. Monat"; this.xrLabel6.WordWrap = false; // // xrLabel8 @@ -696,17 +650,17 @@ namespace ChristopherusHausMID this.xrLabel8.BackColor = System.Drawing.Color.Transparent; this.xrLabel8.CanShrink = true; this.xrLabel8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDateTime")}); - this.xrLabel8.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(647.2088F, 39.99996F); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoice.InvoiceDateTime")}); + this.xrLabel8.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(619.3317F, 39.99995F); this.xrLabel8.Name = "xrLabel8"; this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel8.SizeF = new System.Drawing.SizeF(101.0001F, 20.00002F); + this.xrLabel8.SizeF = new System.Drawing.SizeF(135.669F, 20.00002F); this.xrLabel8.StylePriority.UseBackColor = false; this.xrLabel8.StylePriority.UseFont = false; this.xrLabel8.StylePriority.UseTextAlignment = false; this.xrLabel8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrLabel8.TextFormatString = "{0:MMMM yyyy}"; + this.xrLabel8.TextFormatString = "{0:MMM yyyy}"; this.xrLabel8.WordWrap = false; // // xrLabel4 @@ -714,12 +668,12 @@ namespace ChristopherusHausMID this.xrLabel4.BackColor = System.Drawing.Color.Transparent; this.xrLabel4.CanShrink = true; this.xrLabel4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceNumber")}); - this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(647.2083F, 0F); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoice.InvoiceNumber")}); + this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(619.3312F, 0F); this.xrLabel4.Name = "xrLabel4"; this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel4.SizeF = new System.Drawing.SizeF(100.9999F, 20F); + this.xrLabel4.SizeF = new System.Drawing.SizeF(135.6688F, 20F); this.xrLabel4.StylePriority.UseBackColor = false; this.xrLabel4.StylePriority.UseFont = false; this.xrLabel4.StylePriority.UseTextAlignment = false; @@ -731,39 +685,27 @@ namespace ChristopherusHausMID this.xrLabel5.BackColor = System.Drawing.Color.Transparent; this.xrLabel5.CanShrink = true; this.xrLabel5.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")}); - this.xrLabel5.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(647.2085F, 19.99989F); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoice.InvoiceDate")}); + this.xrLabel5.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(619.3312F, 19.9999F); this.xrLabel5.Name = "xrLabel5"; this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel5.SizeF = new System.Drawing.SizeF(101.0001F, 20F); + this.xrLabel5.SizeF = new System.Drawing.SizeF(135.669F, 20F); this.xrLabel5.StylePriority.UseBackColor = false; this.xrLabel5.StylePriority.UseFont = false; this.xrLabel5.StylePriority.UseTextAlignment = false; this.xrLabel5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; this.xrLabel5.WordWrap = false; - // - // xrLabel7 - // - this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(17.5F, 226F); - this.xrLabel7.Multiline = true; - this.xrLabel7.Name = "xrLabel7"; - this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel7.SizeF = new System.Drawing.SizeF(317F, 83.37503F); - this.xrLabel7.StylePriority.UseFont = false; - this.xrLabel7.Text = "[RecipientOrganisation]\r\n[RecipientContactPerson]\r\n[RecipientDivision]\r\n[Recipien" + - "tStreet]\r\n[RecipientPostCodeAndTown]"; // // xrLabel3 // this.xrLabel3.BackColor = System.Drawing.Color.Transparent; this.xrLabel3.CanShrink = true; - this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(490F, 19.99989F); + this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(490F, 19.9999F); this.xrLabel3.Name = "xrLabel3"; this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel3.SizeF = new System.Drawing.SizeF(157.2085F, 20F); + this.xrLabel3.SizeF = new System.Drawing.SizeF(129.3312F, 20F); this.xrLabel3.StylePriority.UseBackColor = false; this.xrLabel3.StylePriority.UseFont = false; this.xrLabel3.Text = "Datum "; @@ -773,53 +715,36 @@ namespace ChristopherusHausMID // this.xrLabel2.BackColor = System.Drawing.Color.Transparent; this.xrLabel2.CanShrink = true; - this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold); this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(490F, 0F); this.xrLabel2.Name = "xrLabel2"; this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel2.SizeF = new System.Drawing.SizeF(157.2084F, 20F); + this.xrLabel2.SizeF = new System.Drawing.SizeF(129.3311F, 20F); this.xrLabel2.StylePriority.UseBackColor = false; this.xrLabel2.StylePriority.UseFont = false; - this.xrLabel2.Text = "Rechnungsnummer"; + this.xrLabel2.Text = "Rechnung Nr."; this.xrLabel2.WordWrap = false; // // DetailReport // this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { - this.Detail1, - this.DetailReport2}); - this.DetailReport.DataMember = "ServiceInvoicePeriods"; + this.Detail1}); + this.DetailReport.DataMember = "WeitereRechnungspositionen"; this.DetailReport.DataSource = this.bindingSource1; this.DetailReport.Level = 0; this.DetailReport.Name = "DetailReport"; // // Detail1 // - this.Detail1.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); - this.Detail1.HeightF = 0F; + this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable1}); + this.Detail1.HeightF = 26.54215F; this.Detail1.Name = "Detail1"; this.Detail1.StylePriority.UseFont = false; // - // DetailReport2 - // - this.DetailReport2.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { - this.Detail3, - this.GroupFooter1}); - this.DetailReport2.DataMember = "ServiceInvoicePeriods.ServiceInvoiceItems"; - this.DetailReport2.DataSource = this.bindingSource1; - this.DetailReport2.Level = 0; - this.DetailReport2.Name = "DetailReport2"; - // - // Detail3 - // - this.Detail3.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrTable1}); - this.Detail3.HeightF = 26.54215F; - this.Detail3.Name = "Detail3"; - // // xrTable1 // - this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0.0002034505F, 0F); this.xrTable1.Name = "xrTable1"; this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow1}); @@ -849,7 +774,10 @@ namespace ChristopherusHausMID // this.xrTableCell14.BackColor = System.Drawing.Color.Transparent; this.xrTableCell14.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell14.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell14.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "WeitereRechnungspositionen.Position")}); this.xrTableCell14.Font = new DevExpress.Drawing.DXFont("Arial", 8F); this.xrTableCell14.Name = "xrTableCell14"; this.xrTableCell14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); @@ -859,10 +787,10 @@ namespace ChristopherusHausMID this.xrTableCell14.StylePriority.UseFont = false; this.xrTableCell14.StylePriority.UsePadding = false; this.xrTableCell14.StylePriority.UseTextAlignment = false; - xrSummary1.FormatString = "{0:0}"; - xrSummary1.Func = DevExpress.XtraReports.UI.SummaryFunc.RecordNumber; - xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Report; - this.xrTableCell14.Summary = xrSummary1; + xrSummary2.FormatString = "{0:0}"; + xrSummary2.Func = DevExpress.XtraReports.UI.SummaryFunc.RecordNumber; + xrSummary2.Running = DevExpress.XtraReports.UI.SummaryRunning.Report; + this.xrTableCell14.Summary = xrSummary2; this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; this.xrTableCell14.Weight = 0.8258043660348906D; // @@ -870,153 +798,165 @@ namespace ChristopherusHausMID // this.xrTableCell15.BackColor = System.Drawing.Color.Transparent; this.xrTableCell15.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell15.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell15.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right))); this.xrTableCell15.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.Customer.FullName")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "WeitereRechnungspositionen.CustomerName")}); this.xrTableCell15.Font = new DevExpress.Drawing.DXFont("Arial", 8F); this.xrTableCell15.Multiline = true; this.xrTableCell15.Name = "xrTableCell15"; - this.xrTableCell15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell15.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 0, 100F); this.xrTableCell15.StylePriority.UseBackColor = false; this.xrTableCell15.StylePriority.UseBorderColor = false; this.xrTableCell15.StylePriority.UseBorders = false; this.xrTableCell15.StylePriority.UseFont = false; this.xrTableCell15.StylePriority.UsePadding = false; this.xrTableCell15.StylePriority.UseTextAlignment = false; - this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; this.xrTableCell15.Weight = 2.7391234297526954D; // // xrTableCell16 // this.xrTableCell16.BackColor = System.Drawing.Color.Transparent; this.xrTableCell16.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell16.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell16.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right))); this.xrTableCell16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.SupportConceptApprovalPeriod.ApprovedBEPerInterval")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "WeitereRechnungspositionen.BewilligtProWoche")}); this.xrTableCell16.Font = new DevExpress.Drawing.DXFont("Arial", 8F); this.xrTableCell16.Multiline = true; this.xrTableCell16.Name = "xrTableCell16"; - this.xrTableCell16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell16.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 2, 0, 0, 100F); this.xrTableCell16.StylePriority.UseBackColor = false; this.xrTableCell16.StylePriority.UseBorderColor = false; this.xrTableCell16.StylePriority.UseBorders = false; this.xrTableCell16.StylePriority.UseFont = false; this.xrTableCell16.StylePriority.UsePadding = false; this.xrTableCell16.StylePriority.UseTextAlignment = false; - this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; this.xrTableCell16.TextFormatString = "{0:0.00}"; - this.xrTableCell16.Weight = 1.8434238902708935D; + this.xrTableCell16.Weight = 1.9334924156454902D; // // xrTableCell17 // this.xrTableCell17.BackColor = System.Drawing.Color.Transparent; this.xrTableCell17.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell17.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell17.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right))); this.xrTableCell17.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.Notice")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "WeitereRechnungspositionen.Fehltage")}); this.xrTableCell17.Font = new DevExpress.Drawing.DXFont("Arial", 8F); this.xrTableCell17.Multiline = true; this.xrTableCell17.Name = "xrTableCell17"; - this.xrTableCell17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell17.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 2, 0, 0, 100F); this.xrTableCell17.StylePriority.UseBackColor = false; this.xrTableCell17.StylePriority.UseBorderColor = false; this.xrTableCell17.StylePriority.UseBorders = false; this.xrTableCell17.StylePriority.UseFont = false; this.xrTableCell17.StylePriority.UsePadding = false; this.xrTableCell17.StylePriority.UseTextAlignment = false; - this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell17.Weight = 1.7723740103520469D; + this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell17.Weight = 1.2889993735091139D; // // xrTableCell18 // this.xrTableCell18.BackColor = System.Drawing.Color.Transparent; this.xrTableCell18.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell18.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell18.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right))); this.xrTableCell18.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.fieldAnteilAnRechnung")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "WeitereRechnungspositionen.Rechungsanteil")}); this.xrTableCell18.Font = new DevExpress.Drawing.DXFont("Arial", 8F); this.xrTableCell18.Multiline = true; this.xrTableCell18.Name = "xrTableCell18"; - this.xrTableCell18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell18.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 2, 0, 0, 100F); this.xrTableCell18.StylePriority.UseBackColor = false; this.xrTableCell18.StylePriority.UseBorderColor = false; this.xrTableCell18.StylePriority.UseBorders = false; this.xrTableCell18.StylePriority.UseFont = false; this.xrTableCell18.StylePriority.UsePadding = false; this.xrTableCell18.StylePriority.UseTextAlignment = false; - this.xrTableCell18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; this.xrTableCell18.TextFormatString = "{0:0.00}%"; - this.xrTableCell18.Weight = 1.9334989184548541D; + this.xrTableCell18.Weight = 1.9334990413834123D; // // xrTableCell19 // this.xrTableCell19.BackColor = System.Drawing.Color.Transparent; this.xrTableCell19.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell19.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell19.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right))); this.xrTableCell19.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.AmountPerUnit")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "WeitereRechnungspositionen.Stundensatz")}); this.xrTableCell19.Font = new DevExpress.Drawing.DXFont("Arial", 8F); this.xrTableCell19.Multiline = true; this.xrTableCell19.Name = "xrTableCell19"; - this.xrTableCell19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell19.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 2, 0, 0, 100F); this.xrTableCell19.StylePriority.UseBackColor = false; this.xrTableCell19.StylePriority.UseBorderColor = false; this.xrTableCell19.StylePriority.UseBorders = false; this.xrTableCell19.StylePriority.UseFont = false; this.xrTableCell19.StylePriority.UsePadding = false; this.xrTableCell19.StylePriority.UseTextAlignment = false; - this.xrTableCell19.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell19.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; this.xrTableCell19.TextFormatString = "{0:C}"; - this.xrTableCell19.Weight = 1.7401490287314854D; + this.xrTableCell19.Weight = 1.6112490927924212D; // // xrTableCell20 // this.xrTableCell20.BackColor = System.Drawing.Color.Transparent; this.xrTableCell20.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell20.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell20.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "WeitereRechnungspositionen.Stunden5Prozent10")}); this.xrTableCell20.Font = new DevExpress.Drawing.DXFont("Arial", 8F); this.xrTableCell20.Multiline = true; this.xrTableCell20.Name = "xrTableCell20"; - this.xrTableCell20.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell20.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 2, 0, 0, 100F); this.xrTableCell20.StylePriority.UseBackColor = false; this.xrTableCell20.StylePriority.UseBorderColor = false; this.xrTableCell20.StylePriority.UseBorders = false; this.xrTableCell20.StylePriority.UseFont = false; this.xrTableCell20.StylePriority.UsePadding = false; this.xrTableCell20.StylePriority.UseTextAlignment = false; - this.xrTableCell20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell20.Weight = 1.6112489904513003D; + this.xrTableCell20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell20.Weight = 1.7401491722474813D; // // xrTableCell21 // this.xrTableCell21.BackColor = System.Drawing.Color.Transparent; this.xrTableCell21.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell21.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell21.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right))); this.xrTableCell21.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.UnitCount")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "WeitereRechnungspositionen.BetreuteStunden10")}); this.xrTableCell21.Font = new DevExpress.Drawing.DXFont("Arial", 8F); this.xrTableCell21.Multiline = true; this.xrTableCell21.Name = "xrTableCell21"; - this.xrTableCell21.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell21.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 2, 0, 0, 100F); this.xrTableCell21.StylePriority.UseBackColor = false; this.xrTableCell21.StylePriority.UseBorderColor = false; this.xrTableCell21.StylePriority.UseBorders = false; this.xrTableCell21.StylePriority.UseFont = false; this.xrTableCell21.StylePriority.UsePadding = false; this.xrTableCell21.StylePriority.UseTextAlignment = false; - this.xrTableCell21.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell21.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; this.xrTableCell21.TextFormatString = "{0:0.00} h"; - this.xrTableCell21.Weight = 1.6112489904513003D; + this.xrTableCell21.Weight = 1.7401491722474811D; // // xrTableCell22 // this.xrTableCell22.BackColor = System.Drawing.Color.Transparent; this.xrTableCell22.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell22.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell22.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell22.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "WeitereRechnungspositionen.BetreuteStunden11")}); this.xrTableCell22.Font = new DevExpress.Drawing.DXFont("Arial", 8F); this.xrTableCell22.Multiline = true; this.xrTableCell22.Name = "xrTableCell22"; - this.xrTableCell22.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell22.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 2, 0, 0, 100F); this.xrTableCell22.StylePriority.UseBackColor = false; this.xrTableCell22.StylePriority.UseBorderColor = false; this.xrTableCell22.StylePriority.UseBorders = false; @@ -1024,36 +964,42 @@ namespace ChristopherusHausMID this.xrTableCell22.StylePriority.UsePadding = false; this.xrTableCell22.StylePriority.UseTextAlignment = false; this.xrTableCell22.Text = "0,00 h"; - this.xrTableCell22.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell22.Weight = 1.6112491133798452D; + this.xrTableCell22.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell22.Weight = 1.740149172247468D; // // xrTableCell23 // this.xrTableCell23.BackColor = System.Drawing.Color.Transparent; this.xrTableCell23.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell23.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell23.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell23.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "WeitereRechnungspositionen.BetreuteStunden12")}); this.xrTableCell23.Font = new DevExpress.Drawing.DXFont("Arial", 8F); this.xrTableCell23.Multiline = true; this.xrTableCell23.Name = "xrTableCell23"; - this.xrTableCell23.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell23.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 2, 0, 0, 100F); this.xrTableCell23.StylePriority.UseBackColor = false; this.xrTableCell23.StylePriority.UseBorderColor = false; this.xrTableCell23.StylePriority.UseBorders = false; this.xrTableCell23.StylePriority.UseFont = false; this.xrTableCell23.StylePriority.UsePadding = false; this.xrTableCell23.StylePriority.UseTextAlignment = false; - this.xrTableCell23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell23.Weight = 1.6112491133798457D; + this.xrTableCell23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell23.Weight = 1.7401491722474685D; // // xrTableCell24 // this.xrTableCell24.BackColor = System.Drawing.Color.Transparent; this.xrTableCell24.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell24.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell24.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell24.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "WeitereRechnungspositionen.BetreuteStunden13")}); this.xrTableCell24.Font = new DevExpress.Drawing.DXFont("Arial", 8F); this.xrTableCell24.Multiline = true; this.xrTableCell24.Name = "xrTableCell24"; - this.xrTableCell24.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell24.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 2, 0, 0, 100F); this.xrTableCell24.StylePriority.UseBackColor = false; this.xrTableCell24.StylePriority.UseBorderColor = false; this.xrTableCell24.StylePriority.UseBorders = false; @@ -1061,18 +1007,21 @@ namespace ChristopherusHausMID this.xrTableCell24.StylePriority.UsePadding = false; this.xrTableCell24.StylePriority.UseTextAlignment = false; this.xrTableCell24.Text = "0,00 h"; - this.xrTableCell24.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell24.Weight = 1.6112491133798452D; + this.xrTableCell24.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell24.Weight = 1.7401491722474678D; // // xrTableCell25 // this.xrTableCell25.BackColor = System.Drawing.Color.Transparent; this.xrTableCell25.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell25.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell25.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell25.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "WeitereRechnungspositionen.BetreuteStunden14")}); this.xrTableCell25.Font = new DevExpress.Drawing.DXFont("Arial", 8F); this.xrTableCell25.Multiline = true; this.xrTableCell25.Name = "xrTableCell25"; - this.xrTableCell25.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell25.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 2, 0, 0, 100F); this.xrTableCell25.StylePriority.UseBackColor = false; this.xrTableCell25.StylePriority.UseBorderColor = false; this.xrTableCell25.StylePriority.UseBorders = false; @@ -1080,18 +1029,21 @@ namespace ChristopherusHausMID this.xrTableCell25.StylePriority.UsePadding = false; this.xrTableCell25.StylePriority.UseTextAlignment = false; this.xrTableCell25.Text = "0,00 h"; - this.xrTableCell25.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell25.Weight = 1.6112493592369357D; + this.xrTableCell25.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell25.Weight = 1.7401491722474418D; // // xrTableCell26 // this.xrTableCell26.BackColor = System.Drawing.Color.Transparent; this.xrTableCell26.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell26.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell26.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell26.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "WeitereRechnungspositionen.BetreuteStunden15")}); this.xrTableCell26.Font = new DevExpress.Drawing.DXFont("Arial", 8F); this.xrTableCell26.Multiline = true; this.xrTableCell26.Name = "xrTableCell26"; - this.xrTableCell26.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell26.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 2, 0, 0, 100F); this.xrTableCell26.StylePriority.UseBackColor = false; this.xrTableCell26.StylePriority.UseBorderColor = false; this.xrTableCell26.StylePriority.UseBorders = false; @@ -1099,33 +1051,29 @@ namespace ChristopherusHausMID this.xrTableCell26.StylePriority.UsePadding = false; this.xrTableCell26.StylePriority.UseTextAlignment = false; this.xrTableCell26.Text = "0,00 h"; - this.xrTableCell26.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell26.Weight = 1.6112493592369357D; + this.xrTableCell26.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell26.Weight = 1.7401491722474416D; // // xrTableCell27 // this.xrTableCell27.BackColor = System.Drawing.Color.Transparent; this.xrTableCell27.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell27.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell27.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right))); this.xrTableCell27.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.GrossAmount")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "WeitereRechnungspositionen.GesamtBetrag")}); this.xrTableCell27.Font = new DevExpress.Drawing.DXFont("Arial", 8F); this.xrTableCell27.Multiline = true; this.xrTableCell27.Name = "xrTableCell27"; - this.xrTableCell27.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell27.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 2, 0, 0, 100F); this.xrTableCell27.StylePriority.UseBackColor = false; this.xrTableCell27.StylePriority.UseBorderColor = false; this.xrTableCell27.StylePriority.UseBorders = false; this.xrTableCell27.StylePriority.UseFont = false; this.xrTableCell27.StylePriority.UsePadding = false; this.xrTableCell27.StylePriority.UseTextAlignment = false; - this.xrTableCell27.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell27.Weight = 2.5189911315193161D; - // - // GroupFooter1 - // - this.GroupFooter1.HeightF = 0F; - this.GroupFooter1.Name = "GroupFooter1"; + this.xrTableCell27.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell27.Weight = 2.1388968897819165D; // // fieldAnteilAnRechnung // @@ -1164,7 +1112,218 @@ namespace ChristopherusHausMID this.xrLabel24}); this.ReportFooter.HeightF = 282.3737F; this.ReportFooter.Name = "ReportFooter"; - this.ReportFooter.PageBreak = DevExpress.XtraReports.UI.PageBreak.BeforeBand; + // + // xrLabel25 + // + this.xrLabel25.BackColor = System.Drawing.Color.Transparent; + this.xrLabel25.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrLabel25.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.UnitCount")}); + this.xrLabel25.Font = new DevExpress.Drawing.DXFont("Arial", 9F); + this.xrLabel25.LocationFloat = new DevExpress.Utils.PointFloat(157.6261F, 69.9999F); + this.xrLabel25.Name = "xrLabel25"; + this.xrLabel25.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel25.SizeF = new System.Drawing.SizeF(53.00008F, 20.00002F); + this.xrLabel25.StylePriority.UseBackColor = false; + this.xrLabel25.StylePriority.UseBorders = false; + this.xrLabel25.StylePriority.UseFont = false; + xrSummary3.FormatString = "{0:0.00}"; + xrSummary3.Running = DevExpress.XtraReports.UI.SummaryRunning.Report; + this.xrLabel25.Summary = xrSummary3; + this.xrLabel25.WordWrap = false; + // + // xrLabel26 + // + this.xrLabel26.BackColor = System.Drawing.Color.Transparent; + this.xrLabel26.Borders = DevExpress.XtraPrinting.BorderSide.Right; + this.xrLabel26.Font = new DevExpress.Drawing.DXFont("Arial", 9F); + this.xrLabel26.LocationFloat = new DevExpress.Utils.PointFloat(157.6261F, 49.9999F); + this.xrLabel26.Name = "xrLabel26"; + this.xrLabel26.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel26.SizeF = new System.Drawing.SizeF(53.00008F, 20.00002F); + this.xrLabel26.StylePriority.UseBackColor = false; + this.xrLabel26.StylePriority.UseBorders = false; + this.xrLabel26.StylePriority.UseFont = false; + this.xrLabel26.Text = "[fieldAbweichungIstSoll] %"; + this.xrLabel26.WordWrap = false; + // + // xrLabel27 + // + this.xrLabel27.BackColor = System.Drawing.Color.Transparent; + this.xrLabel27.Borders = DevExpress.XtraPrinting.BorderSide.Right; + this.xrLabel27.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.UnitCount")}); + this.xrLabel27.Font = new DevExpress.Drawing.DXFont("Arial", 9F); + this.xrLabel27.LocationFloat = new DevExpress.Utils.PointFloat(157.6261F, 30.0001F); + this.xrLabel27.Name = "xrLabel27"; + this.xrLabel27.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel27.SizeF = new System.Drawing.SizeF(53.00008F, 20.00003F); + this.xrLabel27.StylePriority.UseBackColor = false; + this.xrLabel27.StylePriority.UseBorders = false; + this.xrLabel27.StylePriority.UseFont = false; + xrSummary4.FormatString = "{0:0.00}"; + xrSummary4.Running = DevExpress.XtraReports.UI.SummaryRunning.Report; + this.xrLabel27.Summary = xrSummary4; + this.xrLabel27.WordWrap = false; + // + // xrLabel28 + // + this.xrLabel28.BackColor = System.Drawing.Color.Transparent; + this.xrLabel28.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrLabel28.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ApprovedHours")}); + this.xrLabel28.Font = new DevExpress.Drawing.DXFont("Arial", 9F); + this.xrLabel28.LocationFloat = new DevExpress.Utils.PointFloat(157.6261F, 9.999898F); + this.xrLabel28.Name = "xrLabel28"; + this.xrLabel28.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel28.SizeF = new System.Drawing.SizeF(53.00008F, 20.00003F); + this.xrLabel28.StylePriority.UseBackColor = false; + this.xrLabel28.StylePriority.UseBorders = false; + this.xrLabel28.StylePriority.UseFont = false; + xrSummary5.FormatString = "{0:0.00}"; + xrSummary5.Running = DevExpress.XtraReports.UI.SummaryRunning.Report; + this.xrLabel28.Summary = xrSummary5; + this.xrLabel28.WordWrap = false; + // + // xrLabel20 + // + this.xrLabel20.BackColor = System.Drawing.Color.Transparent; + this.xrLabel20.Borders = DevExpress.XtraPrinting.BorderSide.Left; + this.xrLabel20.Font = new DevExpress.Drawing.DXFont("Arial", 9F); + this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(25.62622F, 49.99868F); + this.xrLabel20.Name = "xrLabel20"; + this.xrLabel20.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel20.SizeF = new System.Drawing.SizeF(131.9999F, 20.00003F); + this.xrLabel20.StylePriority.UseBackColor = false; + this.xrLabel20.StylePriority.UseBorders = false; + this.xrLabel20.StylePriority.UseFont = false; + this.xrLabel20.Text = "Abweichung"; + this.xrLabel20.WordWrap = false; + // + // xrLabel15 + // + this.xrLabel15.BackColor = System.Drawing.Color.Transparent; + this.xrLabel15.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrLabel15.Font = new DevExpress.Drawing.DXFont("Arial", 9F); + this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(25.62622F, 69.99857F); + this.xrLabel15.Name = "xrLabel15"; + this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 0, 0, 0, 100F); + this.xrLabel15.SizeF = new System.Drawing.SizeF(132F, 20F); + this.xrLabel15.StylePriority.UseBackColor = false; + this.xrLabel15.StylePriority.UseBorders = false; + this.xrLabel15.StylePriority.UseFont = false; + this.xrLabel15.StylePriority.UsePadding = false; + this.xrLabel15.Text = "abgerechnete Stunden"; + this.xrLabel15.WordWrap = false; + // + // xrLabel14 + // + this.xrLabel14.BackColor = System.Drawing.Color.Transparent; + this.xrLabel14.Borders = DevExpress.XtraPrinting.BorderSide.Left; + this.xrLabel14.Font = new DevExpress.Drawing.DXFont("Arial", 9F); + this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(25.62622F, 30.0001F); + this.xrLabel14.Name = "xrLabel14"; + this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel14.SizeF = new System.Drawing.SizeF(131.9999F, 19.99849F); + this.xrLabel14.StylePriority.UseBackColor = false; + this.xrLabel14.StylePriority.UseBorders = false; + this.xrLabel14.StylePriority.UseFont = false; + this.xrLabel14.Text = "Ist-Stunden"; + this.xrLabel14.WordWrap = false; + // + // xrLabel1 + // + this.xrLabel1.BackColor = System.Drawing.Color.Transparent; + this.xrLabel1.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top))); + this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 9F); + this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(25.62622F, 10F); + this.xrLabel1.Name = "xrLabel1"; + this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel1.SizeF = new System.Drawing.SizeF(131.9999F, 20.00003F); + this.xrLabel1.StylePriority.UseBackColor = false; + this.xrLabel1.StylePriority.UseBorders = false; + this.xrLabel1.StylePriority.UseFont = false; + this.xrLabel1.Text = "Sollstunden"; + this.xrLabel1.WordWrap = false; + // + // xrLabel21 + // + this.xrLabel21.BackColor = System.Drawing.Color.Transparent; + this.xrLabel21.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrLabel21.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel21.LocationFloat = new DevExpress.Utils.PointFloat(0F, 116.4574F); + this.xrLabel21.Name = "xrLabel21"; + this.xrLabel21.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel21.SizeF = new System.Drawing.SizeF(386.831F, 52.29167F); + this.xrLabel21.StylePriority.UseBackColor = false; + this.xrLabel21.StylePriority.UseBorders = false; + this.xrLabel21.StylePriority.UseFont = false; + this.xrLabel21.StylePriority.UseTextAlignment = false; + this.xrLabel21.Text = "Rechnungsbetrag"; + this.xrLabel21.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrLabel21.TextTrimming = DevExpress.Drawing.DXStringTrimming.None; + this.xrLabel21.WordWrap = false; + // + // xrLabel22 + // + this.xrLabel22.BackColor = System.Drawing.Color.Transparent; + this.xrLabel22.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrLabel22.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoice.GrossClaim")}); + this.xrLabel22.Font = new DevExpress.Drawing.DXFont("Arial", 10F, ((DevExpress.Drawing.DXFontStyle)((DevExpress.Drawing.DXFontStyle.Bold | DevExpress.Drawing.DXFontStyle.Underline)))); + this.xrLabel22.LocationFloat = new DevExpress.Utils.PointFloat(386.8311F, 116.4574F); + this.xrLabel22.Name = "xrLabel22"; + this.xrLabel22.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel22.SizeF = new System.Drawing.SizeF(378.1687F, 52.29167F); + this.xrLabel22.StylePriority.UseBackColor = false; + this.xrLabel22.StylePriority.UseBorders = false; + this.xrLabel22.StylePriority.UseFont = false; + this.xrLabel22.StylePriority.UseTextAlignment = false; + this.xrLabel22.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrLabel22.TextTrimming = DevExpress.Drawing.DXStringTrimming.None; + this.xrLabel22.WordWrap = false; + // + // xrLabel23 + // + this.xrLabel23.BackColor = System.Drawing.Color.Transparent; + this.xrLabel23.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrLabel23.CanShrink = true; + this.xrLabel23.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel23.LocationFloat = new DevExpress.Utils.PointFloat(0F, 168.7491F); + this.xrLabel23.Multiline = true; + this.xrLabel23.Name = "xrLabel23"; + this.xrLabel23.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel23.SizeF = new System.Drawing.SizeF(765F, 33.54169F); + this.xrLabel23.StylePriority.UseBackColor = false; + this.xrLabel23.StylePriority.UseBorders = false; + this.xrLabel23.StylePriority.UseFont = false; + this.xrLabel23.StylePriority.UseTextAlignment = false; + this.xrLabel23.Text = "Die Leistung ist nach § 4 UstG von der Umsatzsteuer befreit.\r\nIK 512591190"; + this.xrLabel23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.xrLabel23.TextTrimming = DevExpress.Drawing.DXStringTrimming.None; + this.xrLabel23.WordWrap = false; + // + // xrLabel24 + // + this.xrLabel24.BackColor = System.Drawing.Color.Transparent; + this.xrLabel24.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; + this.xrLabel24.CanShrink = true; + this.xrLabel24.Font = new DevExpress.Drawing.DXFont("Arial", 8F); + this.xrLabel24.LocationFloat = new DevExpress.Utils.PointFloat(0F, 212.2908F); + this.xrLabel24.Multiline = true; + this.xrLabel24.Name = "xrLabel24"; + this.xrLabel24.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel24.SizeF = new System.Drawing.SizeF(765F, 70.08286F); + this.xrLabel24.StylePriority.UseBackColor = false; + this.xrLabel24.StylePriority.UseBorders = false; + this.xrLabel24.StylePriority.UseFont = false; + this.xrLabel24.StylePriority.UseTextAlignment = false; + this.xrLabel24.Text = "Wir bitten um Überweisung unter Angabe der o. g. Rechnungsnummer auf folgendes Ko" + + "nto:\r\nStadtsparkasse Dortmund\r\nBIC: DORTDE33XXX\r\nIBAN: DE96 4405 0199 0241 0091 " + + "57"; + this.xrLabel24.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.xrLabel24.TextTrimming = DevExpress.Drawing.DXStringTrimming.None; + this.xrLabel24.WordWrap = false; // // xrTable3 // @@ -1198,7 +1357,9 @@ namespace ChristopherusHausMID // this.xrTableCell43.BackColor = System.Drawing.Color.Transparent; this.xrTableCell43.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell43.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell43.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell43.Font = new DevExpress.Drawing.DXFont("Arial", 8F); this.xrTableCell43.Name = "xrTableCell43"; this.xrTableCell43.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); @@ -1208,9 +1369,9 @@ namespace ChristopherusHausMID this.xrTableCell43.StylePriority.UseFont = false; this.xrTableCell43.StylePriority.UsePadding = false; this.xrTableCell43.StylePriority.UseTextAlignment = false; - xrSummary5.FormatString = "{0:0}"; - xrSummary5.Func = DevExpress.XtraReports.UI.SummaryFunc.RecordNumber; - this.xrTableCell43.Summary = xrSummary5; + xrSummary6.FormatString = "{0:0}"; + xrSummary6.Func = DevExpress.XtraReports.UI.SummaryFunc.RecordNumber; + this.xrTableCell43.Summary = xrSummary6; this.xrTableCell43.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; this.xrTableCell43.Weight = 0.8258043660348906D; // @@ -1218,7 +1379,9 @@ namespace ChristopherusHausMID // this.xrTableCell44.BackColor = System.Drawing.Color.Transparent; this.xrTableCell44.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell44.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell44.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell44.Font = new DevExpress.Drawing.DXFont("Arial", 8F); this.xrTableCell44.Multiline = true; this.xrTableCell44.Name = "xrTableCell44"; @@ -1236,7 +1399,9 @@ namespace ChristopherusHausMID // this.xrTableCell45.BackColor = System.Drawing.Color.Transparent; this.xrTableCell45.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell45.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell45.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell45.Font = new DevExpress.Drawing.DXFont("Arial", 8F); this.xrTableCell45.Multiline = true; this.xrTableCell45.Name = "xrTableCell45"; @@ -1249,13 +1414,15 @@ namespace ChristopherusHausMID this.xrTableCell45.StylePriority.UseTextAlignment = false; this.xrTableCell45.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; this.xrTableCell45.TextFormatString = "{0:0.00}"; - this.xrTableCell45.Weight = 1.8434238902708935D; + this.xrTableCell45.Weight = 1.933499053787638D; // // xrTableCell46 // this.xrTableCell46.BackColor = System.Drawing.Color.Transparent; this.xrTableCell46.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell46.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell46.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell46.Font = new DevExpress.Drawing.DXFont("Arial", 8F); this.xrTableCell46.Multiline = true; this.xrTableCell46.Name = "xrTableCell46"; @@ -1267,17 +1434,19 @@ namespace ChristopherusHausMID this.xrTableCell46.StylePriority.UsePadding = false; this.xrTableCell46.StylePriority.UseTextAlignment = false; this.xrTableCell46.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell46.Weight = 1.7723740103520469D; + this.xrTableCell46.Weight = 1.2889993735091139D; // // xrTableCell47 // this.xrTableCell47.BackColor = System.Drawing.Color.Transparent; this.xrTableCell47.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell47.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell47.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell47.Font = new DevExpress.Drawing.DXFont("Arial", 8F); this.xrTableCell47.Multiline = true; this.xrTableCell47.Name = "xrTableCell47"; - this.xrTableCell47.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell47.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 2, 0, 0, 100F); this.xrTableCell47.StylePriority.UseBackColor = false; this.xrTableCell47.StylePriority.UseBorderColor = false; this.xrTableCell47.StylePriority.UseBorders = false; @@ -1285,260 +1454,200 @@ namespace ChristopherusHausMID this.xrTableCell47.StylePriority.UsePadding = false; this.xrTableCell47.StylePriority.UseTextAlignment = false; this.xrTableCell47.Text = "100%"; - this.xrTableCell47.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell47.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; this.xrTableCell47.TextFormatString = "{0:0.00}%"; - this.xrTableCell47.Weight = 1.9334989184548541D; + this.xrTableCell47.Weight = 1.9334990413834126D; // // xrTableCell48 // this.xrTableCell48.BackColor = System.Drawing.Color.Transparent; this.xrTableCell48.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell48.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell48.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell48.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.AmountPerUnit")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "SummenPosition.Stundensatz")}); this.xrTableCell48.Font = new DevExpress.Drawing.DXFont("Arial", 8F); this.xrTableCell48.Multiline = true; this.xrTableCell48.Name = "xrTableCell48"; - this.xrTableCell48.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell48.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 2, 0, 0, 100F); this.xrTableCell48.StylePriority.UseBackColor = false; this.xrTableCell48.StylePriority.UseBorderColor = false; this.xrTableCell48.StylePriority.UseBorders = false; this.xrTableCell48.StylePriority.UseFont = false; this.xrTableCell48.StylePriority.UsePadding = false; this.xrTableCell48.StylePriority.UseTextAlignment = false; - this.xrTableCell48.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell48.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; this.xrTableCell48.TextFormatString = "{0:C}"; - this.xrTableCell48.Weight = 1.7401490287314854D; + this.xrTableCell48.Weight = 1.6112422087931566D; // // xrTableCell49 // this.xrTableCell49.BackColor = System.Drawing.Color.Transparent; this.xrTableCell49.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell49.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell49.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell49.Font = new DevExpress.Drawing.DXFont("Arial", 8F); this.xrTableCell49.Multiline = true; this.xrTableCell49.Name = "xrTableCell49"; - this.xrTableCell49.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell49.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 2, 0, 0, 100F); this.xrTableCell49.StylePriority.UseBackColor = false; this.xrTableCell49.StylePriority.UseBorderColor = false; this.xrTableCell49.StylePriority.UseBorders = false; this.xrTableCell49.StylePriority.UseFont = false; this.xrTableCell49.StylePriority.UsePadding = false; this.xrTableCell49.StylePriority.UseTextAlignment = false; - this.xrTableCell49.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell49.Weight = 1.6112489904513003D; + this.xrTableCell49.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell49.Weight = 1.7401491722474816D; // // xrTableCell50 // this.xrTableCell50.BackColor = System.Drawing.Color.Transparent; this.xrTableCell50.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell50.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell50.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell50.Font = new DevExpress.Drawing.DXFont("Arial", 8F); this.xrTableCell50.Multiline = true; this.xrTableCell50.Name = "xrTableCell50"; - this.xrTableCell50.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell50.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 2, 0, 0, 100F); this.xrTableCell50.StylePriority.UseBackColor = false; this.xrTableCell50.StylePriority.UseBorderColor = false; this.xrTableCell50.StylePriority.UseBorders = false; this.xrTableCell50.StylePriority.UseFont = false; this.xrTableCell50.StylePriority.UsePadding = false; this.xrTableCell50.StylePriority.UseTextAlignment = false; - this.xrTableCell50.Text = "[fieldSummeStunden!0.00]\r\n[fieldBetragAllerStunden!C]"; - this.xrTableCell50.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell50.Text = "[SummenPosition.BetreuteStunden10!0.00]\r\n[SummenPosition.BetragStunden10!0.00] €"; + this.xrTableCell50.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; this.xrTableCell50.TextFormatString = "{0:0.00} h"; - this.xrTableCell50.Weight = 1.6112489904513003D; + this.xrTableCell50.Weight = 1.7401491722474813D; // // xrTableCell51 // this.xrTableCell51.BackColor = System.Drawing.Color.Transparent; this.xrTableCell51.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell51.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell51.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell51.Font = new DevExpress.Drawing.DXFont("Arial", 8F); this.xrTableCell51.Multiline = true; this.xrTableCell51.Name = "xrTableCell51"; - this.xrTableCell51.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell51.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 2, 0, 0, 100F); this.xrTableCell51.StylePriority.UseBackColor = false; this.xrTableCell51.StylePriority.UseBorderColor = false; this.xrTableCell51.StylePriority.UseBorders = false; this.xrTableCell51.StylePriority.UseFont = false; this.xrTableCell51.StylePriority.UsePadding = false; this.xrTableCell51.StylePriority.UseTextAlignment = false; - this.xrTableCell51.Text = "0,00 h\r\n0,00 €"; - this.xrTableCell51.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell51.Weight = 1.6112491133798452D; + this.xrTableCell51.Text = "[SummenPosition.BetreuteStunden11!0.00]\r\n[SummenPosition.BetragStunden11!0.00] €"; + this.xrTableCell51.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell51.Weight = 1.7401491722474678D; // // xrTableCell52 // this.xrTableCell52.BackColor = System.Drawing.Color.Transparent; this.xrTableCell52.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell52.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell52.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell52.Font = new DevExpress.Drawing.DXFont("Arial", 8F); this.xrTableCell52.Multiline = true; this.xrTableCell52.Name = "xrTableCell52"; - this.xrTableCell52.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell52.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 2, 0, 0, 100F); this.xrTableCell52.StylePriority.UseBackColor = false; this.xrTableCell52.StylePriority.UseBorderColor = false; this.xrTableCell52.StylePriority.UseBorders = false; this.xrTableCell52.StylePriority.UseFont = false; this.xrTableCell52.StylePriority.UsePadding = false; this.xrTableCell52.StylePriority.UseTextAlignment = false; - this.xrTableCell52.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell52.Weight = 1.6112491133798457D; + this.xrTableCell52.Text = "[SummenPosition.BetreuteStunden12!0.00]\r\n[SummenPosition.BetragStunden12!0.00] €"; + this.xrTableCell52.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell52.Weight = 1.7401491722474682D; // // xrTableCell53 // this.xrTableCell53.BackColor = System.Drawing.Color.Transparent; this.xrTableCell53.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell53.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell53.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell53.Font = new DevExpress.Drawing.DXFont("Arial", 8F); this.xrTableCell53.Multiline = true; this.xrTableCell53.Name = "xrTableCell53"; - this.xrTableCell53.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell53.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 2, 0, 0, 100F); this.xrTableCell53.StylePriority.UseBackColor = false; this.xrTableCell53.StylePriority.UseBorderColor = false; this.xrTableCell53.StylePriority.UseBorders = false; this.xrTableCell53.StylePriority.UseFont = false; this.xrTableCell53.StylePriority.UsePadding = false; this.xrTableCell53.StylePriority.UseTextAlignment = false; - this.xrTableCell53.Text = "0,00 h\r\n0,00 €"; - this.xrTableCell53.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell53.Weight = 1.6112491133798452D; + this.xrTableCell53.Text = "[SummenPosition.BetreuteStunden13!0.00]\r\n[SummenPosition.BetragStunden13!0.00] €"; + this.xrTableCell53.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell53.Weight = 1.740149172247468D; // // xrTableCell54 // this.xrTableCell54.BackColor = System.Drawing.Color.Transparent; this.xrTableCell54.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell54.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell54.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell54.Font = new DevExpress.Drawing.DXFont("Arial", 8F); this.xrTableCell54.Multiline = true; this.xrTableCell54.Name = "xrTableCell54"; - this.xrTableCell54.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell54.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 2, 0, 0, 100F); this.xrTableCell54.StylePriority.UseBackColor = false; this.xrTableCell54.StylePriority.UseBorderColor = false; this.xrTableCell54.StylePriority.UseBorders = false; this.xrTableCell54.StylePriority.UseFont = false; this.xrTableCell54.StylePriority.UsePadding = false; this.xrTableCell54.StylePriority.UseTextAlignment = false; - this.xrTableCell54.Text = "0,00 h\r\n0,00 €"; - this.xrTableCell54.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell54.Weight = 1.6112493592369357D; + this.xrTableCell54.Text = "[SummenPosition.BetreuteStunden14!0.00]\r\n[SummenPosition.BetragStunden14!0.00] €"; + this.xrTableCell54.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell54.Weight = 1.7401491722474416D; // // xrTableCell55 // this.xrTableCell55.BackColor = System.Drawing.Color.Transparent; this.xrTableCell55.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell55.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell55.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell55.Font = new DevExpress.Drawing.DXFont("Arial", 8F); this.xrTableCell55.Multiline = true; this.xrTableCell55.Name = "xrTableCell55"; - this.xrTableCell55.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell55.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 2, 0, 0, 100F); this.xrTableCell55.StylePriority.UseBackColor = false; this.xrTableCell55.StylePriority.UseBorderColor = false; this.xrTableCell55.StylePriority.UseBorders = false; this.xrTableCell55.StylePriority.UseFont = false; this.xrTableCell55.StylePriority.UsePadding = false; this.xrTableCell55.StylePriority.UseTextAlignment = false; - this.xrTableCell55.Text = "0,00 h\r\n0,00 €"; - this.xrTableCell55.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell55.Weight = 1.6112493592369357D; + this.xrTableCell55.Text = "[SummenPosition.BetreuteStunden15!0.00]\r\n[SummenPosition.BetragStunden15!0.00] €"; + this.xrTableCell55.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell55.Weight = 1.7401491722474418D; // // xrTableCell56 // this.xrTableCell56.BackColor = System.Drawing.Color.Transparent; this.xrTableCell56.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell56.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell56.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell56.Font = new DevExpress.Drawing.DXFont("Arial", 8F); this.xrTableCell56.Multiline = true; this.xrTableCell56.Name = "xrTableCell56"; - this.xrTableCell56.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell56.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 2, 0, 0, 100F); this.xrTableCell56.StylePriority.UseBackColor = false; this.xrTableCell56.StylePriority.UseBorderColor = false; this.xrTableCell56.StylePriority.UseBorders = false; this.xrTableCell56.StylePriority.UseFont = false; this.xrTableCell56.StylePriority.UsePadding = false; this.xrTableCell56.StylePriority.UseTextAlignment = false; - this.xrTableCell56.Text = "\r\n[GrossClaim]"; - this.xrTableCell56.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell56.Weight = 2.5189911315193161D; - // - // xrLabel21 - // - this.xrLabel21.BackColor = System.Drawing.Color.Transparent; - this.xrLabel21.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrLabel21.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrLabel21.LocationFloat = new DevExpress.Utils.PointFloat(0F, 116.4574F); - this.xrLabel21.Name = "xrLabel21"; - this.xrLabel21.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel21.SizeF = new System.Drawing.SizeF(386.831F, 52.29167F); - this.xrLabel21.StylePriority.UseBackColor = false; - this.xrLabel21.StylePriority.UseBorders = false; - this.xrLabel21.StylePriority.UseFont = false; - this.xrLabel21.StylePriority.UseTextAlignment = false; - this.xrLabel21.Text = "Rechnungsbetrag"; - this.xrLabel21.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrLabel21.TextTrimming = DevExpress.Drawing.DXStringTrimming.None; - this.xrLabel21.WordWrap = false; - // - // xrLabel22 - // - this.xrLabel22.BackColor = System.Drawing.Color.Transparent; - this.xrLabel22.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrLabel22.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "GrossClaim")}); - this.xrLabel22.Font = new DevExpress.Drawing.DXFont("Arial", 12F, ((DevExpress.Drawing.DXFontStyle)((DevExpress.Drawing.DXFontStyle.Bold | DevExpress.Drawing.DXFontStyle.Underline)))); - this.xrLabel22.LocationFloat = new DevExpress.Utils.PointFloat(386.8311F, 116.4574F); - this.xrLabel22.Name = "xrLabel22"; - this.xrLabel22.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel22.SizeF = new System.Drawing.SizeF(378.1687F, 52.29167F); - this.xrLabel22.StylePriority.UseBackColor = false; - this.xrLabel22.StylePriority.UseBorders = false; - this.xrLabel22.StylePriority.UseFont = false; - this.xrLabel22.StylePriority.UseTextAlignment = false; - this.xrLabel22.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrLabel22.TextTrimming = DevExpress.Drawing.DXStringTrimming.None; - this.xrLabel22.WordWrap = false; - // - // xrLabel23 - // - this.xrLabel23.BackColor = System.Drawing.Color.Transparent; - this.xrLabel23.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.xrLabel23.CanShrink = true; - this.xrLabel23.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrLabel23.LocationFloat = new DevExpress.Utils.PointFloat(0F, 168.7491F); - this.xrLabel23.Multiline = true; - this.xrLabel23.Name = "xrLabel23"; - this.xrLabel23.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel23.SizeF = new System.Drawing.SizeF(765F, 33.54169F); - this.xrLabel23.StylePriority.UseBackColor = false; - this.xrLabel23.StylePriority.UseBorders = false; - this.xrLabel23.StylePriority.UseFont = false; - this.xrLabel23.StylePriority.UseTextAlignment = false; - this.xrLabel23.Text = "Die Leistung ist nach § 4 UstG von der Umsatzsteuer befreit.\r\nIK 512591190"; - this.xrLabel23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - this.xrLabel23.TextTrimming = DevExpress.Drawing.DXStringTrimming.None; - this.xrLabel23.WordWrap = false; - // - // xrLabel24 - // - this.xrLabel24.BackColor = System.Drawing.Color.Transparent; - this.xrLabel24.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; - this.xrLabel24.CanShrink = true; - this.xrLabel24.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel24.LocationFloat = new DevExpress.Utils.PointFloat(0F, 212.2908F); - this.xrLabel24.Multiline = true; - this.xrLabel24.Name = "xrLabel24"; - this.xrLabel24.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel24.SizeF = new System.Drawing.SizeF(765F, 70.08286F); - this.xrLabel24.StylePriority.UseBackColor = false; - this.xrLabel24.StylePriority.UseBorders = false; - this.xrLabel24.StylePriority.UseFont = false; - this.xrLabel24.StylePriority.UseTextAlignment = false; - this.xrLabel24.Text = "Wir bitten um Überweisung unter Angabe der o. g. Rechnungsnummer auf folgendes Ko" + - "nto:\r\nStadtsparkasse Dortmund\r\nBIC: DORTDE33XXX\r\nIBAN: DE96 4405 0199 0241 0091 " + - "57"; - this.xrLabel24.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - this.xrLabel24.TextTrimming = DevExpress.Drawing.DXStringTrimming.None; - this.xrLabel24.WordWrap = false; + this.xrTableCell56.Text = "[SummenPosition.GesamtStunden!0.00]\r\n[SummenPosition.GesamtBetrag!0.00] €"; + this.xrTableCell56.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell56.Weight = 2.1388971356390334D; // // GroupFooter2 // @@ -1548,157 +1657,314 @@ namespace ChristopherusHausMID this.GroupFooter2.Level = 1; this.GroupFooter2.Name = "GroupFooter2"; // - // xrLabel1 - // - this.xrLabel1.BackColor = System.Drawing.Color.Transparent; - this.xrLabel1.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top))); - this.xrLabel1.CanShrink = true; - this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(17.5F, 21.46F); - this.xrLabel1.Name = "xrLabel1"; - this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel1.SizeF = new System.Drawing.SizeF(157.2084F, 20.00003F); - this.xrLabel1.StylePriority.UseBackColor = false; - this.xrLabel1.StylePriority.UseBorders = false; - this.xrLabel1.StylePriority.UseFont = false; - this.xrLabel1.Text = "Sollstunden"; - this.xrLabel1.WordWrap = false; - // - // xrLabel14 - // - this.xrLabel14.BackColor = System.Drawing.Color.Transparent; - this.xrLabel14.Borders = DevExpress.XtraPrinting.BorderSide.Left; - this.xrLabel14.CanShrink = true; - this.xrLabel14.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(17.5F, 41.46004F); - this.xrLabel14.Name = "xrLabel14"; - this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel14.SizeF = new System.Drawing.SizeF(157.2084F, 19.99849F); - this.xrLabel14.StylePriority.UseBackColor = false; - this.xrLabel14.StylePriority.UseBorders = false; - this.xrLabel14.StylePriority.UseFont = false; - this.xrLabel14.Text = "Ist-Stunden"; - this.xrLabel14.WordWrap = false; - // - // xrLabel15 - // - this.xrLabel15.BackColor = System.Drawing.Color.Transparent; - this.xrLabel15.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrLabel15.CanShrink = true; - this.xrLabel15.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(17.5F, 81.45853F); - this.xrLabel15.Name = "xrLabel15"; - this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel15.SizeF = new System.Drawing.SizeF(157.2084F, 20.00003F); - this.xrLabel15.StylePriority.UseBackColor = false; - this.xrLabel15.StylePriority.UseBorders = false; - this.xrLabel15.StylePriority.UseFont = false; - this.xrLabel15.Text = "abgerechnete Stunden"; - this.xrLabel15.WordWrap = false; - // - // xrLabel20 - // - this.xrLabel20.BackColor = System.Drawing.Color.Transparent; - this.xrLabel20.Borders = DevExpress.XtraPrinting.BorderSide.Left; - this.xrLabel20.CanShrink = true; - this.xrLabel20.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(17.5F, 61.45859F); - this.xrLabel20.Name = "xrLabel20"; - this.xrLabel20.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel20.SizeF = new System.Drawing.SizeF(157.2084F, 20.00003F); - this.xrLabel20.StylePriority.UseBackColor = false; - this.xrLabel20.StylePriority.UseBorders = false; - this.xrLabel20.StylePriority.UseFont = false; - this.xrLabel20.Text = "Abweichung"; - this.xrLabel20.WordWrap = false; - // - // xrLabel25 - // - this.xrLabel25.BackColor = System.Drawing.Color.Transparent; - this.xrLabel25.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrLabel25.CanShrink = true; - this.xrLabel25.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.UnitCount")}); - this.xrLabel25.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel25.LocationFloat = new DevExpress.Utils.PointFloat(174.7084F, 81.45841F); - this.xrLabel25.Name = "xrLabel25"; - this.xrLabel25.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel25.SizeF = new System.Drawing.SizeF(39.99643F, 20.00002F); - this.xrLabel25.StylePriority.UseBackColor = false; - this.xrLabel25.StylePriority.UseBorders = false; - this.xrLabel25.StylePriority.UseFont = false; - xrSummary2.FormatString = "{0:0.00}"; - xrSummary2.Running = DevExpress.XtraReports.UI.SummaryRunning.Report; - this.xrLabel25.Summary = xrSummary2; - this.xrLabel25.WordWrap = false; - // - // xrLabel26 - // - this.xrLabel26.BackColor = System.Drawing.Color.Transparent; - this.xrLabel26.Borders = DevExpress.XtraPrinting.BorderSide.Right; - this.xrLabel26.CanShrink = true; - this.xrLabel26.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel26.LocationFloat = new DevExpress.Utils.PointFloat(174.7084F, 61.45846F); - this.xrLabel26.Name = "xrLabel26"; - this.xrLabel26.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel26.SizeF = new System.Drawing.SizeF(39.99643F, 20.00002F); - this.xrLabel26.StylePriority.UseBackColor = false; - this.xrLabel26.StylePriority.UseBorders = false; - this.xrLabel26.StylePriority.UseFont = false; - this.xrLabel26.Text = "[fieldAbweichungIstSoll] %"; - this.xrLabel26.WordWrap = false; - // - // xrLabel27 - // - this.xrLabel27.BackColor = System.Drawing.Color.Transparent; - this.xrLabel27.Borders = DevExpress.XtraPrinting.BorderSide.Right; - this.xrLabel27.CanShrink = true; - this.xrLabel27.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.UnitCount")}); - this.xrLabel27.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel27.LocationFloat = new DevExpress.Utils.PointFloat(174.7084F, 41.45851F); - this.xrLabel27.Name = "xrLabel27"; - this.xrLabel27.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel27.SizeF = new System.Drawing.SizeF(39.99643F, 20.00003F); - this.xrLabel27.StylePriority.UseBackColor = false; - this.xrLabel27.StylePriority.UseBorders = false; - this.xrLabel27.StylePriority.UseFont = false; - xrSummary3.FormatString = "{0:0.00}"; - xrSummary3.Running = DevExpress.XtraReports.UI.SummaryRunning.Report; - this.xrLabel27.Summary = xrSummary3; - this.xrLabel27.WordWrap = false; - // - // xrLabel28 - // - this.xrLabel28.BackColor = System.Drawing.Color.Transparent; - this.xrLabel28.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right))); - this.xrLabel28.CanShrink = true; - this.xrLabel28.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ApprovedHours")}); - this.xrLabel28.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel28.LocationFloat = new DevExpress.Utils.PointFloat(174.7084F, 21.45831F); - this.xrLabel28.Name = "xrLabel28"; - this.xrLabel28.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel28.SizeF = new System.Drawing.SizeF(39.99643F, 20.00003F); - this.xrLabel28.StylePriority.UseBackColor = false; - this.xrLabel28.StylePriority.UseBorders = false; - this.xrLabel28.StylePriority.UseFont = false; - xrSummary4.FormatString = "{0:0.00}"; - xrSummary4.Running = DevExpress.XtraReports.UI.SummaryRunning.Report; - this.xrLabel28.Summary = xrSummary4; - this.xrLabel28.WordWrap = false; - // // fieldAbweichungIstSoll // this.fieldAbweichungIstSoll.Expression = "(Sum([ServiceInvoicePeriods].[ServiceInvoiceItems].[UnitCount])-Sum([ServiceInvoi" + "cePeriods].[ApprovedHours]))/Sum([ServiceInvoicePeriods].[ApprovedHours]) * 100"; this.fieldAbweichungIstSoll.Name = "fieldAbweichungIstSoll"; // + // xrTable2 + // + this.xrTable2.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTable2.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 339.6658F); + this.xrTable2.Name = "xrTable2"; + this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow2}); + this.xrTable2.SizeF = new System.Drawing.SizeF(764.9999F, 26.54215F); + this.xrTable2.StylePriority.UseBorders = false; + this.xrTable2.StylePriority.UseFont = false; + // + // xrTableRow2 + // + this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell28, + this.xrTableCell29, + this.xrTableCell30, + this.xrTableCell31, + this.xrTableCell32, + this.xrTableCell33, + this.xrTableCell34, + this.xrTableCell35, + this.xrTableCell36, + this.xrTableCell38, + this.xrTableCell39, + this.xrTableCell40, + this.xrTableCell41, + this.xrTableCell42}); + this.xrTableRow2.Name = "xrTableRow2"; + this.xrTableRow2.Weight = 1D; + // + // xrTableCell28 + // + this.xrTableCell28.BackColor = System.Drawing.Color.Transparent; + this.xrTableCell28.BorderColor = System.Drawing.Color.DarkGray; + this.xrTableCell28.Name = "xrTableCell28"; + this.xrTableCell28.StylePriority.UseBackColor = false; + this.xrTableCell28.StylePriority.UseBorderColor = false; + this.xrTableCell28.StylePriority.UseBorders = false; + this.xrTableCell28.StylePriority.UseFont = false; + this.xrTableCell28.StylePriority.UsePadding = false; + this.xrTableCell28.StylePriority.UseTextAlignment = false; + xrSummary1.FormatString = "{0:0}"; + xrSummary1.Func = DevExpress.XtraReports.UI.SummaryFunc.RecordNumber; + xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Report; + this.xrTableCell28.Summary = xrSummary1; + this.xrTableCell28.Text = "1"; + this.xrTableCell28.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell28.Weight = 0.8258043660348906D; + // + // xrTableCell29 + // + this.xrTableCell29.BackColor = System.Drawing.Color.Transparent; + this.xrTableCell29.BorderColor = System.Drawing.Color.DarkGray; + this.xrTableCell29.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "MainRechnungsposition.CustomerName")}); + this.xrTableCell29.Multiline = true; + this.xrTableCell29.Name = "xrTableCell29"; + this.xrTableCell29.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 0, 100F); + this.xrTableCell29.StylePriority.UseBackColor = false; + this.xrTableCell29.StylePriority.UseBorderColor = false; + this.xrTableCell29.StylePriority.UseBorders = false; + this.xrTableCell29.StylePriority.UseFont = false; + this.xrTableCell29.StylePriority.UsePadding = false; + this.xrTableCell29.StylePriority.UseTextAlignment = false; + this.xrTableCell29.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell29.Weight = 2.7391234297526954D; + // + // xrTableCell30 + // + this.xrTableCell30.BackColor = System.Drawing.Color.Transparent; + this.xrTableCell30.BorderColor = System.Drawing.Color.DarkGray; + this.xrTableCell30.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "MainRechnungsposition.BewilligtProWoche")}); + this.xrTableCell30.Multiline = true; + this.xrTableCell30.Name = "xrTableCell30"; + this.xrTableCell30.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 2, 0, 0, 100F); + this.xrTableCell30.StylePriority.UseBackColor = false; + this.xrTableCell30.StylePriority.UseBorderColor = false; + this.xrTableCell30.StylePriority.UseBorders = false; + this.xrTableCell30.StylePriority.UseFont = false; + this.xrTableCell30.StylePriority.UsePadding = false; + this.xrTableCell30.StylePriority.UseTextAlignment = false; + this.xrTableCell30.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell30.TextFormatString = "{0:0.00} h"; + this.xrTableCell30.Weight = 1.9334924156454902D; + // + // xrTableCell31 + // + this.xrTableCell31.BackColor = System.Drawing.Color.Transparent; + this.xrTableCell31.BorderColor = System.Drawing.Color.DarkGray; + this.xrTableCell31.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "MainRechnungsposition.Fehltage")}); + this.xrTableCell31.Multiline = true; + this.xrTableCell31.Name = "xrTableCell31"; + this.xrTableCell31.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 2, 0, 0, 100F); + this.xrTableCell31.StylePriority.UseBackColor = false; + this.xrTableCell31.StylePriority.UseBorderColor = false; + this.xrTableCell31.StylePriority.UseBorders = false; + this.xrTableCell31.StylePriority.UseFont = false; + this.xrTableCell31.StylePriority.UsePadding = false; + this.xrTableCell31.StylePriority.UseTextAlignment = false; + this.xrTableCell31.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell31.Weight = 1.2889993735091139D; + // + // xrTableCell32 + // + this.xrTableCell32.BackColor = System.Drawing.Color.Transparent; + this.xrTableCell32.BorderColor = System.Drawing.Color.DarkGray; + this.xrTableCell32.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "MainRechnungsposition.Rechungsanteil")}); + this.xrTableCell32.Multiline = true; + this.xrTableCell32.Name = "xrTableCell32"; + this.xrTableCell32.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 2, 0, 0, 100F); + this.xrTableCell32.StylePriority.UseBackColor = false; + this.xrTableCell32.StylePriority.UseBorderColor = false; + this.xrTableCell32.StylePriority.UseBorders = false; + this.xrTableCell32.StylePriority.UseFont = false; + this.xrTableCell32.StylePriority.UsePadding = false; + this.xrTableCell32.StylePriority.UseTextAlignment = false; + this.xrTableCell32.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell32.TextFormatString = "{0:0.00}%"; + this.xrTableCell32.Weight = 1.9334990413834123D; + // + // xrTableCell33 + // + this.xrTableCell33.BackColor = System.Drawing.Color.Transparent; + this.xrTableCell33.BorderColor = System.Drawing.Color.DarkGray; + this.xrTableCell33.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "MainRechnungsposition.Stundensatz")}); + this.xrTableCell33.Multiline = true; + this.xrTableCell33.Name = "xrTableCell33"; + this.xrTableCell33.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 2, 0, 0, 100F); + this.xrTableCell33.StylePriority.UseBackColor = false; + this.xrTableCell33.StylePriority.UseBorderColor = false; + this.xrTableCell33.StylePriority.UseBorders = false; + this.xrTableCell33.StylePriority.UseFont = false; + this.xrTableCell33.StylePriority.UsePadding = false; + this.xrTableCell33.StylePriority.UseTextAlignment = false; + this.xrTableCell33.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell33.TextFormatString = "{0:c}"; + this.xrTableCell33.Weight = 1.6112490927924212D; + // + // xrTableCell34 + // + this.xrTableCell34.BackColor = System.Drawing.Color.Transparent; + this.xrTableCell34.BorderColor = System.Drawing.Color.DarkGray; + this.xrTableCell34.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "MainRechnungsposition.Stunden5Prozent10")}); + this.xrTableCell34.Multiline = true; + this.xrTableCell34.Name = "xrTableCell34"; + this.xrTableCell34.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 2, 0, 0, 100F); + this.xrTableCell34.StylePriority.UseBackColor = false; + this.xrTableCell34.StylePriority.UseBorderColor = false; + this.xrTableCell34.StylePriority.UseBorders = false; + this.xrTableCell34.StylePriority.UseFont = false; + this.xrTableCell34.StylePriority.UsePadding = false; + this.xrTableCell34.StylePriority.UseTextAlignment = false; + this.xrTableCell34.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell34.TextFormatString = "{0:0.00} h"; + this.xrTableCell34.Weight = 1.7401491722474813D; + // + // xrTableCell35 + // + this.xrTableCell35.BackColor = System.Drawing.Color.Transparent; + this.xrTableCell35.BorderColor = System.Drawing.Color.DarkGray; + this.xrTableCell35.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "MainRechnungsposition.BetreuteStunden10")}); + this.xrTableCell35.Multiline = true; + this.xrTableCell35.Name = "xrTableCell35"; + this.xrTableCell35.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 2, 0, 0, 100F); + this.xrTableCell35.StylePriority.UseBackColor = false; + this.xrTableCell35.StylePriority.UseBorderColor = false; + this.xrTableCell35.StylePriority.UseBorders = false; + this.xrTableCell35.StylePriority.UseFont = false; + this.xrTableCell35.StylePriority.UsePadding = false; + this.xrTableCell35.StylePriority.UseTextAlignment = false; + this.xrTableCell35.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell35.TextFormatString = "{0:0.00} h"; + this.xrTableCell35.Weight = 1.7401491722474811D; + // + // xrTableCell36 + // + this.xrTableCell36.BackColor = System.Drawing.Color.Transparent; + this.xrTableCell36.BorderColor = System.Drawing.Color.DarkGray; + this.xrTableCell36.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "MainRechnungsposition.BetreuteStunden11")}); + this.xrTableCell36.Multiline = true; + this.xrTableCell36.Name = "xrTableCell36"; + this.xrTableCell36.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 2, 0, 0, 100F); + this.xrTableCell36.StylePriority.UseBackColor = false; + this.xrTableCell36.StylePriority.UseBorderColor = false; + this.xrTableCell36.StylePriority.UseBorders = false; + this.xrTableCell36.StylePriority.UseFont = false; + this.xrTableCell36.StylePriority.UsePadding = false; + this.xrTableCell36.StylePriority.UseTextAlignment = false; + this.xrTableCell36.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell36.TextFormatString = "{0:0.00} h"; + this.xrTableCell36.Weight = 1.740149172247468D; + // + // xrTableCell38 + // + this.xrTableCell38.BackColor = System.Drawing.Color.Transparent; + this.xrTableCell38.BorderColor = System.Drawing.Color.DarkGray; + this.xrTableCell38.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "MainRechnungsposition.BetreuteStunden12")}); + this.xrTableCell38.Multiline = true; + this.xrTableCell38.Name = "xrTableCell38"; + this.xrTableCell38.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 2, 0, 0, 100F); + this.xrTableCell38.StylePriority.UseBackColor = false; + this.xrTableCell38.StylePriority.UseBorderColor = false; + this.xrTableCell38.StylePriority.UseBorders = false; + this.xrTableCell38.StylePriority.UseFont = false; + this.xrTableCell38.StylePriority.UsePadding = false; + this.xrTableCell38.StylePriority.UseTextAlignment = false; + this.xrTableCell38.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell38.TextFormatString = "{0:0.00} h"; + this.xrTableCell38.Weight = 1.7401491722474685D; + // + // xrTableCell39 + // + this.xrTableCell39.BackColor = System.Drawing.Color.Transparent; + this.xrTableCell39.BorderColor = System.Drawing.Color.DarkGray; + this.xrTableCell39.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "MainRechnungsposition.BetreuteStunden13")}); + this.xrTableCell39.Multiline = true; + this.xrTableCell39.Name = "xrTableCell39"; + this.xrTableCell39.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 2, 0, 0, 100F); + this.xrTableCell39.StylePriority.UseBackColor = false; + this.xrTableCell39.StylePriority.UseBorderColor = false; + this.xrTableCell39.StylePriority.UseBorders = false; + this.xrTableCell39.StylePriority.UseFont = false; + this.xrTableCell39.StylePriority.UsePadding = false; + this.xrTableCell39.StylePriority.UseTextAlignment = false; + this.xrTableCell39.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell39.TextFormatString = "{0:0.00} h"; + this.xrTableCell39.Weight = 1.7401491722474678D; + // + // xrTableCell40 + // + this.xrTableCell40.BackColor = System.Drawing.Color.Transparent; + this.xrTableCell40.BorderColor = System.Drawing.Color.DarkGray; + this.xrTableCell40.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "MainRechnungsposition.BetreuteStunden14")}); + this.xrTableCell40.Multiline = true; + this.xrTableCell40.Name = "xrTableCell40"; + this.xrTableCell40.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 2, 0, 0, 100F); + this.xrTableCell40.StylePriority.UseBackColor = false; + this.xrTableCell40.StylePriority.UseBorderColor = false; + this.xrTableCell40.StylePriority.UseBorders = false; + this.xrTableCell40.StylePriority.UseFont = false; + this.xrTableCell40.StylePriority.UsePadding = false; + this.xrTableCell40.StylePriority.UseTextAlignment = false; + this.xrTableCell40.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell40.TextFormatString = "{0:0.00} h"; + this.xrTableCell40.Weight = 1.7401491722474418D; + // + // xrTableCell41 + // + this.xrTableCell41.BackColor = System.Drawing.Color.Transparent; + this.xrTableCell41.BorderColor = System.Drawing.Color.DarkGray; + this.xrTableCell41.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "MainRechnungsposition.BetreuteStunden15")}); + this.xrTableCell41.Multiline = true; + this.xrTableCell41.Name = "xrTableCell41"; + this.xrTableCell41.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 2, 0, 0, 100F); + this.xrTableCell41.StylePriority.UseBackColor = false; + this.xrTableCell41.StylePriority.UseBorderColor = false; + this.xrTableCell41.StylePriority.UseBorders = false; + this.xrTableCell41.StylePriority.UseFont = false; + this.xrTableCell41.StylePriority.UsePadding = false; + this.xrTableCell41.StylePriority.UseTextAlignment = false; + this.xrTableCell41.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell41.TextFormatString = "{0:0.00} h"; + this.xrTableCell41.Weight = 1.7401491722474416D; + // + // xrTableCell42 + // + this.xrTableCell42.BackColor = System.Drawing.Color.Transparent; + this.xrTableCell42.BorderColor = System.Drawing.Color.DarkGray; + this.xrTableCell42.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "MainRechnungsposition.GesamtBetrag")}); + this.xrTableCell42.Multiline = true; + this.xrTableCell42.Name = "xrTableCell42"; + this.xrTableCell42.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 2, 0, 0, 100F); + this.xrTableCell42.StylePriority.UseBackColor = false; + this.xrTableCell42.StylePriority.UseBorderColor = false; + this.xrTableCell42.StylePriority.UseBorders = false; + this.xrTableCell42.StylePriority.UseFont = false; + this.xrTableCell42.StylePriority.UsePadding = false; + this.xrTableCell42.StylePriority.UseTextAlignment = false; + this.xrTableCell42.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell42.TextFormatString = "{0:c} "; + this.xrTableCell42.Weight = 2.1388968897819165D; + // // bindingSource1 // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); + this.bindingSource1.DataSource = typeof(ChristopherusHausMID.RechnungRO); // - // Sammelrechnung + // Rechnung // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { this.Detail, @@ -1717,7 +1983,7 @@ namespace ChristopherusHausMID this.fieldAbweichungIstSoll}); this.DataSource = this.bindingSource1; this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung"; - this.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); + this.Font = new DevExpress.Drawing.DXFont("Arial", 9F); this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] { this.ruleRateFactorNull, this.ruleNoticeNull}); @@ -1733,6 +1999,7 @@ namespace ChristopherusHausMID ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); @@ -1751,11 +2018,8 @@ namespace ChristopherusHausMID private DevExpress.XtraReports.UI.XRLabel xrLabel2; private DevExpress.XtraReports.UI.DetailReportBand DetailReport; private DevExpress.XtraReports.UI.DetailBand Detail1; - private DevExpress.XtraReports.UI.DetailReportBand DetailReport2; - private DevExpress.XtraReports.UI.DetailBand Detail3; - private DevExpress.XtraReports.UI.XRLabel xrLabel7; + private DevExpress.XtraReports.UI.XRLabel lblAdresse; private DevExpress.XtraReports.UI.FormattingRule ruleNoticeNull; - private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1; private DevExpress.XtraReports.UI.XRLabel xrLabel4; private DevExpress.XtraReports.UI.XRLabel xrLabel5; private DevExpress.XtraReports.UI.XRLabel xrLabel6; @@ -1763,12 +2027,10 @@ namespace ChristopherusHausMID private DevExpress.XtraReports.UI.XRLabel lblBewilligungVom; private DevExpress.XtraReports.UI.XRLabel xrLabel10; private DevExpress.XtraReports.UI.XRLabel xrLabel11; - private DevExpress.XtraReports.UI.XRLabel xrLabel9; + private DevExpress.XtraReports.UI.XRLabel lblKategorie; private DevExpress.XtraReports.UI.XRLabel xrLabel12; private DevExpress.XtraReports.UI.XRLabel xrLabel13; - private DevExpress.XtraReports.UI.XRLabel xrLabel16; - private DevExpress.XtraReports.UI.XRLabel xrLabel18; - private DevExpress.XtraReports.UI.XRLabel xrLabel17; + private DevExpress.XtraReports.UI.XRLabel lblSchule; private DevExpress.XtraReports.UI.XRLabel xrLabel19; private DevExpress.XtraReports.UI.XRTable xrTable1; private DevExpress.XtraReports.UI.XRTableRow xrTableRow1; @@ -1836,5 +2098,21 @@ namespace ChristopherusHausMID private DevExpress.XtraReports.UI.XRLabel xrLabel27; private DevExpress.XtraReports.UI.XRLabel xrLabel28; private DevExpress.XtraReports.UI.CalculatedField fieldAbweichungIstSoll; + private DevExpress.XtraReports.UI.XRTable xrTable2; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow2; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell28; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell29; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell30; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell31; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell32; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell33; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell34; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell35; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell36; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell38; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell39; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell40; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell41; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell42; } } diff --git a/ReportImp/ChristopherusHausMID/Rechnung.cs b/ReportImp/ChristopherusHausMID/Rechnung.cs new file mode 100644 index 000000000..217e99de8 --- /dev/null +++ b/ReportImp/ChristopherusHausMID/Rechnung.cs @@ -0,0 +1,249 @@ +using BeWo.Report.ReportObjects; + +using DevExpress.XtraReports.UI; +using BS.Shared.Core; +using BeWo.Report; +using System; +using BeWo.Service.DCEntityMapper; +using BeWo.Data.Access; +using BeWo.Data.Entities; +using System.Linq; +using System.Collections.Generic; +using System.Text; + +namespace ChristopherusHausMID +{ + public partial class Rechnung : XtraReport, IBeWoReport + { + public Rechnung() + { + this.InitializeComponent(); + } + + public void SetReportDataSource(ServiceInvoiceRO pRO) + { + SetzeAdresse(pRO); + SetzeSchule(pRO); + SetzeSollIst(pRO); + SetzeKategorie(pRO); + + this.bindingSource1.DataSource = CreateRechnungsRO(pRO); + } + + private RechnungRO CreateRechnungsRO(ServiceInvoiceRO pRO) + { + var ro = new RechnungRO(); + ro.ServiceInvoice = pRO; + ro.WeitereRechnungspositionen = new List(); + ro.SummenPosition = new RechnungsPositionRO(); + + foreach (var ip in pRO.ServiceInvoicePeriods) + { + + foreach (var item in ip.ServiceInvoiceItems) + { + var pos = new RechnungsPositionRO(); + if (!String.IsNullOrEmpty(item.UnitDescription)) + { + if (item.UnitDescription == "Faktor 1.0") + { + pos.BetreuteStunden10 = item.UnitCount ?? 0; + } + else if (item.UnitDescription == "Faktor 1.1") + { + pos.BetreuteStunden11 = item.UnitCount ?? 0; + } + else if (item.UnitDescription == "Faktor 1.2") + { + pos.BetreuteStunden12 = item.UnitCount ?? 0; + } + else if (item.UnitDescription == "Faktor 1.3") + { + pos.BetreuteStunden13 = item.UnitCount ?? 0; + } + else if (item.UnitDescription == "Faktor 1.4") + { + pos.BetreuteStunden14 = item.UnitCount ?? 0; + } + else if (item.UnitDescription == "Faktor 1.5") + { + pos.BetreuteStunden15 = item.UnitCount ?? 0; + } + } + else + { + pos.BetreuteStunden10 = item.UnitCount ?? 0; + } + pos.GesamtStunden = item.UnitCount ?? 0; + pos.GesamtBetrag = item.NetAmount ?? 0; + pos.Stundensatz = item.AmountPerUnit ?? 0; + pos.Rechungsanteil = 100; + if (ip.SupportConceptApprovalPeriod != null) + { + pos.BewilligtProWoche = ip.SupportConceptApprovalPeriod.ApprovedBEPerInterval ?? 0; + } + if (ip.Customer != null) + { + pos.CustomerName = String.Format("{0} {1}", ip.Customer.FirstName, ip.Customer.LastName); + } + + if (ro.MainRechnungsposition == null) + { + ro.MainRechnungsposition = pos; + } + else + { + ro.WeitereRechnungspositionen.Add(pos); + } + + } + + } + if (ro.MainRechnungsposition == null) + { + ro.MainRechnungsposition = new RechnungsPositionRO(); + } + + ro.SummenPosition.Rechungsanteil = 100; + ro.SummenPosition.Stundensatz = ro.MainRechnungsposition.Stundensatz; + + AddPositionZuGesamt(ro.MainRechnungsposition, ro.SummenPosition); + + foreach (var item in ro.WeitereRechnungspositionen) + { + AddPositionZuGesamt(item, ro.SummenPosition); + } + return ro; + } + + private void AddPositionZuGesamt(RechnungsPositionRO item, RechnungsPositionRO summenPosition) + { + summenPosition.Stunden5Prozent10 += item.Stunden5Prozent10; + summenPosition.BetragStunden10 += item.BetragStunden10; + summenPosition.BetragStunden11 += item.BetragStunden11; + summenPosition.BetragStunden12 += item.BetragStunden12; + summenPosition.BetragStunden13 += item.BetragStunden13; + summenPosition.BetragStunden14 += item.BetragStunden14; + summenPosition.BetragStunden15 += item.BetragStunden15; + + summenPosition.BetreuteStunden10 += item.BetreuteStunden10; + summenPosition.BetreuteStunden11 += item.BetreuteStunden11; + summenPosition.BetreuteStunden12 += item.BetreuteStunden12; + summenPosition.BetreuteStunden13 += item.BetreuteStunden13; + summenPosition.BetreuteStunden14 += item.BetreuteStunden14; + summenPosition.BetreuteStunden15 += item.BetreuteStunden15; + + summenPosition.GesamtBetrag += item.GesamtBetrag; + summenPosition.GesamtStunden += item.GesamtStunden; + + } + + private void SetzeSollIst(ServiceInvoiceRO pRO) + { + foreach (var ip in pRO.ServiceInvoicePeriods) + { + + if (ip.SupportConceptApprovalPeriod.ApprovedBEInterval == BS.Shared.SupportConceptApprovalInterval.Weekly) + continue; + if (ip.SupportConceptApprovalPeriod.ApprovedBEInterval == BS.Shared.SupportConceptApprovalInterval.Monthly) + ip.SupportConceptApprovalPeriod.ApprovedBEPerInterval /= 4.34m; + } + } + + private void SetzeKategorie(ServiceInvoiceRO pRO) + { + lblKategorie.Text = ""; + foreach (var ip in pRO.ServiceInvoicePeriods) + { + if (ip.SupportConceptApprovalPeriod.ServiceCategory != null) + { + lblKategorie.Text = ip.SupportConceptApprovalPeriod.ServiceCategory.Name; + } + } + } + + private void SetzeSchule(ServiceInvoiceRO pRO) + { + lblSchule.Text = ""; + if (pRO.InvoiceBase.CustomerOid > 0) + { + var customer = DAOFactory.GenericDAO.LoadByID(pRO.InvoiceBase.CustomerOid); + foreach (var c2o in customer.Customer2OrganisationList) + { + foreach (var v2o in c2o.ValueList) + { + if (v2o.Entry.Value != null && v2o.Entry.Value.Contains("Schule")) + { + var schule = c2o.Organisation; + lblSchule.Text = String.Format("{0}\n{1}\n{2} {3}", schule.Name, schule.Address?.Street, schule.Address?.PostalCode, schule.Address?.Town); + + } + } + } + } + } + + private void SetzeAdresse(ServiceInvoiceRO pRO) + { + StringBuilder sb = new StringBuilder(); + + if (!String.IsNullOrEmpty(pRO.RecipientOrganisation)) + { + sb.AppendLine(pRO.RecipientOrganisation); + } + if (!String.IsNullOrEmpty(pRO.RecipientContactPerson)) + { + sb.AppendLine(pRO.RecipientContactPerson); + } + if (!String.IsNullOrEmpty(pRO.RecipientDivision)) + { + sb.AppendLine(pRO.RecipientDivision); + } + if (!String.IsNullOrEmpty(pRO.RecipientStreet)) + { + sb.AppendLine(pRO.RecipientStreet); + } + if (!String.IsNullOrEmpty(pRO.RecipientPostCodeAndTown)) + { + sb.AppendLine(pRO.RecipientPostCodeAndTown); + } + lblAdresse.Text = sb.ToString(); + + this.bindingSource1.DataSource = pRO; + } + } + + public class RechnungRO + { + public ServiceInvoiceRO ServiceInvoice { get; set; } + public RechnungsPositionRO MainRechnungsposition { get; set; } + public List WeitereRechnungspositionen { get; set; } + public RechnungsPositionRO SummenPosition { get; set; } + } + + public class RechnungsPositionRO + { + public int Position { get; set; } + public String CustomerName { get; set; } + public decimal BewilligtProWoche { get; set; } + public decimal Fehltage { get; set; } + public decimal Rechungsanteil { get; set; } + public decimal Stundensatz { get; set; } + public decimal Stunden5Prozent10 { get; set; } + public decimal Betrag5Prozent10 { get; set; } + public decimal BetreuteStunden10 { get; set; } + public decimal BetragStunden10 { get; set; } + public decimal BetreuteStunden11 { get; set; } + public decimal BetragStunden11 { get; set; } + public decimal BetreuteStunden12 { get; set; } + public decimal BetragStunden12 { get; set; } + public decimal BetreuteStunden13 { get; set; } + public decimal BetragStunden13 { get; set; } + public decimal BetreuteStunden14 { get; set; } + public decimal BetragStunden14 { get; set; } + public decimal BetreuteStunden15 { get; set; } + public decimal BetragStunden15 { get; set; } + public decimal GesamtStunden { get; set; } + public decimal GesamtBetrag { get; set; } + } +} \ No newline at end of file diff --git a/ReportImp/ChristopherusHausMID/RechnungSchuleBochum.resx b/ReportImp/ChristopherusHausMID/Rechnung.resx similarity index 100% rename from ReportImp/ChristopherusHausMID/RechnungSchuleBochum.resx rename to ReportImp/ChristopherusHausMID/Rechnung.resx diff --git a/ReportImp/ChristopherusHausMID/RechnungSchuleBochum.cs b/ReportImp/ChristopherusHausMID/RechnungSchuleBochum.cs deleted file mode 100644 index 65c44024e..000000000 --- a/ReportImp/ChristopherusHausMID/RechnungSchuleBochum.cs +++ /dev/null @@ -1,61 +0,0 @@ -using BeWo.Report.ReportObjects; - -using DevExpress.XtraReports.UI; -using BS.Shared.Core; -using BeWo.Report; -using System; -using BeWo.Service.DCEntityMapper; -using BeWo.Data.Access; -using BeWo.Data.Entities; -using System.Linq; - -namespace ChristopherusHausMID -{ - [IDSpecificClass(Identifier = "Sammelrechnung")] - public partial class Sammelrechnung : XtraReport, IBeWoReport - { - public Sammelrechnung() - { - this.InitializeComponent(); - } - - public void SetReportDataSource(ServiceInvoiceRO pRO) - { - foreach (var ip in pRO.ServiceInvoicePeriods) - { - var c = MapperFactory.CustomerDC_Customer.MapToNewDC(DAOFactory.GenericDAO.GetByID(ip.Customer.CustomerOid)); - if (c.AbsenceTimes != null && c.AbsenceTimes.Count > 0) - { - foreach (var abs in c.AbsenceTimes) - { - if (abs.Start == null) - abs.Start = pRO.AccountingPeriodStart; - if (abs.End == null) - abs.End = pRO.AccountingPeriodEnd; - } - - var absences = c.AbsenceTimes.Where(a => a.Start >= pRO.AccountingPeriodStart && a.End <= pRO.AccountingPeriodEnd).ToList(); - if (absences.Count > 0) - { - var anzahlTageAbwesend = absences.Sum(a => (a.End.Value - a.Start.Value).Days + 1); - ip.Notice = string.Format("{0:0}", anzahlTageAbwesend); - } - } - - foreach (var item in ip.ServiceInvoiceItems) - { - var rfProzent = item.RateFactor.Split(' ')[0]; - decimal rateFactor = Math.Round((Convert.ToDecimal(rfProzent) + 100) / 100, 2); - item.NetAmount = item.UnitCount * item.AmountPerUnit * rateFactor; - } - - if (ip.SupportConceptApprovalPeriod.ApprovedBEInterval == BS.Shared.SupportConceptApprovalInterval.Weekly) - continue; - if (ip.SupportConceptApprovalPeriod.ApprovedBEInterval == BS.Shared.SupportConceptApprovalInterval.Monthly) - ip.SupportConceptApprovalPeriod.ApprovedBEPerInterval /= 4.34m; - } - - this.bindingSource1.DataSource = pRO; - } - } -} \ No newline at end of file diff --git a/ReportImp/ChristopherusHausMID/Service/CustomOperationService.cs b/ReportImp/ChristopherusHausMID/Service/CustomOperationService.cs new file mode 100644 index 000000000..2a665029e --- /dev/null +++ b/ReportImp/ChristopherusHausMID/Service/CustomOperationService.cs @@ -0,0 +1,60 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using BeWo.Data; +using BeWo.Data.Access; +using BeWo.Data.Entities; +using BeWo.Service.DCEntityMapper; +using BeWo.Service.Plugins; +using BS.Shared; +using BS.Shared.Core; +using BS.Shared.DataContracts; +using BS.Shared.DataContracts.Compact; +using BS.Shared.Extensions; + +namespace ChristopherusHausMID.Service +{ + public class CustomOperationService : OperationService + { + private ServiceDescription leistungSchulbegleitung; + + protected override bool CreateServiceRecordsIfAnyExistInDateRange { get { return true; } } + + //public override ServiceRecord CreateServiceRecord(ArbeitszeitEintrag ae, DateTime datum, CostBearer2SupportConcept c2s, ServiceDescription defaultSd) + //{ + + // var sr = base.CreateServiceRecord(ae, datum, c2s, defaultSd); + + + // return sr; + //} + + //public override Employee GetHauptbetreuung(Customer customer, DateTime date) + //{ + // return customer.Employee2CustomerList.FirstOrDefault(e2c => e2c.IsActive == ActivationTypeId.Active && + // (!e2c.StartDate.HasValue || e2c.StartDate.Value.Date <= date) && (!e2c.EndDate.HasValue || e2c.EndDate.Value.Date >= date) && + // e2c.ValueList.Any(b => b.Entry.Type.Equals(ValueListEntryType.StaffRoleType) && + // b.Entry.Value.Contains("Hauptbetreuung")))?.Employee; + //} + + public override ServiceDescription GetDefaultServiceDescription(CostBearer2SupportConcept c2s) + { + if (leistungSchulbegleitung == null) + { + var sc = c2s.SupportConcept; + if (sc.ServiceAccountings.Count > 0) + { + leistungSchulbegleitung = sc.ServiceAccountings[0].ServiceDescription; + } + if (leistungSchulbegleitung == null) + { + leistungSchulbegleitung = base.GetDefaultServiceDescription(c2s); + } + } + + return leistungSchulbegleitung; + } + + + } +} \ No newline at end of file diff --git a/ReportImp/ChristopherusHausMID/Service/CustomVacationService.cs b/ReportImp/ChristopherusHausMID/Service/CustomVacationService.cs new file mode 100644 index 000000000..072dfd2d4 --- /dev/null +++ b/ReportImp/ChristopherusHausMID/Service/CustomVacationService.cs @@ -0,0 +1,21 @@ +using BeWo.Service.Plugins; +using BS.Shared.DataContracts; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ChristopherusHausMID.Service +{ + public class CustomVacationService : VacationService + { + public override List GetFeiertage(int year, String bundesland) + { + List list = base.GetFeiertage(year, bundesland); + list.Add(new FeiertagDC { Datum = new DateTime(year, 12, 31), Name = "Silvester" }); + + return list; + } + } +} diff --git a/ReportImp/ChristopherusHausMID/Translation/TranslationDictionary.cs b/ReportImp/ChristopherusHausMID/Translation/TranslationDictionary.cs new file mode 100644 index 000000000..87fe70cae --- /dev/null +++ b/ReportImp/ChristopherusHausMID/Translation/TranslationDictionary.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.Linq; + +using BeWo.Data.Access; +using BeWo.Data.Entities; +using BeWo.Service.DCEntityMapper; +using BeWo.Service.Plugins; +using BS.Shared; +using BS.Shared.Core; +using BS.Shared.DataContracts.Compact; +using BS.Shared.Extensions; + +namespace ChristopherusHausMID.Translation +{ + public class ChristopherusHausMID : TranslationDictionary + { + public override Dictionary GetTranslationDictionary() + { + var dict = base.GetTranslationDictionary(); + AddOrReplaceTranslation(dict, "Kinder", "Klasse"); + return dict; + } + } +} diff --git a/ReportImp/HPHBersenbrueck/Export/CustomDataExporter.cs b/ReportImp/HPHBersenbrueck/Export/CustomDataExporter.cs index 2ba2d7727..be2a4f302 100644 --- a/ReportImp/HPHBersenbrueck/Export/CustomDataExporter.cs +++ b/ReportImp/HPHBersenbrueck/Export/CustomDataExporter.cs @@ -24,7 +24,11 @@ namespace HphBersenbrueck.Export QueryDC q = null; if (query.Oid == 3000) { - q = MicosExporter.CreateQuery(query); + q = MicosExporter.CreateQuery(query, false); + } + else if (query.Oid == 6000) + { + q = MicosExporter.CreateQuery(query, true); } else { diff --git a/ReportImp/HPHBersenbrueck/Export/MicosExporter.cs b/ReportImp/HPHBersenbrueck/Export/MicosExporter.cs index cacede527..07c9c5f7f 100644 --- a/ReportImp/HPHBersenbrueck/Export/MicosExporter.cs +++ b/ReportImp/HPHBersenbrueck/Export/MicosExporter.cs @@ -14,7 +14,7 @@ namespace HphBersenbrueck.Export public class MicosExporter { - public static QueryDC CreateQuery(QueryDC query) + public static QueryDC CreateQuery(QueryDC query, bool exportCsv) { DateTime dt = DateTime.Now; DateTime.TryParse(query.Parameter[0].Value.ToString(), out dt); @@ -43,7 +43,25 @@ namespace HphBersenbrueck.Export { dtStart = new DateTime(1900, 1, 1); } - query.QueryResult = GetAbrechnungenString(dt, buchungsdatum, dtStart, dtEnd, false); + + DateTime abrechnungsStart = dt; + DateTime abrechnungsEnde = dt.AddMonths(1).AddDays(-1); + + if (query.Oid == 6000) + { + //CSV Export + abrechnungsStart = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 1); + abrechnungsEnde = abrechnungsStart.AddMonths(1).AddDays(-1); + DateTimeSpan span = query.Parameter[0].Value as DateTimeSpan; + if (span != null && span.StartDate > DateTime.MinValue && span.EndDate < DateTime.MaxValue.Date) + { + abrechnungsStart = span.StartDate; + abrechnungsEnde = span.EndDate; + } + query.FileName = String.Format("Rechnungen {0:yyyyMM}-{1:yyyyMM}.csv", abrechnungsStart, abrechnungsEnde); + } + + query.QueryResult = GetAbrechnungenString(abrechnungsStart, abrechnungsEnde, buchungsdatum, dtStart, dtEnd, false, exportCsv); return query; } @@ -57,7 +75,7 @@ namespace HphBersenbrueck.Export DateTime dtStart = new DateTime(1900, 1, 1); DateTime dtEnd = DateTime.MaxValue; - var gesamtExport = GetAbrechnungenString(dt, null, dtStart, dtEnd, true); + var gesamtExport = GetAbrechnungenString(dt, dt.AddMonths(1).AddDays(-1), null, dtStart, dtEnd, true, false); var letzterExport = GetAlteExporte(); if (String.IsNullOrEmpty(letzterExport)) { @@ -73,7 +91,7 @@ namespace HphBersenbrueck.Export { DateTime dt = DateTime.Now; DateTime.TryParse(pHeaderCaption[1], out dt); - var gesamtExport = GetAbrechnungenString(dt, null, dt, dt, false); + var gesamtExport = GetAbrechnungenString(dt, dt.AddMonths(1).AddDays(-1), null, dt, dt, false, false); var letzterExport = GetAlteExporte(); if (String.IsNullOrEmpty(letzterExport)) @@ -104,10 +122,10 @@ namespace HphBersenbrueck.Export } //Buchungsdatum soll in manchen Fällen vom User ausgewählt werden können - public static String GetAbrechnungenString(DateTime monat, DateTime? buchungsdatum, DateTime rechnungsDatumVon, DateTime rechnungsDatumBis, bool differenz) + public static String GetAbrechnungenString(DateTime abrechnungStart, DateTime abrechnungEnde, DateTime? buchungsdatum, DateTime rechnungsDatumVon, DateTime rechnungsDatumBis, bool differenz, bool exportCsv) { StringBuilder sb = new StringBuilder(); - var s = GetMonatlicheAbrechnungString(monat, buchungsdatum, rechnungsDatumVon, rechnungsDatumBis, differenz); + var s = GetMonatlicheAbrechnungString(abrechnungStart, abrechnungEnde, buchungsdatum, rechnungsDatumVon, rechnungsDatumBis, differenz, exportCsv); if (!String.IsNullOrWhiteSpace(s)) { sb.Append(s); @@ -118,9 +136,9 @@ namespace HphBersenbrueck.Export return sb.ToString(); } - public static String GetMonatlicheAbrechnungString(DateTime monat, DateTime? buchungsdatum, DateTime rechnungsDatumVon, DateTime rechnungsDatumBis, bool differenz) + public static String GetMonatlicheAbrechnungString(DateTime abrechnungStart, DateTime abrechnungEnde, DateTime? buchungsdatum, DateTime rechnungsDatumVon, DateTime rechnungsDatumBis, bool differenz, bool exportCsv) { - var sql = GetRechnungenSql(monat, rechnungsDatumVon, rechnungsDatumBis, differenz); + var sql = GetRechnungenSql(abrechnungStart, abrechnungEnde, rechnungsDatumVon, rechnungsDatumBis, differenz); /* * SELECT @@ -132,10 +150,12 @@ ib.InvoiceDate, CONCAT(p.`LastName`, ', ', p.`FirstName`, ' ', IF(cb2sc.CustomerRefenrenceNumber is null, '', cb2sc.CustomerRefenrenceNumber), ' Abrechnung :PeriodePunkt ', org.Name) as 'Verwendung', */ - var dt = ExecuteQuery(sql, monat); - var datensaetze = CreateMicosDatensaetze(dt, monat); + var dt = ExecuteQuery(sql, abrechnungStart); + var datensaetze = CreateMicosDatensaetze(dt, abrechnungStart); StringBuilder sb = new StringBuilder(); - + StringBuilder csvSb = new StringBuilder(); + csvSb.Append("Buchungsdatum;Debitor;Betrag;Sachkonto;Rechnungsdatum;Belegnummer;Kostenstelle;Buchungstext"); + foreach (var data in datensaetze) { bool storno = false; @@ -143,15 +163,18 @@ CONCAT(p.`LastName`, ', ', p.`FirstName`, ' ', IF(cb2sc.CustomerRefenrenceNumber { sb.AppendLine(); } + csvSb.AppendLine(); //03002022021500070EURO990037107S000001767690004050 15022200037810037200 RE R03-781 DAK-Gesundhei 00000000 sb.Append("0300"); if (buchungsdatum.HasValue) { sb.Append(String.Format("{0:yyyyMMdd}", buchungsdatum)); // + csvSb.Append(String.Format("{0:dd.MM.yyyy};", buchungsdatum)); // } else { sb.Append(String.Format("{0:yyyyMMdd}", data.Datum)); // + csvSb.Append(String.Format("{0:dd.MM.yyyy};", data.Datum)); // } sb.Append("00070"); @@ -164,8 +187,12 @@ CONCAT(p.`LastName`, ', ', p.`FirstName`, ' ', IF(cb2sc.CustomerRefenrenceNumber } sb.Append(debitornr); sb.Append("S"); + csvSb.Append(debitornr); + csvSb.Append(";"); String betrag = String.Format("{0:0.00}", data.Betrag); // Betrag + csvSb.Append(betrag); + csvSb.Append(";"); if (betrag.Contains("-")) // Storno { betrag = betrag.Replace("-", ""); @@ -182,8 +209,11 @@ CONCAT(p.`LastName`, ', ', p.`FirstName`, ' ', IF(cb2sc.CustomerRefenrenceNumber sb.Append(betrag); sb.Append("000"); sb.Append(data.Sachkonto); + csvSb.Append(data.Sachkonto); + csvSb.Append(";"); sb.Append(" "); sb.Append(String.Format("{0:ddMMyy}", data.RechnungsDatum)); // Belegdatum + csvSb.Append(String.Format("{0:dd.MM.yyyy};", data.RechnungsDatum)); String belegnummer = data.Belegnummer; // Belegnummer if (belegnummer.Contains("Storno")) { @@ -196,13 +226,16 @@ CONCAT(p.`LastName`, ', ', p.`FirstName`, ' ', IF(cb2sc.CustomerRefenrenceNumber belegnummer = "0" + belegnummer; } sb.Append(belegnummer); - + csvSb.Append(belegnummer); + csvSb.Append(";"); String kostenstelle = data.Kostenstelle; while (kostenstelle.Length < 7) { kostenstelle = "0" + kostenstelle; } sb.Append(kostenstelle); + csvSb.Append(kostenstelle); + csvSb.Append(";"); sb.Append(" "); // Skonto 9 Leerzeichen sb.Append(" "); // Textschlüssel 2 Leerzeichen if (storno) @@ -227,6 +260,7 @@ CONCAT(p.`LastName`, ', ', p.`FirstName`, ' ', IF(cb2sc.CustomerRefenrenceNumber { buchungstext = buchungstext + " "; } + csvSb.Append(buchungstext); sb.Append(buchungstext); sb.Append(" "); // Steuerbetrag 9 Leerzeichen sb.Append(" "); // Wechselfälligkeitsdatum 8 Leerzeichen @@ -245,6 +279,10 @@ CONCAT(p.`LastName`, ', ', p.`FirstName`, ' ', IF(cb2sc.CustomerRefenrenceNumber //sb.Append(data.Artikelbezeichnung); } + if (exportCsv) + { + return csvSb.ToString(); + } return sb.ToString(); } @@ -443,7 +481,7 @@ CONCAT(p.`LastName`, ', ', p.`FirstName`, ' ', IF(cb2sc.CustomerRefenrenceNumber } - private static String GetRechnungenSql(DateTime date, DateTime rechnungsDatumVon, DateTime rechnungsDatumBis, bool differenz) + private static String GetRechnungenSql(DateTime abrechnungStart, DateTime abrechnungEnde, DateTime rechnungsDatumVon, DateTime rechnungsDatumBis, bool differenz) { String sql = @" @@ -484,9 +522,8 @@ ORDER BY p.`LastName`, p.`FirstName`, cb2sc.`ApprovedStartDate` } else { - sql = sql.Replace(":MonatAbrechnung_Start", String.Format("{0:yyyy-MM}-01", date)); - date = date.AddMonths(1); - sql = sql.Replace(":MonatAbrechnung_End", String.Format("{0:yyyy-MM}-01", date)); + sql = sql.Replace(":MonatAbrechnung_Start", String.Format("{0:yyyy-MM}-01", abrechnungStart)); + sql = sql.Replace(":MonatAbrechnung_End", String.Format("{0:yyyy-MM}-01", abrechnungEnde.AddDays(1))); } return sql; } diff --git a/ReportImp/HphBersenbrueckFreizeitUndReisen/Abrechnung/AbrechnungsInfo.cs b/ReportImp/HphBersenbrueckFreizeitUndReisen/Abrechnung/AbrechnungsInfo.cs index c7094d3af..1834562c6 100644 --- a/ReportImp/HphBersenbrueckFreizeitUndReisen/Abrechnung/AbrechnungsInfo.cs +++ b/ReportImp/HphBersenbrueckFreizeitUndReisen/Abrechnung/AbrechnungsInfo.cs @@ -17,6 +17,23 @@ namespace HphBersenbrueckFreizeitUndReisen.Abrechnung public static decimal GetPreisForFreizeitangebot(Pflegegrad? pflegegrad, DateTime d) { + if (d >= new DateTime(2025, 1, 1)) + { + if (pflegegrad.HasValue) + { + switch (pflegegrad.Value) + { + case Pflegegrad.KeinGrad: + return 30; + case Pflegegrad.PflegegradBeantragt: + return 30; + default: + return 60; + } + } + + return 30; + } if (d >= new DateTime(2022, 1, 1)) { if (pflegegrad.HasValue) @@ -98,6 +115,23 @@ namespace HphBersenbrueckFreizeitUndReisen.Abrechnung public static decimal GetPreisForAusflugFreizeittreff(Pflegegrad? pflegegrad, DateTime d) { + if (d >= new DateTime(2025, 1, 1)) + { + if (pflegegrad.HasValue) + { + switch (pflegegrad.Value) + { + case Pflegegrad.KeinGrad: + return 53; + case Pflegegrad.PflegegradBeantragt: + return 53; + default: + return 105; + } + } + + return 49; + } if (d >= new DateTime(2022, 1, 1)) { if (pflegegrad.HasValue) @@ -178,6 +212,23 @@ namespace HphBersenbrueckFreizeitUndReisen.Abrechnung public static decimal GetPreisForReisen(Pflegegrad? pflegegrad, DateTime d) { + if (d >= new DateTime(2025, 1, 1)) + { + if (pflegegrad.HasValue) + { + switch (pflegegrad.Value) + { + case Pflegegrad.KeinGrad: + return 90; + case Pflegegrad.PflegegradBeantragt: + return 90; + default: + return 180; + } + } + + return 90; + } if (d >= new DateTime(2022, 1, 1)) { if (pflegegrad.HasValue) @@ -269,10 +320,10 @@ namespace HphBersenbrueckFreizeitUndReisen.Abrechnung public static decimal GetPreisForEinzelbetreuungHauptamtlich(DateTime dt) { - //if (dt >= new DateTime(2017, 1, 1)) - //{ - // return 26; - //} + if (dt >= new DateTime(2025, 1, 1)) + { + return 30; + } return 26; } @@ -381,7 +432,21 @@ namespace HphBersenbrueckFreizeitUndReisen.Abrechnung } } - + if (datum >= new DateTime(2025, 1, 1)) + { + if (hatPflegegrad) + { + preis = 135; + } + else + { + preis = 68; + } + + + return preis; + } + if (hatPflegegrad) { preis = 120; diff --git a/ReportImp/HphBersenbrueckFreizeitUndReisen/Helferentgelt.cs b/ReportImp/HphBersenbrueckFreizeitUndReisen/Helferentgelt.cs index 92cb53af2..db3dd391e 100644 --- a/ReportImp/HphBersenbrueckFreizeitUndReisen/Helferentgelt.cs +++ b/ReportImp/HphBersenbrueckFreizeitUndReisen/Helferentgelt.cs @@ -170,6 +170,91 @@ namespace HphBersenbrueckFreizeitUndReisen bool add = false; + + //CB: Bis 10.01.2025 + //foreach (var sr in serviceRecords) + //{ + // bool cont = false; + + // if (sr.InsTs.HasValue && instsStart <= sr.InsTs && sr.InsTs < instsStop.Date) + // { + // cont = true; + // } + // if (cont) + // { + // if (sr.ServiceDescription.Name.Contains("Einzelbetreuung") || sr.ServiceDescription.Name.Contains("Freizeithelfer")) + // { + // add = true; + // if (isMinijobber) + // { + // ro.StundenLoa51_35800 = (ro.StundenLoa51_35800 ?? 0) + sr.RoundedDuration/60; + // } + // else + // { + // ro.StundenLoA53_35700 = (ro.StundenLoA53_35700 ?? 0) + sr.RoundedDuration/60; + + // } + + // if (sr.DistanceInMeter.HasValue) + // { + // ro.KilometerLoa497 = (ro.KilometerLoa497 ?? 0) + sr.DistanceInMeter.Value; + // } + // } + // else if (sr.ServiceDescription.Name.Contains("Führungszeugnis")) + // { + // add = true; + + // var preis = GetPreisVonServiceDescription(sr.ServiceDescription, reportMonat); + // if (preis.HasValue) + // { + // ro.FührungszeugnisseLoa494 = (ro.FührungszeugnisseLoa494 ?? 0) + preis; + // } + // } + // else if (sr.ServiceDescription.ServiceCategory.Name.Contains("Helferentgelt")) + // { + // add = true; + + // if (sr.ServiceDescription.Name.Contains("Kurzreise")) + // { + // ro.StundenLoA44_35900 = (ro.StundenLoa51_35900 ?? 0) + sr.RoundedDuration / 60; + // } + // else if (sr.ServiceDescription.Name.Contains("Reise")) + // { + // ro.StundenLoA44_35900 = (ro.StundenLoA44_35900 ?? 0) + sr.RoundedDuration / 60; + // } + // else + // { + // var preis = GetPreisVonServiceDescription(sr.ServiceDescription, reportMonat); + // if (preis.HasValue) + // { + // //ro.FührungszeugnisseMinijobLoa494 = (ro.FührungszeugnisseMinijobLoa494 ?? 0) + preis; + // } + // } + // //var preis = GetPreisVonServiceDescription(sr.ServiceDescription, reportMonat); + // //if (preis.HasValue) + // //{ + // // int tage = 0; + + // // var start = sr.Start.Value; + // // while (start.Date <= sr.End.Value.Date) + // // { + // // tage++; + // // start = start.AddDays(1); + // // } + // // preis *= tage; + // // ro.ReisenLoa44 = (ro.ReisenLoa44 ?? 0) + preis; + // //} + + // if (sr.DistanceInMeter.HasValue) + // { + // ro.KilometerLoa497 = (ro.KilometerLoa497 ?? 0) + sr.DistanceInMeter.Value; + + // } + // } + // } + //} + + //CB: Ab 11.01.2025 foreach (var sr in serviceRecords) { bool cont = false; @@ -180,17 +265,67 @@ namespace HphBersenbrueckFreizeitUndReisen } if (cont) { - if (sr.ServiceDescription.Name.Contains("Einzelbetreuung") || sr.ServiceDescription.Name.Contains("Freizeithelfer")) + // Leistung: + + // LoA 53(Kostenstelle 35700 & 35800) + + //Einzelbetreuung + Einzelbetreuung hauptamtlich + + // = Kategorie Entlastungsbetrag, Verhinderungspflege, Eingliederungshilfe, Selbstzahler + + + + // LoA 44(Kostenstelle 35950) + + //Freizeitangebote, Freizeittreff + Ausflüge, Tagesfahrten + + //= Kategorie Entlastungsbetrag, Verhinderungspflege, Selbstzahler + + + + //LoA 44(Kostenstelle 35900) + + //Reisen + + //= Kategorie Entlastungsbetrag, Verhinderungspflege, Selbstzahler + + + + //Zudem kann bei den Kategorien raus: + + // Kurzzeitpflege + + // Wirtschaftl.Jugendhilfe + + // Stadt Salzgitter + + + + //Zudem kann die Leistung raus: + + // Kurzurlaub + + + + //Zudem nochmal die erste Mail: Können Sie die Helferentgeltliste aus dem BeWo so überarbeiten, dass die Stunden der Helfer für Einzelbetreuungen und Freizeitangebote(LoA 53) nicht mehr zusammengefasst, sondern jeweils in separaten Spalten aufgeführt werden? + + //Zudem kann LoA 51 ? nur Kostenstelle 35700 raus und LoA 54 soll durch LoA 497 ersetzt werden. + + var cat = sr.ServiceDescription.ServiceCategory.Name; + var desc = sr.ServiceDescription.Name; + + //Kostenstelle 35700+35800 + if (desc.Contains("Einzelbetreuung") && (cat.Contains("Entlastungsbetrag") || cat.Contains("Verhinderungspflege") || cat.Contains("Eingliederungshilfe") || cat.Contains("Selbstzahler"))) { add = true; if (isMinijobber) { - ro.StundenLoa51_35800 = (ro.StundenLoa51_35800 ?? 0) + sr.RoundedDuration/60; + ro.StundenLoa51_35800 = (ro.StundenLoa51_35800 ?? 0) + sr.RoundedDuration / 60; } else { - ro.StundenLoA53_35700 = (ro.StundenLoA53_35700 ?? 0) + sr.RoundedDuration/60; - + ro.StundenLoA53_35700 = (ro.StundenLoA53_35700 ?? 0) + sr.RoundedDuration / 60; + } if (sr.DistanceInMeter.HasValue) @@ -198,7 +333,8 @@ namespace HphBersenbrueckFreizeitUndReisen ro.KilometerLoa497 = (ro.KilometerLoa497 ?? 0) + sr.DistanceInMeter.Value; } } - else if (sr.ServiceDescription.Name.Contains("Führungszeugnis")) + //Kostenstelle 35950 + else if ((desc.Contains("Freizeitangebote") || desc.Contains("Freizeittreff") || desc.Contains("Tagesfahrt")) && (cat.Contains("Entlastungsbetrag") || cat.Contains("Verhinderungspflege") || cat.Contains("Selbstzahler"))) { add = true; @@ -208,7 +344,8 @@ namespace HphBersenbrueckFreizeitUndReisen ro.FührungszeugnisseLoa494 = (ro.FührungszeugnisseLoa494 ?? 0) + preis; } } - else if (sr.ServiceDescription.ServiceCategory.Name.Contains("Helferentgelt")) + //Kostenstelle 35900 + else if (desc.Contains("Reise") && (cat.Contains("Entlastungsbetrag") || cat.Contains("Verhinderungspflege") || cat.Contains("Selbstzahler"))) { add = true; @@ -246,7 +383,7 @@ namespace HphBersenbrueckFreizeitUndReisen if (sr.DistanceInMeter.HasValue) { ro.KilometerLoa497 = (ro.KilometerLoa497 ?? 0) + sr.DistanceInMeter.Value; - + } } } diff --git a/ReportImp/InputFamilienhilfe/CustomMitarbeiterstundenkontoBerechnung.cs b/ReportImp/InputFamilienhilfe/CustomMitarbeiterstundenkontoBerechnung.cs index bd927da15..7e192ca84 100644 --- a/ReportImp/InputFamilienhilfe/CustomMitarbeiterstundenkontoBerechnung.cs +++ b/ReportImp/InputFamilienhilfe/CustomMitarbeiterstundenkontoBerechnung.cs @@ -9,19 +9,32 @@ namespace InputFamilienhilfe { public class CustomMitarbeiterstundenkontoBerechnung : MitarbeiterstundenkontoBerechnung { - public override List GetFeiertage(int year) - { - var list = base.GetFeiertage(year); + //public override List GetFeiertage(int year) + //{ + // var list = base.GetFeiertage(year); - list.Add(new DateTime(year, 1, 6)); // , "Heilige Drei Könige")); + // list.Add(new DateTime(year, 1, 6)); // , "Heilige Drei Könige")); - list.Remove(new DateTime(year, 12, 24)); - //list.Add(new DateTime(year, 12, 31)); + // list.Remove(new DateTime(year, 12, 24)); + // //list.Add(new DateTime(year, 12, 31)); - return list; + // return list; + // } + + public override decimal GetFeiertagsFaktor(DateTime start) + { + if (start.Month == 12) + { + if (start.Day == 24 || start.Day == 31) + { + return 0.5m; + } + } + + return base.GetFeiertagsFaktor(start); } - public override bool AddServiceRecordToDuration(ServiceRecord item) + public override bool AddServiceRecordToDuration(ServiceRecord item) { if (item.ServiceDescription != null && item.ServiceDescription.ServiceCategory != null) { diff --git a/ReportImp/InputFamilienhilfe/InputFamilienhilfe.csproj b/ReportImp/InputFamilienhilfe/InputFamilienhilfe.csproj index 5797e9ea3..894578e6d 100644 --- a/ReportImp/InputFamilienhilfe/InputFamilienhilfe.csproj +++ b/ReportImp/InputFamilienhilfe/InputFamilienhilfe.csproj @@ -133,6 +133,7 @@ + Component diff --git a/ReportImp/InputFamilienhilfe/Service/CustomVacationService.cs b/ReportImp/InputFamilienhilfe/Service/CustomVacationService.cs new file mode 100644 index 000000000..207d0c3a3 --- /dev/null +++ b/ReportImp/InputFamilienhilfe/Service/CustomVacationService.cs @@ -0,0 +1,37 @@ +using BeWo.Service.Plugins; +using BS.Shared.DataContracts; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace InputFamilienhilfe.Service +{ + public class CustomVacationService : VacationService + { + public override List GetFeiertage(int year, String bundesland) + { + List list = base.GetFeiertage(year, bundesland); + + list.Add(new FeiertagDC { Datum = new DateTime(year, 1, 6), Name = "Heilige Drei Könige" }); + list.Add(new FeiertagDC { Datum = new DateTime(year, 12, 31), Name = "Silvester" }); + + return list; + } + + + public override decimal GetFeiertagsFaktor(DateTime start) + { + if (start.Month == 12) + { + if (start.Day == 24 || start.Day == 31) + { + return 0.5m; + } + } + + return base.GetFeiertagsFaktor(start); + } + } +} diff --git a/ReportImp/SHKService/CustomMitarbeiterstundenkontoBerechnung.cs b/ReportImp/SHKService/CustomMitarbeiterstundenkontoBerechnung.cs index f72053c4f..22187fe5d 100644 --- a/ReportImp/SHKService/CustomMitarbeiterstundenkontoBerechnung.cs +++ b/ReportImp/SHKService/CustomMitarbeiterstundenkontoBerechnung.cs @@ -12,6 +12,7 @@ namespace SHKService protected override void StarteBerechnung(DateTime berichtsAnfang, DateTime berichtsEnde, MitarbeiterstundenkontoRO.EmployeeDetail empDetail) { this.vacationService.Bundesland = "Hessen"; + AktuellBearbeitetesEmployeeDetail = empDetail; } public override bool AddServiceRecordToDuration(ServiceRecord item) @@ -36,10 +37,55 @@ namespace SHKService protected override bool HatArbeitszeitImZeitraum(IList arbeitszeiten, DateTime start, DateTime ende) { - return false; + //return false; + return base.HatArbeitszeitImZeitraum(arbeitszeiten, start, ende); } + protected override decimal GetSollNachArbeitszeitenFuerTag(Employee emp, DateTime tag) + { + //CB 14.01.2025: Wenn jemand Arbeitszeiten eingetragen hat, darf trotzdem nur das durschnittliche Soll für diesen Tag + //in das Gesamt Soll einfließen, egal wie die Uhrzeiten für diesen Arbeitstag definiert sind + + decimal soll = 0; + var fak = GetFeiertagsFaktor(tag); + + if (BerechneFeiertageAlsArbeitszeit()) + { + if (fak == 1) + { + fak = 0; + } + } + + if (fak < 1) + { + if (emp.Arbeitszeiten != null) + { + foreach (var az in emp.Arbeitszeiten) + { + if ((!az.GueltigVon.HasValue || az.GueltigVon.Value <= tag) && + (!az.GueltigBis.HasValue || az.GueltigBis.Value >= tag)) + { + var std = GetArbeitszeitStundenFuerTag(az, tag); + if (std > 0) + { + var c = emp.GetValidContractForDate(tag); + if (c != null && c.WeeklyTotalHours.HasValue && c.WeeklyDays.HasValue && c.WeeklyDays.Value > 0) + { + std = c.WeeklyTotalHours.Value / c.WeeklyDays.Value; + return std * (1 - fak); + } + } + soll += (std * (1 - fak)); + } + } + } + } + + return soll; + } + protected override ServiceRecordSummary BerechneStunden(MitarbeiterstundenkontoRO.EmployeeDetail empDetail, IList groupFilteredRecords, DateTime berichtsAnfang, DateTime berichtsEnde) { @@ -91,6 +137,7 @@ namespace SHKService out decimal alteExtraUeberstunden) { return base.BerechneUeberstundenBis(edOrig, records, monat, out ueberstunden, out alteExtraUeberstunden); + } public override IList CreateDayDetails(DateTime berichtStart, DateTime berichtEnde, MitarbeiterstundenkontoRO.EmployeeDetail ed, IList recordsAll) diff --git a/Service/Core/Utils.cs b/Service/Core/Utils.cs index c13ff289a..9fd94a42f 100644 --- a/Service/Core/Utils.cs +++ b/Service/Core/Utils.cs @@ -121,7 +121,7 @@ namespace BeWo.Service.Core else { body2 = "Kunde: " + MultitenancyOperationContextExt.Current.Tenant; - body2 += "\nE-Mail: " + senderEMail; + body2 += "\nRPL2-Mail: " + senderEMail; //body2 += "\r\nIP: " + GetClientIP(); } @@ -169,7 +169,7 @@ namespace BeWo.Service.Core if (senderEMail != from) { //Das hier rausnehmen wenn Mike OK gibt - message.ReplyToList.Add(new MailAddress(senderEMail, senderName)); + //message.ReplyToList.Add(new MailAddress(senderEMail, senderName)); } diff --git a/Service/DCEntityMapper/InvoiceItemDC_InvoiceItem.cs b/Service/DCEntityMapper/InvoiceItemDC_InvoiceItem.cs index c2c1af73a..4d6fb9e74 100644 --- a/Service/DCEntityMapper/InvoiceItemDC_InvoiceItem.cs +++ b/Service/DCEntityMapper/InvoiceItemDC_InvoiceItem.cs @@ -30,6 +30,22 @@ namespace BeWo.Service.DCEntityMapper pDataContract.MaxApprovedUnitCount = pEntity.MaxApprovedUnitCount; pDataContract.MaxApprovedAmount = pEntity.MaxApprovedAmount; pDataContract.Notice = pEntity.Notice; + pDataContract.CustomString1 = pEntity.CustomString1; + pDataContract.CustomString2 = pEntity.CustomString2; + pDataContract.CustomString3 = pEntity.CustomString3; + pDataContract.CustomString4 = pEntity.CustomString4; + pDataContract.CustomString5 = pEntity.CustomString5; + pDataContract.CustomNumber1 = pEntity.CustomNumber1; + pDataContract.CustomNumber2 = pEntity.CustomNumber2; + pDataContract.CustomNumber3 = pEntity.CustomNumber3; + pDataContract.CustomNumber4 = pEntity.CustomNumber4; + pDataContract.CustomNumber5 = pEntity.CustomNumber5; + pDataContract.CustomDate1 = pEntity.CustomDate1; + pDataContract.CustomDate2 = pEntity.CustomDate2; + pDataContract.CustomDate3 = pEntity.CustomDate3; + pDataContract.CustomDate4 = pEntity.CustomDate4; + pDataContract.CustomDate5 = pEntity.CustomDate5; + //pDataContract.CostRatePeriodOids2Versions = pEntity.CostRatePeriodList.ToDictionary(i => i.Oid.Value, i => i.Version.Value); if (pEntity.ServiceRecord != null) diff --git a/Service/Reporting/AnnualReportFactory.cs b/Service/Reporting/AnnualReportFactory.cs index a27aff7c5..c7c94d712 100644 --- a/Service/Reporting/AnnualReportFactory.cs +++ b/Service/Reporting/AnnualReportFactory.cs @@ -1503,7 +1503,7 @@ namespace BeWo.Service.Reporting if (sc.IsActive != ActivationTypeId.Deleted && customer.IsActive != ActivationTypeId.Deleted) { - if ((iCb2Sc.ApprovedStartDate.HasValue && iCb2Sc.ApprovedEndDate.HasValue)) + if (iCb2Sc.ApprovedStartDate.HasValue && iCb2Sc.ApprovedEndDate.HasValue) { if (CustomerBelongsToTeam(customer, TeamOid) && IsCustomerOfCustomerCareType(customer, CustomerCareTypeValueListEntryOid)) diff --git a/Service/ServiceImplementations/OperationsServiceImp.cs b/Service/ServiceImplementations/OperationsServiceImp.cs index 459b3a536..ab2962cdc 100644 --- a/Service/ServiceImplementations/OperationsServiceImp.cs +++ b/Service/ServiceImplementations/OperationsServiceImp.cs @@ -330,7 +330,7 @@ namespace BeWo.Service.ServiceImplementations { RemoveServiceRecordsFromConfirmationReceiptSignatureForDeletion(item.Group.ServiceRecordList); - DeleteServiceRecordsFromAppointments(item.Group.ServiceRecordList.ToList()); + DeleteServiceRecordsFromAppointments(item.Group.ServiceRecordList.ToList(), true); DAOFactory.GenericDAO.Delete(item.Group); } @@ -347,7 +347,7 @@ namespace BeWo.Service.ServiceImplementations RemoveServiceRecordsFromConfirmationReceiptSignatureForDeletion(srListToDelete); - DeleteServiceRecordsFromAppointments(srListToDelete); + DeleteServiceRecordsFromAppointments(srListToDelete, true); DAOFactory.GenericDAO.Delete(srListToDelete); } @@ -357,12 +357,14 @@ namespace BeWo.Service.ServiceImplementations } } - private static void DeleteServiceRecordsFromAppointments(List serviceRecords) + private static void DeleteServiceRecordsFromAppointments(List serviceRecords, bool deleteSignatures) { MakeServiceRecordHistoryEntry(serviceRecords, null, StatementType.Delete); - RemoveServiceRecordsFromConfirmationReceiptSignatures(MapperFactory.ServiceRecordDC_ServiceRecord.MapToNewDCs(serviceRecords), DAOFactory.GenericDAO.LoadByIDs(serviceRecords.Select(s => s.Oid.Value)), true); - + if (deleteSignatures) + { + RemoveServiceRecordsFromConfirmationReceiptSignatures(MapperFactory.ServiceRecordDC_ServiceRecord.MapToNewDCs(serviceRecords), DAOFactory.GenericDAO.LoadByIDs(serviceRecords.Select(s => s.Oid.Value)), true); + } var appointmentsToUpdate = DAOFactory.SearchDAO.LoadAppointmentsWithServiceRecords(serviceRecords.Select(s => s.Oid.Value).ToList()); appointmentsToUpdate.DoForEach(appointment => appointment.ServiceRecordList = appointment.ServiceRecordList.Where(sr => !serviceRecords.Select(s => s.Oid.Value).Contains(sr.Oid.Value)).ToList()); @@ -2319,6 +2321,9 @@ namespace BeWo.Service.ServiceImplementations // (Veraltet. Es ist keine Änderung an der Zeit bei vorhandener Einzelunterschrift) Bei geänderten Daten oder Uhrzeiten werden die Klientenunterschriften gelöscht var serviceRecords = pServiceRecordGroup.ServiceRecordList; var originalServiceRecords = lOriginal.ServiceRecordList.ToList(); + var records2Delete = originalServiceRecords.Where(x => x.Oid.HasValue && !serviceRecords.Where(s1 => s1.ServiceRecordOid.HasValue).Select(s => s.ServiceRecordOid.Value).Contains(x.Oid.Value)).ToList(); + DeleteServiceRecordsFromAppointments(records2Delete, false); + var serviceRecordOidsWithDeletedSingleSignatures = DeleteSignaturesFromServiceRecords(serviceRecords, originalServiceRecords); var serviceRecordsdWithRemovedConfirmationReceiptSignatures = RemoveServiceRecordsFromConfirmationReceiptSignatures(serviceRecords, originalServiceRecords, false); diff --git a/Shared/DataContracts/InvoiceItemDC.cs b/Shared/DataContracts/InvoiceItemDC.cs index accf98d44..5b480256f 100644 --- a/Shared/DataContracts/InvoiceItemDC.cs +++ b/Shared/DataContracts/InvoiceItemDC.cs @@ -76,5 +76,21 @@ namespace BS.Shared.DataContracts [DataMember] public String Notice { get; set; } + public String CustomString1 { get; set; } + public String CustomString2 { get; set; } + public String CustomString3 { get; set; } + public String CustomString4 { get; set; } + public String CustomString5 { get; set; } + public decimal? CustomNumber1 { get; set; } + public decimal? CustomNumber2 { get; set; } + public decimal? CustomNumber3 { get; set; } + public decimal? CustomNumber4 { get; set; } + public decimal? CustomNumber5 { get; set; } + public DateTime? CustomDate1 { get; set; } + public DateTime? CustomDate2 { get; set; } + public DateTime? CustomDate3 { get; set; } + public DateTime? CustomDate4 { get; set; } + public DateTime? CustomDate5 { get; set; } + } } \ No newline at end of file