From 89fa12dca50d58b179c7b1906fb35fd960079724 Mon Sep 17 00:00:00 2001 From: Alexandra Date: Wed, 6 May 2026 17:28:16 +0200 Subject: [PATCH] FeidPartnerReports/PersonalplanungReport - weitere Arbeiten SupportOID=161681 --- .../FeidPartnerReports/PersonalplanungRO.cs | 112 +++-- .../PersonalplanungReport.Designer.cs | 449 ++++++++++++++---- .../Translation/TranslationDictionary.cs | 4 +- 3 files changed, 442 insertions(+), 123 deletions(-) diff --git a/ReportImp/FeidPartnerReports/PersonalplanungRO.cs b/ReportImp/FeidPartnerReports/PersonalplanungRO.cs index 3555e737a..a6fa61477 100644 --- a/ReportImp/FeidPartnerReports/PersonalplanungRO.cs +++ b/ReportImp/FeidPartnerReports/PersonalplanungRO.cs @@ -21,40 +21,24 @@ namespace FeidPartnerReports { var ro = new PersonalplanungRO(); ro.ReportMonth = reportMonth; - var monthStart = new DateTime(reportMonth.Year, reportMonth.Month, 1); var monthEnd = monthStart.AddMonths(1).AddDays(-1); var nextMonthStart = monthEnd.AddDays(1); var nextMonthEnd = monthStart.AddMonths(2).AddDays(-1); var serviceRecordStart = monthStart.AddMonths(-3); - decimal weeksInPeriod = (decimal)(monthEnd - serviceRecordStart).TotalDays / 7m; + decimal weeksInPeriod = (decimal)(monthStart - serviceRecordStart).TotalDays / 7m; var employees = DAOFactory.GenericDAO.GetAllActive(); foreach (var emp in employees) { - // ServiceRecords des MAs für den 3-Monats-Zeitraum gebündelt laden - IList empServiceRecords = null; - try - { - empServiceRecords = DAOFactory.SearchDAO.FindEmployeeServiceRecords( - emp.Oid.Value, - new DateTimeSpan(serviceRecordStart, monthEnd), - null, null); - } - catch { } - - var groupMinutesByCb2scOid = empServiceRecords != null - ? empServiceRecords - .Where(sr => sr.CostBearer2SupportConceptOid.HasValue && sr.GroupOid.HasValue) - .GroupBy(sr => sr.CostBearer2SupportConceptOid.Value) - .ToDictionary(g => g.Key, g => g.Sum(sr => sr.RoundedDuration)) - : new Dictionary(); - var empName = $"{emp.Person.LastName}, {emp.Person.FirstName}"; var contract = emp.GetValidContractForDate(monthStart); decimal weeklyTotalHours = contract?.WeeklyTotalHours ?? 0m; decimal weeklyFLS = contract?.WeeklyFLS ?? 0m; + decimal weeklyRefinanziert = contract?.HourlyRate ?? 0m; + decimal weeklyNichtRefinanziert = contract?.GrossSalary ?? 0m; + decimal nettoFLS = Math.Max(0m, weeklyFLS - weeklyRefinanziert - weeklyNichtRefinanziert); var cb2scEntries = new Dictionary(); var processedScapOids = new HashSet(); @@ -150,12 +134,17 @@ namespace FeidPartnerReports } // --- Zeilen erzeugen --- + var empRows = new List(); foreach (var entry in cb2scEntries.Values) { var cb2sc = entry.Cb2Sc; var sc = cb2sc.SupportConcept; if (sc == null || sc.IsActive == ActivationTypeId.Deleted || sc.IsActive == ActivationTypeId.Archived) continue; var customer = sc.Customer; + if (customer.Person.FirstNameLastName.Contains("Giovanni")) + { + var test = 1; + } if (customer == null || customer.IsActive != ActivationTypeId.Active) continue; if (customer.TerminationDate.HasValue && customer.TerminationDate.Value < monthStart) continue; @@ -169,17 +158,35 @@ namespace FeidPartnerReports if (bewilligtThis == 0m && bewilligtNext == 0m) continue; - decimal avgGruppeStdProWoche = 0m; - if (cb2sc.Oid.HasValue - && groupMinutesByCb2scOid.TryGetValue(cb2sc.Oid.Value, out decimal gruppeMin) - && weeksInPeriod > 0) - avgGruppeStdProWoche = (gruppeMin / 60m) / weeksInPeriod; + // Gesamte bewilligte Std/Woche aus dem Hilfeplan (unabhängig vom MA-Anteil) + decimal bewilligtGesamtThis = entry.ScapThis != null ? GetRawApprovedHoursPerWeek(entry.ScapThis, cb2sc) : 0m; + decimal bewilligtGesamtNext = entry.ScapNext != null ? GetRawApprovedHoursPerWeek(entry.ScapNext, cb2sc) : 0m; - decimal geleistetThis = Math.Max(0m, bewilligtThis - avgGruppeStdProWoche); - decimal geleistetNext = Math.Max(0m, bewilligtNext - avgGruppeStdProWoche); + // MA-Anteil am Hilfeplan (0..1) + decimal anteilMAThis = bewilligtGesamtThis > 0 ? bewilligtThis / bewilligtGesamtThis : 0m; + decimal anteilMANext = bewilligtGesamtNext > 0 ? bewilligtNext / bewilligtGesamtNext : 0m; - decimal auslastungThis = bewilligtThis > 0 ? Math.Round((geleistetThis / bewilligtThis) * 100m, 1) : 0m; - decimal auslastungNext = bewilligtNext > 0 ? Math.Round((geleistetNext / bewilligtNext) * 100m, 1) : 0m; + // Alle Gruppenbuchungen für diesen cb2sc (alle MAs, letzten 3 Monate) + decimal avgGruppeGesamtStdProWoche = 0m; + try + { + var allGroupRecords = DAOFactory.SearchDAO.FindServiceRecordsInSpan( + cb2sc.Oid.Value, + new DateTimeSpan(serviceRecordStart, monthEnd)); + decimal gruppeMinGesamt = allGroupRecords? + .Where(sr => sr.GroupOid.HasValue) + .Sum(sr => sr.RoundedDuration) ?? 0m; + if (weeksInPeriod > 0) + avgGruppeGesamtStdProWoche = (gruppeMinGesamt / 60m) / weeksInPeriod; + } + catch { } + + // Rechnerischer Gruppen-Anteil des MAs = Gesamtgruppenstd * MA-Anteil + decimal gruppenanteilThis = Math.Round(avgGruppeGesamtStdProWoche * anteilMAThis, 2); + decimal gruppenanteilNext = Math.Round(avgGruppeGesamtStdProWoche * anteilMANext, 2); + + decimal auslastungThis = nettoFLS > 0 ? Math.Round((bewilligtThis - gruppenanteilThis) / nettoFLS * 100m, 1) : 0m; + decimal auslastungNext = nettoFLS > 0 ? Math.Round((bewilligtNext - gruppenanteilNext) / nettoFLS * 100m, 1) : 0m; var relevantScap = entry.ScapThis ?? entry.ScapNext; DateTime? enddatum = null; @@ -192,23 +199,39 @@ namespace FeidPartnerReports var wohnort = ""; try { wohnort = customer.Person?.Address?.Town ?? ""; } catch { } - ro.Rows.Add(new PersonalplanungRow + empRows.Add(new PersonalplanungRow { MitarbeiterName = empName, VertragWochenstunden = weeklyTotalHours, VertragFLSProWoche = weeklyFLS, + VertragRefinanziert = weeklyRefinanziert, + VertragNichtRefinanziert = weeklyNichtRefinanziert, KlientName = $"{customer.Person.LastName}, {customer.Person.FirstName}", Kostentraeger = kostentraeger, WohnortKlient = wohnort, + BewilligteStdGesamtProWoche = Math.Round(bewilligtGesamtThis, 2), + AnteilMAamHP = Math.Round(anteilMAThis * 100m, 1), BewilligteStdProWoche = Math.Round(bewilligtThis, 2), - GeleisteteStdProWoche = Math.Round(geleistetThis, 2), + GruppenanteilStdProWoche = gruppenanteilThis, AuslastungProWoche = auslastungThis, + BewilligteStdGesamtProWocheNext = Math.Round(bewilligtGesamtNext, 2), + AnteilMAamHPNext = Math.Round(anteilMANext * 100m, 1), BewilligteStdProWocheNaechsterMonat = Math.Round(bewilligtNext, 2), - GeleisteteStdProWocheNaechsterMonat = Math.Round(geleistetNext, 2), + GruppenanteilStdProWocheNext = gruppenanteilNext, AuslastungProWocheNaechsterMonat = auslastungNext, Enddatum = enddatum, }); } + + // SummeGeleistet = Summe aller (BewMA - Gruppenanteil) über alle Klienten dieses MAs + decimal sumGeleistetThis = empRows.Sum(r => Math.Max(0m, r.BewilligteStdProWoche - r.GruppenanteilStdProWoche)); + decimal sumGeleistetNext = empRows.Sum(r => Math.Max(0m, r.BewilligteStdProWocheNaechsterMonat - r.GruppenanteilStdProWocheNext)); + foreach (var row in empRows) + { + row.SummeGeleistet = sumGeleistetThis; + row.SummeGeleistetNext = sumGeleistetNext; + } + ro.Rows.AddRange(empRows); } ro.Rows.Sort((a, b) => @@ -309,19 +332,34 @@ namespace FeidPartnerReports public string MitarbeiterName { get; set; } public decimal VertragWochenstunden { get; set; } public decimal VertragFLSProWoche { get; set; } - public string VertragInfo => VertragWochenstunden > 0 || VertragFLSProWoche > 0 - ? $"Std/Wo: {VertragWochenstunden:0.##}, FLS/Wo: {VertragFLSProWoche:0.##}" - : ""; + public decimal VertragRefinanziert { get; set; } + public decimal VertragNichtRefinanziert { get; set; } + public decimal VertragNettoFLS => Math.Max(0m, VertragFLSProWoche - VertragRefinanziert - VertragNichtRefinanziert); + public decimal SummeGeleistet { get; set; } + public decimal VertragAuslastung => VertragNettoFLS > 0 ? Math.Round(SummeGeleistet / VertragNettoFLS * 100m, 1) : 0m; + public string VertragAuslastungFormatted => VertragAuslastung.ToString("0.0") + " %"; + public decimal SummeGeleistetNext { get; set; } + public decimal VertragAuslastungNext => VertragNettoFLS > 0 ? Math.Round(SummeGeleistetNext / VertragNettoFLS * 100m, 1) : 0m; + public string VertragAuslastungNextFormatted => VertragAuslastungNext.ToString("0.0") + " %"; + public string KlientName { get; set; } public string Kostentraeger { get; set; } public string WohnortKlient { get; set; } + // Dieser Monat + public decimal BewilligteStdGesamtProWoche { get; set; } + public decimal AnteilMAamHP { get; set; } + public string AnteilMAamHPFormatted => AnteilMAamHP.ToString("0.0") + " %"; public decimal BewilligteStdProWoche { get; set; } - public decimal GeleisteteStdProWoche { get; set; } + public decimal GruppenanteilStdProWoche { get; set; } public decimal AuslastungProWoche { get; set; } + // Nächster Monat + public decimal BewilligteStdGesamtProWocheNext { get; set; } + public decimal AnteilMAamHPNext { get; set; } + public string AnteilMAamHPNextFormatted => AnteilMAamHPNext.ToString("0.0") + " %"; public decimal BewilligteStdProWocheNaechsterMonat { get; set; } - public decimal GeleisteteStdProWocheNaechsterMonat { get; set; } + public decimal GruppenanteilStdProWocheNext { get; set; } public decimal AuslastungProWocheNaechsterMonat { get; set; } public DateTime? Enddatum { get; set; } diff --git a/ReportImp/FeidPartnerReports/PersonalplanungReport.Designer.cs b/ReportImp/FeidPartnerReports/PersonalplanungReport.Designer.cs index 53a784653..2167544ea 100644 --- a/ReportImp/FeidPartnerReports/PersonalplanungReport.Designer.cs +++ b/ReportImp/FeidPartnerReports/PersonalplanungReport.Designer.cs @@ -23,16 +23,40 @@ namespace FeidPartnerReports this.cellKlient = new DevExpress.XtraReports.UI.XRTableCell(); this.cellKostentraeger = new DevExpress.XtraReports.UI.XRTableCell(); this.cellWohnort = new DevExpress.XtraReports.UI.XRTableCell(); + this.cellBewilligtGesamt = new DevExpress.XtraReports.UI.XRTableCell(); + this.cellAnteilMA = new DevExpress.XtraReports.UI.XRTableCell(); this.cellBewilligt = new DevExpress.XtraReports.UI.XRTableCell(); - this.cellGeleistet = new DevExpress.XtraReports.UI.XRTableCell(); + this.cellGruppenanteil = new DevExpress.XtraReports.UI.XRTableCell(); this.cellAuslastung = new DevExpress.XtraReports.UI.XRTableCell(); + this.cellBewilligtGesamtNext = new DevExpress.XtraReports.UI.XRTableCell(); + this.cellAnteilMANext = new DevExpress.XtraReports.UI.XRTableCell(); this.cellBewilligtNext = new DevExpress.XtraReports.UI.XRTableCell(); - this.cellGeleistetNext = new DevExpress.XtraReports.UI.XRTableCell(); + this.cellGruppenanteilNext = new DevExpress.XtraReports.UI.XRTableCell(); this.cellAuslastungNext = new DevExpress.XtraReports.UI.XRTableCell(); this.cellEnddatum = new DevExpress.XtraReports.UI.XRTableCell(); this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); this.xrLabelMitarbeiter = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabelVertragInfo = new DevExpress.XtraReports.UI.XRLabel(); + this.xrTableVertrag = new DevExpress.XtraReports.UI.XRTable(); + this.xrRowVertrag1 = new DevExpress.XtraReports.UI.XRTableRow(); + this.cellVH1 = new DevExpress.XtraReports.UI.XRTableCell(); + this.cellVH2 = new DevExpress.XtraReports.UI.XRTableCell(); + this.cellVH3 = new DevExpress.XtraReports.UI.XRTableCell(); + this.cellVH4 = new DevExpress.XtraReports.UI.XRTableCell(); + this.cellVH5 = new DevExpress.XtraReports.UI.XRTableCell(); + this.cellVH6 = new DevExpress.XtraReports.UI.XRTableCell(); + this.cellVH7 = new DevExpress.XtraReports.UI.XRTableCell(); + this.cellVH8 = new DevExpress.XtraReports.UI.XRTableCell(); + this.cellVH9 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrRowVertrag2 = new DevExpress.XtraReports.UI.XRTableRow(); + this.cellVWochenstunden = new DevExpress.XtraReports.UI.XRTableCell(); + this.cellVFLS = new DevExpress.XtraReports.UI.XRTableCell(); + this.cellVRefinanziert = new DevExpress.XtraReports.UI.XRTableCell(); + this.cellVNichtRefinanziert = new DevExpress.XtraReports.UI.XRTableCell(); + this.cellVNettoFLS = new DevExpress.XtraReports.UI.XRTableCell(); + this.cellVSummeGeleistet = new DevExpress.XtraReports.UI.XRTableCell(); + this.cellVAuslastung = new DevExpress.XtraReports.UI.XRTableCell(); + this.cellVSummeGeleistetNext = new DevExpress.XtraReports.UI.XRTableCell(); + this.cellVAuslastungNext = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableHeader = new DevExpress.XtraReports.UI.XRTable(); this.xrRowHeader1 = new DevExpress.XtraReports.UI.XRTableRow(); this.cellHKlientSpan = new DevExpress.XtraReports.UI.XRTableCell(); @@ -45,11 +69,15 @@ namespace FeidPartnerReports this.cellHKlient = new DevExpress.XtraReports.UI.XRTableCell(); this.cellHKostentraeger = new DevExpress.XtraReports.UI.XRTableCell(); this.cellHWohnort = new DevExpress.XtraReports.UI.XRTableCell(); + this.cellHBewilligtGesamt = new DevExpress.XtraReports.UI.XRTableCell(); + this.cellHAnteilMA = new DevExpress.XtraReports.UI.XRTableCell(); this.cellHBewilligt = new DevExpress.XtraReports.UI.XRTableCell(); - this.cellHGeleistet = new DevExpress.XtraReports.UI.XRTableCell(); + this.cellHGruppenanteil = new DevExpress.XtraReports.UI.XRTableCell(); this.cellHAuslastung = new DevExpress.XtraReports.UI.XRTableCell(); + this.cellHBewilligtGesamtNext = new DevExpress.XtraReports.UI.XRTableCell(); + this.cellHAnteilMANext = new DevExpress.XtraReports.UI.XRTableCell(); this.cellHBewilligtNext = new DevExpress.XtraReports.UI.XRTableCell(); - this.cellHGeleistetNext = new DevExpress.XtraReports.UI.XRTableCell(); + this.cellHGruppenanteilNext = new DevExpress.XtraReports.UI.XRTableCell(); this.cellHAuslastungNext = new DevExpress.XtraReports.UI.XRTableCell(); this.cellHEnddatum = new DevExpress.XtraReports.UI.XRTableCell(); this.PageHeader = new DevExpress.XtraReports.UI.PageHeaderBand(); @@ -60,6 +88,7 @@ namespace FeidPartnerReports this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTableVertrag)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // @@ -89,11 +118,15 @@ namespace FeidPartnerReports this.cellKlient, this.cellKostentraeger, this.cellWohnort, + this.cellBewilligtGesamt, + this.cellAnteilMA, this.cellBewilligt, - this.cellGeleistet, + this.cellGruppenanteil, this.cellAuslastung, + this.cellBewilligtGesamtNext, + this.cellAnteilMANext, this.cellBewilligtNext, - this.cellGeleistetNext, + this.cellGruppenanteilNext, this.cellAuslastungNext, this.cellEnddatum}); this.xrRowDetail.Name = "xrRowDetail"; @@ -104,21 +137,37 @@ namespace FeidPartnerReports this.cellKlient.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "KlientName")}); this.cellKlient.Name = "cellKlient"; - this.cellKlient.Weight = 2.5D; + this.cellKlient.Weight = 2D; // // cellKostentraeger // this.cellKostentraeger.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Kostentraeger")}); this.cellKostentraeger.Name = "cellKostentraeger"; - this.cellKostentraeger.Weight = 2D; + this.cellKostentraeger.Weight = 1.5D; // // cellWohnort // this.cellWohnort.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "WohnortKlient")}); this.cellWohnort.Name = "cellWohnort"; - this.cellWohnort.Weight = 1.5D; + this.cellWohnort.Weight = 1.0647474299839566D; + // + // cellBewilligtGesamt + // + this.cellBewilligtGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "BewilligteStdGesamtProWoche", "{0:0.00}")}); + this.cellBewilligtGesamt.Name = "cellBewilligtGesamt"; + this.cellBewilligtGesamt.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.cellBewilligtGesamt.Weight = 0.91294981384277352D; + // + // cellAnteilMA + // + this.cellAnteilMA.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "AnteilMAamHPFormatted")}); + this.cellAnteilMA.Name = "cellAnteilMA"; + this.cellAnteilMA.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.cellAnteilMA.Weight = 0.72230275617327011D; // // cellBewilligt // @@ -126,15 +175,15 @@ namespace FeidPartnerReports new DevExpress.XtraReports.UI.XRBinding("Text", null, "BewilligteStdProWoche", "{0:0.00}")}); this.cellBewilligt.Name = "cellBewilligt"; this.cellBewilligt.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.cellBewilligt.Weight = 1D; + this.cellBewilligt.Weight = 0.9D; // - // cellGeleistet + // cellGruppenanteil // - this.cellGeleistet.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "GeleisteteStdProWoche", "{0:0.00}")}); - this.cellGeleistet.Name = "cellGeleistet"; - this.cellGeleistet.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.cellGeleistet.Weight = 1D; + this.cellGruppenanteil.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "GruppenanteilStdProWoche", "{0:0.00}")}); + this.cellGruppenanteil.Name = "cellGruppenanteil"; + this.cellGruppenanteil.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.cellGruppenanteil.Weight = 0.9D; // // cellAuslastung // @@ -142,7 +191,23 @@ namespace FeidPartnerReports new DevExpress.XtraReports.UI.XRBinding("Text", null, "AuslastungFormatted")}); this.cellAuslastung.Name = "cellAuslastung"; this.cellAuslastung.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.cellAuslastung.Weight = 1D; + this.cellAuslastung.Weight = 0.8D; + // + // cellBewilligtGesamtNext + // + this.cellBewilligtGesamtNext.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "BewilligteStdGesamtProWocheNext", "{0:0.00}")}); + this.cellBewilligtGesamtNext.Name = "cellBewilligtGesamtNext"; + this.cellBewilligtGesamtNext.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.cellBewilligtGesamtNext.Weight = 0.9D; + // + // cellAnteilMANext + // + this.cellAnteilMANext.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "AnteilMAamHPNextFormatted")}); + this.cellAnteilMANext.Name = "cellAnteilMANext"; + this.cellAnteilMANext.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.cellAnteilMANext.Weight = 0.8D; // // cellBewilligtNext // @@ -150,15 +215,15 @@ namespace FeidPartnerReports new DevExpress.XtraReports.UI.XRBinding("Text", null, "BewilligteStdProWocheNaechsterMonat", "{0:0.00}")}); this.cellBewilligtNext.Name = "cellBewilligtNext"; this.cellBewilligtNext.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.cellBewilligtNext.Weight = 1D; + this.cellBewilligtNext.Weight = 0.9D; // - // cellGeleistetNext + // cellGruppenanteilNext // - this.cellGeleistetNext.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "GeleisteteStdProWocheNaechsterMonat", "{0:0.00}")}); - this.cellGeleistetNext.Name = "cellGeleistetNext"; - this.cellGeleistetNext.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.cellGeleistetNext.Weight = 1D; + this.cellGruppenanteilNext.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "GruppenanteilStdProWocheNext", "{0:0.00}")}); + this.cellGruppenanteilNext.Name = "cellGruppenanteilNext"; + this.cellGruppenanteilNext.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.cellGruppenanteilNext.Weight = 0.9D; // // cellAuslastungNext // @@ -166,7 +231,7 @@ namespace FeidPartnerReports new DevExpress.XtraReports.UI.XRBinding("Text", null, "AuslastungNaechsterMonatFormatted")}); this.cellAuslastungNext.Name = "cellAuslastungNext"; this.cellAuslastungNext.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.cellAuslastungNext.Weight = 1D; + this.cellAuslastungNext.Weight = 0.8D; // // cellEnddatum // @@ -180,11 +245,11 @@ namespace FeidPartnerReports // this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrLabelMitarbeiter, - this.xrLabelVertragInfo, + this.xrTableVertrag, this.xrTableHeader}); this.GroupHeader1.GroupFields.AddRange(new DevExpress.XtraReports.UI.GroupField[] { new DevExpress.XtraReports.UI.GroupField("MitarbeiterName", DevExpress.XtraReports.UI.XRColumnSortOrder.Ascending)}); - this.GroupHeader1.HeightF = 102F; + this.GroupHeader1.HeightF = 114F; this.GroupHeader1.Name = "GroupHeader1"; this.GroupHeader1.RepeatEveryPage = true; // @@ -195,23 +260,172 @@ namespace FeidPartnerReports this.xrLabelMitarbeiter.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold); this.xrLabelMitarbeiter.LocationFloat = new DevExpress.Utils.PointFloat(0F, 2F); this.xrLabelMitarbeiter.Name = "xrLabelMitarbeiter"; - this.xrLabelMitarbeiter.SizeF = new System.Drawing.SizeF(500F, 18F); + this.xrLabelMitarbeiter.SizeF = new System.Drawing.SizeF(600F, 18F); this.xrLabelMitarbeiter.StylePriority.UseFont = false; // - // xrLabelVertragInfo + // xrTableVertrag // - this.xrLabelVertragInfo.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "VertragInfo")}); - this.xrLabelVertragInfo.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrLabelVertragInfo.LocationFloat = new DevExpress.Utils.PointFloat(0F, 22F); - this.xrLabelVertragInfo.Name = "xrLabelVertragInfo"; - this.xrLabelVertragInfo.SizeF = new System.Drawing.SizeF(500F, 18F); - this.xrLabelVertragInfo.StylePriority.UseFont = false; + this.xrTableVertrag.Font = new DevExpress.Drawing.DXFont("Arial", 8F); + this.xrTableVertrag.LocationFloat = new DevExpress.Utils.PointFloat(0F, 22F); + this.xrTableVertrag.Name = "xrTableVertrag"; + this.xrTableVertrag.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrRowVertrag1, + this.xrRowVertrag2}); + this.xrTableVertrag.SizeF = new System.Drawing.SizeF(1050F, 35F); // + // xrRowVertrag1 + // + this.xrRowVertrag1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.cellVH1, + this.cellVH2, + this.cellVH3, + this.cellVH4, + this.cellVH5, + this.cellVH6, + this.cellVH7, + this.cellVH8, + this.cellVH9}); + this.xrRowVertrag1.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrRowVertrag1.Name = "xrRowVertrag1"; + this.xrRowVertrag1.StylePriority.UseFont = false; + this.xrRowVertrag1.Weight = 0.75D; + // + // cellVH1 + // + this.cellVH1.Name = "cellVH1"; + this.cellVH1.Text = "Std/Wo (Vertrag)"; + this.cellVH1.Weight = 1D; + // + // cellVH2 + // + this.cellVH2.Name = "cellVH2"; + this.cellVH2.Text = "FLS/Wo"; + this.cellVH2.Weight = 1D; + // + // cellVH3 + // + this.cellVH3.Name = "cellVH3"; + this.cellVH3.Text = "Ref. Aufgaben Std/Wo"; + this.cellVH3.Weight = 1D; + // + // cellVH4 + // + this.cellVH4.Name = "cellVH4"; + this.cellVH4.Text = "Nicht ref. Aufgaben Std/Wo"; + this.cellVH4.Weight = 1D; + // + // cellVH5 + // + this.cellVH5.Name = "cellVH5"; + this.cellVH5.Text = "Netto FLS/Wo"; + this.cellVH5.Weight = 1D; + // + // cellVH6 + // + this.cellVH6.Name = "cellVH6"; + this.cellVH6.Text = "Summe Gel. Std"; + this.cellVH6.Weight = 1D; + // + // cellVH7 + // + this.cellVH7.Name = "cellVH7"; + this.cellVH7.Text = "Auslastung"; + this.cellVH7.Weight = 1D; + // + // cellVH8 + // + this.cellVH8.Name = "cellVH8"; + this.cellVH8.Text = "Summe Gel. Std (FM)"; + this.cellVH8.Weight = 1D; + // + // cellVH9 + // + this.cellVH9.Name = "cellVH9"; + this.cellVH9.Text = "Auslastung (FM)"; + this.cellVH9.Weight = 1D; + // + // xrRowVertrag2 + // + this.xrRowVertrag2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.cellVWochenstunden, + this.cellVFLS, + this.cellVRefinanziert, + this.cellVNichtRefinanziert, + this.cellVNettoFLS, + this.cellVSummeGeleistet, + this.cellVAuslastung, + this.cellVSummeGeleistetNext, + this.cellVAuslastungNext}); + this.xrRowVertrag2.Name = "xrRowVertrag2"; + this.xrRowVertrag2.Weight = 1D; + // + // cellVWochenstunden + // + this.cellVWochenstunden.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "VertragWochenstunden", "{0:0.##}")}); + this.cellVWochenstunden.Name = "cellVWochenstunden"; + this.cellVWochenstunden.Weight = 1D; + // + // cellVFLS + // + this.cellVFLS.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "VertragFLSProWoche", "{0:0.##}")}); + this.cellVFLS.Name = "cellVFLS"; + this.cellVFLS.Weight = 1D; + // + // cellVRefinanziert + // + this.cellVRefinanziert.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "VertragRefinanziert", "{0:0.##}")}); + this.cellVRefinanziert.Name = "cellVRefinanziert"; + this.cellVRefinanziert.Weight = 1D; + // + // cellVNichtRefinanziert + // + this.cellVNichtRefinanziert.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "VertragNichtRefinanziert", "{0:0.##}")}); + this.cellVNichtRefinanziert.Name = "cellVNichtRefinanziert"; + this.cellVNichtRefinanziert.Weight = 1D; + // + // cellVNettoFLS + // + this.cellVNettoFLS.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "VertragNettoFLS", "{0:0.##}")}); + this.cellVNettoFLS.Name = "cellVNettoFLS"; + this.cellVNettoFLS.Weight = 1D; + // + // cellVSummeGeleistet + // + this.cellVSummeGeleistet.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "SummeGeleistet", "{0:0.##}")}); + this.cellVSummeGeleistet.Name = "cellVSummeGeleistet"; + this.cellVSummeGeleistet.Weight = 1D; + // + // cellVAuslastung + // + this.cellVAuslastung.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "VertragAuslastungFormatted")}); + this.cellVAuslastung.Name = "cellVAuslastung"; + this.cellVAuslastung.Weight = 1D; + // + // cellVSummeGeleistetNext + // + this.cellVSummeGeleistetNext.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "SummeGeleistetNext", "{0:0.##}")}); + this.cellVSummeGeleistetNext.Name = "cellVSummeGeleistetNext"; + this.cellVSummeGeleistetNext.Weight = 1D; + // + // cellVAuslastungNext + // + this.cellVAuslastungNext.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "VertragAuslastungNextFormatted")}); + this.cellVAuslastungNext.Name = "cellVAuslastungNext"; + this.cellVAuslastungNext.Weight = 1D; + // // xrTableHeader // this.xrTableHeader.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrTableHeader.LocationFloat = new DevExpress.Utils.PointFloat(0F, 52F); + this.xrTableHeader.LocationFloat = new DevExpress.Utils.PointFloat(0F, 64F); this.xrTableHeader.Name = "xrTableHeader"; this.xrTableHeader.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrRowHeader1, @@ -233,42 +447,38 @@ namespace FeidPartnerReports // cellHKlientSpan // this.cellHKlientSpan.Name = "cellHKlientSpan"; - this.cellHKlientSpan.Weight = 2.5D; + this.cellHKlientSpan.Weight = 2D; // // cellHKostentraegerSpan // - this.cellHKostentraegerSpan.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold); this.cellHKostentraegerSpan.Name = "cellHKostentraegerSpan"; - this.cellHKostentraegerSpan.StylePriority.UseFont = false; - this.cellHKostentraegerSpan.Weight = 2D; + this.cellHKostentraegerSpan.Weight = 1.4503550218854631D; // // cellHWohnortSpan // this.cellHWohnortSpan.Name = "cellHWohnortSpan"; - this.cellHWohnortSpan.Weight = 1.5D; + this.cellHWohnortSpan.Weight = 1.0496449781145369D; // // cellHDieserMonat // this.cellHDieserMonat.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold); this.cellHDieserMonat.Name = "cellHDieserMonat"; this.cellHDieserMonat.StylePriority.UseFont = false; - this.cellHDieserMonat.Text = "Dieser Monat"; this.cellHDieserMonat.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.cellHDieserMonat.Weight = 3D; + this.cellHDieserMonat.Weight = 4.3D; // // cellHNaechsterMonat // this.cellHNaechsterMonat.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold); this.cellHNaechsterMonat.Name = "cellHNaechsterMonat"; this.cellHNaechsterMonat.StylePriority.UseFont = false; - this.cellHNaechsterMonat.Text = "Nächster Monat"; this.cellHNaechsterMonat.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.cellHNaechsterMonat.Weight = 3D; + this.cellHNaechsterMonat.Weight = 4.3D; // // cellHEnddatumSpan // this.cellHEnddatumSpan.Name = "cellHEnddatumSpan"; - this.cellHEnddatumSpan.Weight = 1D; + this.cellHEnddatumSpan.Weight = 0.8D; // // xrRowHeader2 // @@ -276,11 +486,15 @@ namespace FeidPartnerReports this.cellHKlient, this.cellHKostentraeger, this.cellHWohnort, + this.cellHBewilligtGesamt, + this.cellHAnteilMA, this.cellHBewilligt, - this.cellHGeleistet, + this.cellHGruppenanteil, this.cellHAuslastung, + this.cellHBewilligtGesamtNext, + this.cellHAnteilMANext, this.cellHBewilligtNext, - this.cellHGeleistetNext, + this.cellHGruppenanteilNext, this.cellHAuslastungNext, this.cellHEnddatum}); this.xrRowHeader2.Name = "xrRowHeader2"; @@ -288,90 +502,126 @@ namespace FeidPartnerReports // // cellHKlient // - this.cellHKlient.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold); + this.cellHKlient.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold); this.cellHKlient.Name = "cellHKlient"; this.cellHKlient.StylePriority.UseFont = false; this.cellHKlient.Text = "Klient"; - this.cellHKlient.Weight = 2.5D; + this.cellHKlient.Weight = 2D; // // cellHKostentraeger // - this.cellHKostentraeger.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold); + this.cellHKostentraeger.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold); this.cellHKostentraeger.Name = "cellHKostentraeger"; this.cellHKostentraeger.StylePriority.UseFont = false; this.cellHKostentraeger.Text = "Kostenträger"; - this.cellHKostentraeger.Weight = 2D; + this.cellHKostentraeger.Weight = 1.4503550218854631D; // // cellHWohnort // - this.cellHWohnort.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold); + this.cellHWohnort.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold); this.cellHWohnort.Name = "cellHWohnort"; this.cellHWohnort.StylePriority.UseFont = false; this.cellHWohnort.Text = "Wohnort"; - this.cellHWohnort.Weight = 1.5D; + this.cellHWohnort.Weight = 1.0496449781145369D; + // + // cellHBewilligtGesamt + // + this.cellHBewilligtGesamt.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold); + this.cellHBewilligtGesamt.Name = "cellHBewilligtGesamt"; + this.cellHBewilligtGesamt.StylePriority.UseFont = false; + this.cellHBewilligtGesamt.Text = "Bew. Ges."; + this.cellHBewilligtGesamt.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.cellHBewilligtGesamt.Weight = 0.9D; + // + // cellHAnteilMA + // + this.cellHAnteilMA.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold); + this.cellHAnteilMA.Name = "cellHAnteilMA"; + this.cellHAnteilMA.StylePriority.UseFont = false; + this.cellHAnteilMA.Text = "% MA am HP"; + this.cellHAnteilMA.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.cellHAnteilMA.Weight = 0.8D; // // cellHBewilligt // - this.cellHBewilligt.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold); + this.cellHBewilligt.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold); this.cellHBewilligt.Name = "cellHBewilligt"; this.cellHBewilligt.StylePriority.UseFont = false; this.cellHBewilligt.Text = "Bew. Std/Wo"; this.cellHBewilligt.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.cellHBewilligt.Weight = 1D; + this.cellHBewilligt.Weight = 0.9D; // - // cellHGeleistet + // cellHGruppenanteil // - this.cellHGeleistet.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold); - this.cellHGeleistet.Name = "cellHGeleistet"; - this.cellHGeleistet.StylePriority.UseFont = false; - this.cellHGeleistet.Text = "Gel. Std/Wo"; - this.cellHGeleistet.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.cellHGeleistet.Weight = 1D; + this.cellHGruppenanteil.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold); + this.cellHGruppenanteil.Name = "cellHGruppenanteil"; + this.cellHGruppenanteil.StylePriority.UseFont = false; + this.cellHGruppenanteil.Text = "Gruppen Anteil"; + this.cellHGruppenanteil.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.cellHGruppenanteil.Weight = 0.9D; // // cellHAuslastung // - this.cellHAuslastung.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold); + this.cellHAuslastung.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold); this.cellHAuslastung.Name = "cellHAuslastung"; this.cellHAuslastung.StylePriority.UseFont = false; this.cellHAuslastung.Text = "Auslastung"; this.cellHAuslastung.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.cellHAuslastung.Weight = 1D; + this.cellHAuslastung.Weight = 0.8D; + // + // cellHBewilligtGesamtNext + // + this.cellHBewilligtGesamtNext.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold); + this.cellHBewilligtGesamtNext.Name = "cellHBewilligtGesamtNext"; + this.cellHBewilligtGesamtNext.StylePriority.UseFont = false; + this.cellHBewilligtGesamtNext.Text = "Bew. Ges."; + this.cellHBewilligtGesamtNext.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.cellHBewilligtGesamtNext.Weight = 0.9D; + // + // cellHAnteilMANext + // + this.cellHAnteilMANext.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold); + this.cellHAnteilMANext.Name = "cellHAnteilMANext"; + this.cellHAnteilMANext.StylePriority.UseFont = false; + this.cellHAnteilMANext.Text = "% MA am HP"; + this.cellHAnteilMANext.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.cellHAnteilMANext.Weight = 0.8D; // // cellHBewilligtNext // - this.cellHBewilligtNext.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold); + this.cellHBewilligtNext.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold); this.cellHBewilligtNext.Name = "cellHBewilligtNext"; this.cellHBewilligtNext.StylePriority.UseFont = false; this.cellHBewilligtNext.Text = "Bew. Std/Wo"; this.cellHBewilligtNext.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.cellHBewilligtNext.Weight = 1D; + this.cellHBewilligtNext.Weight = 0.9D; // - // cellHGeleistetNext + // cellHGruppenanteilNext // - this.cellHGeleistetNext.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold); - this.cellHGeleistetNext.Name = "cellHGeleistetNext"; - this.cellHGeleistetNext.StylePriority.UseFont = false; - this.cellHGeleistetNext.Text = "Gel. Std/Wo"; - this.cellHGeleistetNext.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.cellHGeleistetNext.Weight = 1D; + this.cellHGruppenanteilNext.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold); + this.cellHGruppenanteilNext.Name = "cellHGruppenanteilNext"; + this.cellHGruppenanteilNext.StylePriority.UseFont = false; + this.cellHGruppenanteilNext.Text = "Gruppen Anteil"; + this.cellHGruppenanteilNext.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.cellHGruppenanteilNext.Weight = 0.9D; // // cellHAuslastungNext // - this.cellHAuslastungNext.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold); + this.cellHAuslastungNext.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold); this.cellHAuslastungNext.Name = "cellHAuslastungNext"; this.cellHAuslastungNext.StylePriority.UseFont = false; this.cellHAuslastungNext.Text = "Auslastung"; this.cellHAuslastungNext.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.cellHAuslastungNext.Weight = 1D; + this.cellHAuslastungNext.Weight = 0.8D; // // cellHEnddatum // - this.cellHEnddatum.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold); + this.cellHEnddatum.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold); this.cellHEnddatum.Name = "cellHEnddatum"; this.cellHEnddatum.StylePriority.UseFont = false; this.cellHEnddatum.Text = "Enddatum"; this.cellHEnddatum.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.cellHEnddatum.Weight = 1D; + this.cellHEnddatum.Weight = 0.8D; // // PageHeader // @@ -429,6 +679,7 @@ namespace FeidPartnerReports this.Version = "23.2"; ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTableVertrag)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); @@ -447,14 +698,38 @@ namespace FeidPartnerReports private DevExpress.XtraReports.UI.XRTableCell cellKlient; private DevExpress.XtraReports.UI.XRTableCell cellKostentraeger; private DevExpress.XtraReports.UI.XRTableCell cellWohnort; + private DevExpress.XtraReports.UI.XRTableCell cellBewilligtGesamt; + private DevExpress.XtraReports.UI.XRTableCell cellAnteilMA; private DevExpress.XtraReports.UI.XRTableCell cellBewilligt; - private DevExpress.XtraReports.UI.XRTableCell cellGeleistet; + private DevExpress.XtraReports.UI.XRTableCell cellGruppenanteil; private DevExpress.XtraReports.UI.XRTableCell cellAuslastung; + private DevExpress.XtraReports.UI.XRTableCell cellBewilligtGesamtNext; + private DevExpress.XtraReports.UI.XRTableCell cellAnteilMANext; private DevExpress.XtraReports.UI.XRTableCell cellBewilligtNext; - private DevExpress.XtraReports.UI.XRTableCell cellGeleistetNext; + private DevExpress.XtraReports.UI.XRTableCell cellGruppenanteilNext; private DevExpress.XtraReports.UI.XRTableCell cellAuslastungNext; private DevExpress.XtraReports.UI.XRTableCell cellEnddatum; - private DevExpress.XtraReports.UI.XRLabel xrLabelVertragInfo; + private DevExpress.XtraReports.UI.XRTable xrTableVertrag; + private DevExpress.XtraReports.UI.XRTableRow xrRowVertrag1; + private DevExpress.XtraReports.UI.XRTableRow xrRowVertrag2; + private DevExpress.XtraReports.UI.XRTableCell cellVH1; + private DevExpress.XtraReports.UI.XRTableCell cellVH2; + private DevExpress.XtraReports.UI.XRTableCell cellVH3; + private DevExpress.XtraReports.UI.XRTableCell cellVH4; + private DevExpress.XtraReports.UI.XRTableCell cellVWochenstunden; + private DevExpress.XtraReports.UI.XRTableCell cellVFLS; + private DevExpress.XtraReports.UI.XRTableCell cellVRefinanziert; + private DevExpress.XtraReports.UI.XRTableCell cellVNichtRefinanziert; + private DevExpress.XtraReports.UI.XRTableCell cellVH5; + private DevExpress.XtraReports.UI.XRTableCell cellVH6; + private DevExpress.XtraReports.UI.XRTableCell cellVH7; + private DevExpress.XtraReports.UI.XRTableCell cellVH8; + private DevExpress.XtraReports.UI.XRTableCell cellVH9; + private DevExpress.XtraReports.UI.XRTableCell cellVNettoFLS; + private DevExpress.XtraReports.UI.XRTableCell cellVSummeGeleistet; + private DevExpress.XtraReports.UI.XRTableCell cellVAuslastung; + private DevExpress.XtraReports.UI.XRTableCell cellVSummeGeleistetNext; + private DevExpress.XtraReports.UI.XRTableCell cellVAuslastungNext; private DevExpress.XtraReports.UI.XRTable xrTableHeader; private DevExpress.XtraReports.UI.XRTableRow xrRowHeader1; private DevExpress.XtraReports.UI.XRTableCell cellHKlientSpan; @@ -467,11 +742,15 @@ namespace FeidPartnerReports private DevExpress.XtraReports.UI.XRTableCell cellHKlient; private DevExpress.XtraReports.UI.XRTableCell cellHKostentraeger; private DevExpress.XtraReports.UI.XRTableCell cellHWohnort; + private DevExpress.XtraReports.UI.XRTableCell cellHBewilligtGesamt; + private DevExpress.XtraReports.UI.XRTableCell cellHAnteilMA; private DevExpress.XtraReports.UI.XRTableCell cellHBewilligt; - private DevExpress.XtraReports.UI.XRTableCell cellHGeleistet; + private DevExpress.XtraReports.UI.XRTableCell cellHGruppenanteil; private DevExpress.XtraReports.UI.XRTableCell cellHAuslastung; + private DevExpress.XtraReports.UI.XRTableCell cellHBewilligtGesamtNext; + private DevExpress.XtraReports.UI.XRTableCell cellHAnteilMANext; private DevExpress.XtraReports.UI.XRTableCell cellHBewilligtNext; - private DevExpress.XtraReports.UI.XRTableCell cellHGeleistetNext; + private DevExpress.XtraReports.UI.XRTableCell cellHGruppenanteilNext; private DevExpress.XtraReports.UI.XRTableCell cellHAuslastungNext; private DevExpress.XtraReports.UI.XRTableCell cellHEnddatum; private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo; diff --git a/ReportImp/FeidPartnerReports/Translation/TranslationDictionary.cs b/ReportImp/FeidPartnerReports/Translation/TranslationDictionary.cs index 148ba9cb4..e31b1f544 100644 --- a/ReportImp/FeidPartnerReports/Translation/TranslationDictionary.cs +++ b/ReportImp/FeidPartnerReports/Translation/TranslationDictionary.cs @@ -17,7 +17,9 @@ namespace FeidPartnerReports.Translation { var dict = base.GetTranslationDictionary(); AddOrReplaceTranslation(dict, "Monatlicher Abschlag", "Eigenanteil"); - + AddOrReplaceTranslation(dict, "Bruttogehalt", "Nicht refin. Aufgaben"); + AddOrReplaceTranslation(dict, "Stundensatz", "Refin. Aufgaben"); + return dict; } }