diff --git a/ReportImp/AbwIlseFretz/CustomMitarbeiterstundenkontoBerechnung.cs b/ReportImp/AbwIlseFretz/CustomMitarbeiterstundenkontoBerechnung.cs index 4c888eaa1..bff22eeeb 100644 --- a/ReportImp/AbwIlseFretz/CustomMitarbeiterstundenkontoBerechnung.cs +++ b/ReportImp/AbwIlseFretz/CustomMitarbeiterstundenkontoBerechnung.cs @@ -19,7 +19,7 @@ namespace AbwIlseFretz private const int ANZ_WOCHENTAGE = 5; private decimal maxWochenstunden = 40; - public override void CreateEmployeeDetails(MitarbeiterstundenkontoRO ro) + public override void CreateEmployeeDetails(MitarbeiterstundenkontoRO ro) { #region Standard foreach (var empDetail in ro.EmployeeDetailList) @@ -424,7 +424,7 @@ namespace AbwIlseFretz empDetail.Resturlaub += Convert.ToDecimal(entry.AnzahlTage); // += weil Tage immer als Minus dargestellt sind // Da Custom1 NUR das Budget + Resturlaub sein soll, durch Urlaub nicht mehr reduzieren - if (entry.DatumZurSortierung == null) + if (entry.DatumZurSortierung == null || entry.Herkunft.Contains("GeschenkterUrlaubstag")) empDetail.Custom1 += Convert.ToDecimal(entry.AnzahlTage); // += weil Tage immer als Minus dargestellt sind } } @@ -456,6 +456,9 @@ namespace AbwIlseFretz } } empDetail.Custom2 = summeKrankheiten; + // Custom4 ist FLS-Ist bis Auswertungstag + // Custom5 ist FLS-Soll Ist bis Auswertungstag + empDetail.Custom3 = BerechneFlsIstZuSollQuote(empDetail, ro.ReportStartDate, ro.ReportEndDate); // Hier wieder Standard CalculateEmployeeSalary(empDetail, berichtsAnfang, berichtsEnde); @@ -464,11 +467,52 @@ namespace AbwIlseFretz ro.EmployeeDetailList = FilterEmployeeList(ro.EmployeeDetailList); } - public override bool IsKrankheitAbsenceTime(AbsenceTime absenceTime) + public override bool IsKrankheitAbsenceTime(AbsenceTime absenceTime) { return !String.IsNullOrEmpty(absenceTime.AbsenceReason.Description) && (absenceTime.AbsenceReason.Description.ToLower().IndexOf("arbeitsunfähig") >= 0 || absenceTime.AbsenceReason.Description.ToLower().IndexOf("klinik") >= 0 || absenceTime.AbsenceReason.Description.ToLower().IndexOf("krank") >= 0 || absenceTime.AbsenceReason.Description.ToLower() == "au"); } + private decimal BerechneFlsIstZuSollQuote(MitarbeiterstundenkontoRO.EmployeeDetail empDetail, DateTime reportStartDate, DateTime reportEndDate) + { + // Die Quote FLS zu Soll nach Krankheitsabzug soll bis zum "heutigen" Tag gemacht werden. + // Ist der Monat also vergangen, ganz normal, ansonsten nur bis heute + decimal quote = 0; + + if (reportEndDate > DateTime.Now) + reportEndDate = DateTime.Now; + + decimal sollInZeitraum = 0; + var start = reportStartDate; + while (start <= reportEndDate) + { + if (!empDetail.Employee.AbsenceTimes.Any(a => a.AbsenceSpan.ContainsDate(start))) + sollInZeitraum += BerechneSollStundenFuerTag(empDetail, start); + + start = start.AddDays(1); + } + + decimal flsInZeitraum = 0; + foreach (var item in empDetail.ServiceRecordsInSelectedTimeSpan) + { + if (item.Start.Value.Date <= reportEndDate.Date) + { + if (item.ServiceDescription.Name == "Fehlkontakt") + { + + } + if (item.ServiceDescription.ServiceCategory.IsBillable) + flsInZeitraum += Convert.ToDecimal(item.DurationMinutes) / 60m; + } + } + + if (sollInZeitraum > 0) + quote = flsInZeitraum / sollInZeitraum * 100; + + empDetail.Custom4 = flsInZeitraum; + empDetail.Custom5 = sollInZeitraum; + + return quote; + } } } diff --git a/ReportImp/AbwIlseFretz/Mitarbeiterstundenkonto.cs b/ReportImp/AbwIlseFretz/Mitarbeiterstundenkonto.cs index 54ebbbb64..167721117 100644 --- a/ReportImp/AbwIlseFretz/Mitarbeiterstundenkonto.cs +++ b/ReportImp/AbwIlseFretz/Mitarbeiterstundenkonto.cs @@ -1,4 +1,5 @@ using System; +using System.Linq; using BeWo.Report; using BeWo.Report.ReportObjects; using BeWo.Service.Plugins; @@ -23,6 +24,15 @@ namespace AbwIlseFretz var msb = new CustomMitarbeiterstundenkontoBerechnung(); msb.CreateReport(pRO); + if (pRO.ReportEndDate > DateTime.Now) + cellRelationHeader.Text += string.Format("\n bis {0:dd.MM.}", DateTime.Now); + + var gesamtFLS = pRO.EmployeeDetailList.Sum(e => e.Custom4); + var gesamtSoll = pRO.EmployeeDetailList.Sum(e => e.Custom5); + + if (gesamtSoll > 0) + cellRelationGesamt.Text = string.Format("{0:0.00}%",gesamtFLS / gesamtSoll * 100); + this.bindingSource1.DataSource = pRO; } diff --git a/ReportImp/AbwIlseFretz/Mitarbeiterstundenkonto.designer.cs b/ReportImp/AbwIlseFretz/Mitarbeiterstundenkonto.designer.cs index 78cf09902..33845e0b9 100644 --- a/ReportImp/AbwIlseFretz/Mitarbeiterstundenkonto.designer.cs +++ b/ReportImp/AbwIlseFretz/Mitarbeiterstundenkonto.designer.cs @@ -64,7 +64,7 @@ namespace AbwIlseFretz this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); + this.cellRelationHeader = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -85,6 +85,7 @@ namespace AbwIlseFretz this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell51 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.lblMonat = new DevExpress.XtraReports.UI.XRLabel(); @@ -101,7 +102,6 @@ namespace AbwIlseFretz this.RelationFlsZuTatsSoll = new DevExpress.XtraReports.UI.CalculatedField(); this.RelationFlsZuTatsSollGesamt = new DevExpress.XtraReports.UI.CalculatedField(); this.GenommenerUrlaub = new DevExpress.XtraReports.UI.CalculatedField(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); @@ -234,7 +234,7 @@ namespace AbwIlseFretz // xrTableCell21 // this.xrTableCell21.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.RelationFlsZuTatsSoll")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom3")}); this.xrTableCell21.Name = "xrTableCell21"; this.xrTableCell21.TextFormatString = "{0:0.00}%"; this.xrTableCell21.Weight = 0.063119927862939615D; @@ -320,7 +320,7 @@ namespace AbwIlseFretz this.xrTableCell10, this.xrTableCell7, this.xrTableCell11, - this.xrTableCell12, + this.cellRelationHeader, this.xrTableCell13, this.xrTableCell14, this.xrTableCell15, @@ -384,11 +384,11 @@ namespace AbwIlseFretz this.xrTableCell11.Text = "Gesamt-\r\nstunden lfd. Monat"; this.xrTableCell11.Weight = 0.063119927721024011D; // - // xrTableCell12 + // cellRelationHeader // - this.xrTableCell12.Name = "xrTableCell12"; - this.xrTableCell12.Text = "Relation FLS IST zu tatsächli-chem Soll (in %)"; - this.xrTableCell12.Weight = 0.063119929511863376D; + this.cellRelationHeader.Name = "cellRelationHeader"; + this.cellRelationHeader.Text = "Relation in % FLS IST zu tats. Soll "; + this.cellRelationHeader.Weight = 0.063119929511863376D; // // xrTableCell13 // @@ -424,7 +424,7 @@ namespace AbwIlseFretz this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrTable1}); this.GroupFooter1.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); - this.GroupFooter1.HeightF = 48.95833F; + this.GroupFooter1.HeightF = 50.20835F; this.GroupFooter1.Name = "GroupFooter1"; this.GroupFooter1.StylePriority.UseFont = false; // @@ -526,10 +526,7 @@ namespace AbwIlseFretz // // cellRelationGesamt // - this.cellRelationGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "RelationFlsZuTatsSollGesamt")}); this.cellRelationGesamt.Name = "cellRelationGesamt"; - this.cellRelationGesamt.TextFormatString = "{0:0.00}%"; this.cellRelationGesamt.Weight = 0.062884978284913226D; // // xrTableCell47 @@ -573,6 +570,10 @@ namespace AbwIlseFretz this.xrTableCell17.TextFormatString = "{0:0.00}"; this.xrTableCell17.Weight = 0.062885253465960314D; // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO); + // // ReportHeader // this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -702,7 +703,7 @@ namespace AbwIlseFretz // // RelationFlsZuTatsSollGesamt // - this.RelationFlsZuTatsSollGesamt.Expression = "[FlsIstGesamt] / [SollGesamt] * 100"; + this.RelationFlsZuTatsSollGesamt.Expression = "Sum([EmployeeDetailList].[Custom4]) / Sum([EmployeeDetailList].[Custom5]) * 100"; this.RelationFlsZuTatsSollGesamt.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; this.RelationFlsZuTatsSollGesamt.Name = "RelationFlsZuTatsSollGesamt"; // @@ -713,10 +714,6 @@ namespace AbwIlseFretz this.GenommenerUrlaub.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; this.GenommenerUrlaub.Name = "GenommenerUrlaub"; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO); - // // Mitarbeiterstundenkonto // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -806,7 +803,7 @@ namespace AbwIlseFretz private DevExpress.XtraReports.UI.XRTableCell xrTableCell10; private DevExpress.XtraReports.UI.XRTableCell xrTableCell7; private DevExpress.XtraReports.UI.XRTableCell xrTableCell11; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell12; + private DevExpress.XtraReports.UI.XRTableCell cellRelationHeader; private DevExpress.XtraReports.UI.XRTableCell xrTableCell13; private DevExpress.XtraReports.UI.XRTableCell xrTableCell14; private DevExpress.XtraReports.UI.XRTableCell xrTableCell15; diff --git a/ReportImp/AbwIlseFretz/MitarbeiterstundenkontoJahr.cs b/ReportImp/AbwIlseFretz/MitarbeiterstundenkontoJahr.cs index 477ab0f11..5a626698f 100644 --- a/ReportImp/AbwIlseFretz/MitarbeiterstundenkontoJahr.cs +++ b/ReportImp/AbwIlseFretz/MitarbeiterstundenkontoJahr.cs @@ -1,4 +1,5 @@ using System; +using System.Linq; using BeWo.Report; using BeWo.Report.ReportObjects; using BeWo.Service.Plugins; @@ -22,6 +23,19 @@ namespace AbwIlseFretz var msb = new CustomMitarbeiterstundenkontoBerechnungMonate(); msb.CreateReport(pRO); + if (pRO.ReportEndDate > DateTime.Now) + cellRelationHeader.Text += string.Format("\n bis {0:dd.MM.}", DateTime.Now); + + foreach (var item in pRO.EmployeeInfoList) + { + var gesamtFLS = item.EmployeeDetails.Sum(e => e.EmployeeDetail.Custom4); + var gesamtSoll = item.EmployeeDetails.Sum(e => e.EmployeeDetail.Custom5); + + if (gesamtSoll > 0) + item.Custom2 = gesamtFLS / gesamtSoll * 100; + } + + this.bindingSource1.DataSource = pRO; } diff --git a/ReportImp/AbwIlseFretz/MitarbeiterstundenkontoJahr.designer.cs b/ReportImp/AbwIlseFretz/MitarbeiterstundenkontoJahr.designer.cs index 2704895cd..a58b979d0 100644 --- a/ReportImp/AbwIlseFretz/MitarbeiterstundenkontoJahr.designer.cs +++ b/ReportImp/AbwIlseFretz/MitarbeiterstundenkontoJahr.designer.cs @@ -62,7 +62,7 @@ namespace AbwIlseFretz this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); + this.cellRelationHeader = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -227,8 +227,9 @@ namespace AbwIlseFretz // xrTableCell21 // this.xrTableCell21.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.RelationFlsZuTatsSoll")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.Custom3")}); this.xrTableCell21.Name = "xrTableCell21"; + this.xrTableCell21.TextFormatString = "{0:0.00}%"; this.xrTableCell21.Weight = 0.063119927862939615D; // // xrTableCell25 @@ -293,7 +294,7 @@ namespace AbwIlseFretz this.xrTableCell10, this.xrTableCell7, this.xrTableCell11, - this.xrTableCell12, + this.cellRelationHeader, this.xrTableCell13, this.xrTableCell14, this.xrTableCell15, @@ -357,11 +358,11 @@ namespace AbwIlseFretz this.xrTableCell11.Text = "Gesamt-\r\nstunden lfd. Monat"; this.xrTableCell11.Weight = 0.063119927721024011D; // - // xrTableCell12 + // cellRelationHeader // - this.xrTableCell12.Name = "xrTableCell12"; - this.xrTableCell12.Text = "Relation FLS IST zu tatsächli-chem Soll (in %)"; - this.xrTableCell12.Weight = 0.063119929511863376D; + this.cellRelationHeader.Name = "cellRelationHeader"; + this.cellRelationHeader.Text = "Relation in % FLS IST zu tats. Soll "; + this.cellRelationHeader.Weight = 0.063119929511863376D; // // xrTableCell13 // @@ -500,9 +501,10 @@ namespace AbwIlseFretz // cellRelationGesamt // this.cellRelationGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.RelationFlsZuTatsSollGesamt", "{0:0.00}")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.Custom2")}); this.cellRelationGesamt.Name = "cellRelationGesamt"; this.cellRelationGesamt.Text = "cellRelationGesamt"; + this.cellRelationGesamt.TextFormatString = "{0:0.00}%"; this.cellRelationGesamt.Weight = 0.0631199278629396D; // // xrTableCell47 @@ -705,8 +707,7 @@ namespace AbwIlseFretz // RelationFlsZuTatsSollGesamt // this.RelationFlsZuTatsSollGesamt.DataMember = "EmployeeInfoList.EmployeeDetails"; - this.RelationFlsZuTatsSollGesamt.Expression = "(Sum([EmployeeDetail].[FlsIst]) / Sum([EmployeeDetail].[StundenSollOhneUrlaubKran" + - "kheit])) * 100\n"; + this.RelationFlsZuTatsSollGesamt.Expression = "(Sum([EmployeeDetail].[Custom4]) / Sum([EmployeeDetail].[Custom5])) * 100\n"; this.RelationFlsZuTatsSollGesamt.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; this.RelationFlsZuTatsSollGesamt.Name = "RelationFlsZuTatsSollGesamt"; // @@ -796,7 +797,7 @@ namespace AbwIlseFretz private DevExpress.XtraReports.UI.XRTableCell xrTableCell10; private DevExpress.XtraReports.UI.XRTableCell xrTableCell7; private DevExpress.XtraReports.UI.XRTableCell xrTableCell11; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell12; + private DevExpress.XtraReports.UI.XRTableCell cellRelationHeader; private DevExpress.XtraReports.UI.XRTableCell xrTableCell19; private DevExpress.XtraReports.UI.XRTableCell xrTableCell20; private DevExpress.XtraReports.UI.XRTableCell xrTableCell28; diff --git a/ReportImp/CaritasverbandKelheim/CustomReportCreator.cs b/ReportImp/CaritasverbandKelheim/CustomReportCreator.cs index 8175bd65a..bdbed6071 100644 --- a/ReportImp/CaritasverbandKelheim/CustomReportCreator.cs +++ b/ReportImp/CaritasverbandKelheim/CustomReportCreator.cs @@ -18,9 +18,12 @@ namespace CaritasverbandKelheim public override XtraReport CreateServiceOverviewAllCustomersReport(int month, int year, long orgaOid, long empOid, long? serviceCategoryOid, int startDay, int endDay) { //List lROs = ServicesOverviewRO.Create(month, year, orgaOid, empOid, startDay, endDay, serviceCategoryOid, false); + int seitenzahl = 1; List lROs = Create(month, year, orgaOid, empOid, startDay, endDay, serviceCategoryOid); if (lROs.Count > 0) { + lROs[0].FreeHoursBisVormonat = seitenzahl; + seitenzahl++; var rootReport = CreateServicesOverviewReportForRo(lROs[0], serviceCategoryOid); if (rootReport.Pages.Count == 0) { @@ -29,12 +32,15 @@ namespace CaritasverbandKelheim for (int i = 1; i < lROs.Count; i++) { + lROs[i].FreeHoursBisVormonat = seitenzahl; var lNext = CreateServicesOverviewReportForRo(lROs[i], serviceCategoryOid); if (lNext.Pages.Count == 0) { lNext.CreateDocument(); } rootReport.Pages.AddRange(lNext.Pages); + + seitenzahl++; } return rootReport; } @@ -169,7 +175,7 @@ namespace CaritasverbandKelheim private XtraReport CreateServicesOverviewReportForRo(ServicesOverviewRO ro, long? serviceCategoryOid) { - if (ro.Services != null && ro.Services.Count > 0) + if (ro.Services != null && ro.Services.Count > 0) { foreach (ServicesOverviewRO.ServiceDetail sd in ro.Services) { diff --git a/ReportImp/CaritasverbandKelheim/LeistungsnachweisAnlage4.Designer.cs b/ReportImp/CaritasverbandKelheim/LeistungsnachweisAnlage4.Designer.cs index f89f96f2c..f332107b0 100644 --- a/ReportImp/CaritasverbandKelheim/LeistungsnachweisAnlage4.Designer.cs +++ b/ReportImp/CaritasverbandKelheim/LeistungsnachweisAnlage4.Designer.cs @@ -41,10 +41,8 @@ namespace CaritasverbandKelheim this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell44 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell36 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell50 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -64,10 +62,8 @@ namespace CaritasverbandKelheim this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell32 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell33 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell43 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell49 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell34 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -91,7 +87,6 @@ namespace CaritasverbandKelheim this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrPageInfo1 = new DevExpress.XtraReports.UI.XRPageInfo(); this.xrLabel29 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel26 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel27 = new DevExpress.XtraReports.UI.XRLabel(); @@ -112,14 +107,13 @@ namespace CaritasverbandKelheim this.xrTableCell37 = new DevExpress.XtraReports.UI.XRTableCell(); this.lblEinzelFK = new DevExpress.XtraReports.UI.XRTableCell(); this.lblEinzelHK = new DevExpress.XtraReports.UI.XRTableCell(); - this.lblEinzelQHK = new DevExpress.XtraReports.UI.XRTableCell(); this.lblGruppeFK = new DevExpress.XtraReports.UI.XRTableCell(); this.lblGruppeHK = new DevExpress.XtraReports.UI.XRTableCell(); - this.lblGruppeQHK = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell42 = new DevExpress.XtraReports.UI.XRTableCell(); this.lblUnterschriftKlient = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel(); this.fieldKontaktArt = new DevExpress.XtraReports.UI.CalculatedField(); + this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit(); @@ -180,10 +174,8 @@ namespace CaritasverbandKelheim this.xrTableCell10, this.xrTableCell2, this.xrTableCell15, - this.xrTableCell18, this.xrTableCell12, this.xrTableCell44, - this.xrTableCell19, this.xrTableCell35, this.xrTableCell36, this.xrTableCell50}); @@ -249,7 +241,7 @@ namespace CaritasverbandKelheim this.xrTableCell2.StylePriority.UsePadding = false; this.xrTableCell2.StylePriority.UseTextAlignment = false; this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell2.Weight = 0.065628954901522929D; + this.xrTableCell2.Weight = 0.098441027401665354D; // // xrTableCell15 // @@ -263,22 +255,7 @@ namespace CaritasverbandKelheim this.xrTableCell15.StylePriority.UsePadding = false; this.xrTableCell15.StylePriority.UseTextAlignment = false; this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell15.Weight = 0.065629040276576914D; - // - // xrTableCell18 - // - this.xrTableCell18.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.ServiceCategoryAbbr")}); - this.xrTableCell18.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.xrTableCell18.Multiline = true; - this.xrTableCell18.Name = "xrTableCell18"; - 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.Weight = 0.065629040276576914D; + this.xrTableCell15.Weight = 0.0984460080530114D; // // xrTableCell12 // @@ -291,7 +268,7 @@ namespace CaritasverbandKelheim this.xrTableCell12.StylePriority.UsePadding = false; this.xrTableCell12.StylePriority.UseTextAlignment = false; this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell12.Weight = 0.065628981968363337D; + this.xrTableCell12.Weight = 0.098441124298844218D; // // xrTableCell44 // @@ -303,20 +280,7 @@ namespace CaritasverbandKelheim this.xrTableCell44.StylePriority.UsePadding = false; this.xrTableCell44.StylePriority.UseTextAlignment = false; this.xrTableCell44.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell44.Weight = 0.065628946125655757D; - // - // xrTableCell19 - // - this.xrTableCell19.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.ServiceDescription")}); - this.xrTableCell19.Multiline = true; - this.xrTableCell19.Name = "xrTableCell19"; - 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.Weight = 0.065628946125655757D; + this.xrTableCell44.Weight = 0.098445749920830633D; // // xrTableCell35 // @@ -514,10 +478,8 @@ namespace CaritasverbandKelheim this.xrTableCell5, this.xrTableCell6, this.xrTableCell32, - this.xrTableCell17, this.xrTableCell7, this.xrTableCell33, - this.xrTableCell20, this.xrTableCell43, this.xrTableCell49, this.xrTableCell34}); @@ -577,7 +539,7 @@ namespace CaritasverbandKelheim this.xrTableCell6.StylePriority.UseTextAlignment = false; this.xrTableCell6.Text = "FK"; this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell6.Weight = 0.12938733384587264D; + this.xrTableCell6.Weight = 0.19407629404229776D; // // xrTableCell32 // @@ -593,23 +555,7 @@ namespace CaritasverbandKelheim this.xrTableCell32.StylePriority.UseTextAlignment = false; this.xrTableCell32.Text = "HK"; this.xrTableCell32.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell32.Weight = 0.12938744998082033D; - // - // xrTableCell17 - // - this.xrTableCell17.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell17.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.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 = "QHK"; - this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell17.Weight = 0.12938744998082033D; + this.xrTableCell32.Weight = 0.19408593976521554D; // // xrTableCell7 // @@ -627,7 +573,7 @@ namespace CaritasverbandKelheim this.xrTableCell7.StylePriority.UseTextAlignment = false; this.xrTableCell7.Text = "FK"; this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell7.Weight = 0.12938733384587259D; + this.xrTableCell7.Weight = 0.1940762940422977D; // // xrTableCell33 // @@ -645,25 +591,7 @@ namespace CaritasverbandKelheim this.xrTableCell33.StylePriority.UseTextAlignment = false; this.xrTableCell33.Text = "HK"; this.xrTableCell33.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell33.Weight = 0.12938727577839879D; - // - // xrTableCell20 - // - this.xrTableCell20.BackColor = System.Drawing.Color.Gainsboro; - this.xrTableCell20.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell20.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.xrTableCell20.Multiline = true; - this.xrTableCell20.Name = "xrTableCell20"; - this.xrTableCell20.StylePriority.UseBackColor = false; - this.xrTableCell20.StylePriority.UseBorders = false; - this.xrTableCell20.StylePriority.UseFont = false; - this.xrTableCell20.StylePriority.UseTextAlignment = false; - this.xrTableCell20.Text = "QHK"; - this.xrTableCell20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell20.Weight = 0.12938727577839879D; + this.xrTableCell33.Weight = 0.19408559136037246D; // // xrTableCell43 // @@ -720,6 +648,7 @@ namespace CaritasverbandKelheim // ReportHeader // this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel13, this.xrLabel11, this.xrLabel12, this.lblApprovedQASS, @@ -738,7 +667,6 @@ namespace CaritasverbandKelheim this.xrLabel6, this.xrLabel4, this.xrLabel3, - this.xrPageInfo1, this.xrLabel29, this.xrLabel26, this.xrLabel27, @@ -1028,15 +956,6 @@ namespace CaritasverbandKelheim this.xrLabel3.Text = "Name:"; this.xrLabel3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft; // - // xrPageInfo1 - // - this.xrPageInfo1.LocationFloat = new DevExpress.Utils.PointFloat(1038.74F, 0F); - this.xrPageInfo1.Name = "xrPageInfo1"; - this.xrPageInfo1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrPageInfo1.SizeF = new System.Drawing.SizeF(48.6604F, 24.99998F); - this.xrPageInfo1.StylePriority.UseTextAlignment = false; - this.xrPageInfo1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft; - // // xrLabel29 // this.xrLabel29.Font = new DevExpress.Drawing.DXFont("Arial", 10F); @@ -1247,10 +1166,8 @@ namespace CaritasverbandKelheim this.xrTableCell37, this.lblEinzelFK, this.lblEinzelHK, - this.lblEinzelQHK, this.lblGruppeFK, this.lblGruppeHK, - this.lblGruppeQHK, this.xrTableCell42}); this.xrTableRow9.Name = "xrTableRow9"; this.xrTableRow9.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); @@ -1279,7 +1196,7 @@ namespace CaritasverbandKelheim this.lblEinzelFK.StylePriority.UsePadding = false; this.lblEinzelFK.StylePriority.UseTextAlignment = false; this.lblEinzelFK.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.lblEinzelFK.Weight = 0.065628829249820164D; + this.lblEinzelFK.Weight = 0.098441019627340171D; // // lblEinzelHK // @@ -1291,19 +1208,7 @@ namespace CaritasverbandKelheim this.lblEinzelHK.StylePriority.UsePadding = false; this.lblEinzelHK.StylePriority.UseTextAlignment = false; this.lblEinzelHK.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.lblEinzelHK.Weight = 0.065628829249820164D; - // - // lblEinzelQHK - // - this.lblEinzelQHK.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.lblEinzelQHK.Multiline = true; - this.lblEinzelQHK.Name = "lblEinzelQHK"; - this.lblEinzelQHK.StylePriority.UseFont = false; - this.lblEinzelQHK.StylePriority.UsePadding = false; - this.lblEinzelQHK.StylePriority.UseTextAlignment = false; - this.lblEinzelQHK.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.lblEinzelQHK.Weight = 0.065628829249820164D; + this.lblEinzelHK.Weight = 0.098445989902317149D; // // lblGruppeFK // @@ -1315,7 +1220,7 @@ namespace CaritasverbandKelheim this.lblGruppeFK.StylePriority.UsePadding = false; this.lblGruppeFK.StylePriority.UseTextAlignment = false; this.lblGruppeFK.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.lblGruppeFK.Weight = 0.065628829249820164D; + this.lblGruppeFK.Weight = 0.0984408922897168D; // // lblGruppeHK // @@ -1327,19 +1232,7 @@ namespace CaritasverbandKelheim this.lblGruppeHK.StylePriority.UsePadding = false; this.lblGruppeHK.StylePriority.UseTextAlignment = false; this.lblGruppeHK.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.lblGruppeHK.Weight = 0.065628829249820164D; - // - // lblGruppeQHK - // - this.lblGruppeQHK.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.lblGruppeQHK.Multiline = true; - this.lblGruppeQHK.Name = "lblGruppeQHK"; - this.lblGruppeQHK.StylePriority.UseFont = false; - this.lblGruppeQHK.StylePriority.UsePadding = false; - this.lblGruppeQHK.StylePriority.UseTextAlignment = false; - this.lblGruppeQHK.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.lblGruppeQHK.Weight = 0.065628829249820164D; + this.lblGruppeHK.Weight = 0.098445788626718919D; // // xrTableCell42 // @@ -1351,7 +1244,7 @@ namespace CaritasverbandKelheim this.xrTableCell42.StylePriority.UsePadding = false; this.xrTableCell42.StylePriority.UseTextAlignment = false; this.xrTableCell42.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell42.Weight = 0.52362089377644638D; + this.xrTableCell42.Weight = 0.52362023655000312D; // // lblUnterschriftKlient // @@ -1392,6 +1285,22 @@ namespace CaritasverbandKelheim this.fieldKontaktArt.FieldType = DevExpress.XtraReports.UI.FieldType.String; this.fieldKontaktArt.Name = "fieldKontaktArt"; // + // xrLabel13 + // + this.xrLabel13.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "FreeHoursBisVormonat")}); + this.xrLabel13.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrLabel13.ForeColor = System.Drawing.Color.Black; + this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(1038.74F, 0F); + this.xrLabel13.Multiline = true; + this.xrLabel13.Name = "xrLabel13"; + this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel13.SizeF = new System.Drawing.SizeF(44.79175F, 25F); + this.xrLabel13.StylePriority.UseFont = false; + this.xrLabel13.StylePriority.UseForeColor = false; + this.xrLabel13.StylePriority.UseTextAlignment = false; + this.xrLabel13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft; + // // bindingSource1 // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); @@ -1501,26 +1410,20 @@ namespace CaritasverbandKelheim private DevExpress.XtraReports.UI.XRTableCell lblEinzelFK; private DevExpress.XtraReports.UI.XRTableCell lblEinzelHK; private DevExpress.XtraReports.UI.XRTableCell lblGruppeHK; - private DevExpress.XtraReports.UI.XRTableCell lblGruppeQHK; private DevExpress.XtraReports.UI.XRTableCell xrTableCell42; private DevExpress.XtraReports.UI.XRLabel xrLabel1; private DevExpress.XtraReports.UI.XRLabel xrLabel9; private DevExpress.XtraReports.UI.XRLabel xrLabel10; - private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo1; private DevExpress.XtraReports.UI.XRLabel xrLabel29; private DevExpress.XtraReports.UI.XRLabel xrLabel26; private DevExpress.XtraReports.UI.XRLabel xrLabel27; private DevExpress.XtraReports.UI.XRLabel xrLabel25; private DevExpress.XtraReports.UI.XRLabel xrLabel24; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell18; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell19; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell17; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell20; private DevExpress.XtraReports.UI.XRLabel xrLabel11; private DevExpress.XtraReports.UI.XRLabel xrLabel12; private DevExpress.XtraReports.UI.XRLabel lblApprovedQASS; private DevExpress.XtraReports.UI.XRLabel xrLabel17; - private DevExpress.XtraReports.UI.XRTableCell lblEinzelQHK; private DevExpress.XtraReports.UI.XRTableCell lblGruppeFK; + private DevExpress.XtraReports.UI.XRLabel xrLabel13; } } diff --git a/ReportImp/CaritasverbandKelheim/LeistungsnachweisAnlage4.cs b/ReportImp/CaritasverbandKelheim/LeistungsnachweisAnlage4.cs index a5194059b..298c76dc9 100644 --- a/ReportImp/CaritasverbandKelheim/LeistungsnachweisAnlage4.cs +++ b/ReportImp/CaritasverbandKelheim/LeistungsnachweisAnlage4.cs @@ -14,6 +14,7 @@ namespace CaritasverbandKelheim { public partial class LeistungsnachweisAnlage4 : XtraReport, IBeWoReport { + // In pRO.FreeHoursBisVormonat steht die Seitenzahl public LeistungsnachweisAnlage4() { InitializeComponent(); @@ -140,10 +141,10 @@ namespace CaritasverbandKelheim lblEinzelFK.Text = string.Format("{0:0.00}", gesamtEinzelFK); lblEinzelHK.Text = string.Format("{0:0.00}", gesamtEinzelHK); - lblEinzelQHK.Text = string.Format("{0:0.00}", gesamtEinzelQHK); + //lblEinzelQHK.Text = string.Format("{0:0.00}", gesamtEinzelQHK); lblGruppeFK.Text = string.Format("{0:0.00}", gesamtGruppeFK); lblGruppeHK.Text = string.Format("{0:0.00}", gesamtGruppeHK); - lblGruppeQHK.Text = string.Format("{0:0.00}", gesamtGruppeQHK); + //lblGruppeQHK.Text = string.Format("{0:0.00}", gesamtGruppeQHK); } bindingSource1.DataSource = pRO; diff --git a/ReportImp/CaritasverbandKelheim/LeistungsnachweisAnlage5.Designer.cs b/ReportImp/CaritasverbandKelheim/LeistungsnachweisAnlage5.Designer.cs index b1b01eaa9..5c3896f90 100644 --- a/ReportImp/CaritasverbandKelheim/LeistungsnachweisAnlage5.Designer.cs +++ b/ReportImp/CaritasverbandKelheim/LeistungsnachweisAnlage5.Designer.cs @@ -41,10 +41,8 @@ namespace CaritasverbandKelheim this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell44 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell(); this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); this.xrTableServiceRecords1 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); @@ -58,10 +56,8 @@ namespace CaritasverbandKelheim this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell32 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell33 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); @@ -102,10 +98,8 @@ namespace CaritasverbandKelheim this.xrTableCell37 = new DevExpress.XtraReports.UI.XRTableCell(); this.lblEinzelFK = new DevExpress.XtraReports.UI.XRTableCell(); this.lblEinzelHK = new DevExpress.XtraReports.UI.XRTableCell(); - this.lblEinzelQHK = new DevExpress.XtraReports.UI.XRTableCell(); this.lblGruppeFK = new DevExpress.XtraReports.UI.XRTableCell(); this.lblGruppeHK = new DevExpress.XtraReports.UI.XRTableCell(); - this.lblGruppeQHK = new DevExpress.XtraReports.UI.XRTableCell(); this.lblUnterschriftKlient = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel(); this.fieldKontaktArt = new DevExpress.XtraReports.UI.CalculatedField(); @@ -168,10 +162,8 @@ namespace CaritasverbandKelheim this.xrTableCell10, this.xrTableCell2, this.xrTableCell15, - this.xrTableCell18, this.xrTableCell12, - this.xrTableCell44, - this.xrTableCell19}); + this.xrTableCell44}); this.xrTableRow6.Name = "xrTableRow6"; this.xrTableRow6.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); this.xrTableRow6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; @@ -234,7 +226,7 @@ namespace CaritasverbandKelheim this.xrTableCell2.StylePriority.UsePadding = false; this.xrTableCell2.StylePriority.UseTextAlignment = false; this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell2.Weight = 0.069498191707908108D; + this.xrTableCell2.Weight = 0.10460517581380735D; // // xrTableCell15 // @@ -248,22 +240,7 @@ namespace CaritasverbandKelheim this.xrTableCell15.StylePriority.UsePadding = false; this.xrTableCell15.StylePriority.UseTextAlignment = false; this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell15.Weight = 0.069736787419287127D; - // - // xrTableCell18 - // - this.xrTableCell18.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.ServiceCategoryAbbr")}); - this.xrTableCell18.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.xrTableCell18.Multiline = true; - this.xrTableCell18.Name = "xrTableCell18"; - 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.Weight = 0.069736787419287127D; + this.xrTableCell15.Weight = 0.10436659073267501D; // // xrTableCell12 // @@ -276,7 +253,7 @@ namespace CaritasverbandKelheim this.xrTableCell12.StylePriority.UsePadding = false; this.xrTableCell12.StylePriority.UseTextAlignment = false; this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell12.Weight = 0.069634848053112583D; + this.xrTableCell12.Weight = 0.10460517687301577D; // // xrTableCell44 // @@ -288,20 +265,7 @@ namespace CaritasverbandKelheim this.xrTableCell44.StylePriority.UsePadding = false; this.xrTableCell44.StylePriority.UseTextAlignment = false; this.xrTableCell44.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell44.Weight = 0.069634890266272342D; - // - // xrTableCell19 - // - this.xrTableCell19.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.ServiceDescription")}); - this.xrTableCell19.Multiline = true; - this.xrTableCell19.Name = "xrTableCell19"; - 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.Weight = 0.073057637822247889D; + this.xrTableCell44.Weight = 0.10772219926861706D; // // GroupHeader1 // @@ -417,10 +381,8 @@ namespace CaritasverbandKelheim this.xrTableCell5, this.xrTableCell6, this.xrTableCell32, - this.xrTableCell16, this.xrTableCell7, - this.xrTableCell33, - this.xrTableCell17}); + this.xrTableCell33}); this.xrTableRow1.Name = "xrTableRow1"; this.xrTableRow1.Weight = 0.68829979523118712D; // @@ -477,7 +439,7 @@ namespace CaritasverbandKelheim this.xrTableCell6.StylePriority.UseTextAlignment = false; this.xrTableCell6.Text = "FK"; this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell6.Weight = 0.13748585502617255D; + this.xrTableCell6.Weight = 0.2062287849337951D; // // xrTableCell32 // @@ -493,23 +455,7 @@ namespace CaritasverbandKelheim this.xrTableCell32.StylePriority.UseTextAlignment = false; this.xrTableCell32.Text = "HK"; this.xrTableCell32.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell32.Weight = 0.13748585478599326D; - // - // xrTableCell16 - // - this.xrTableCell16.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell16.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.xrTableCell16.Multiline = true; - this.xrTableCell16.Name = "xrTableCell16"; - this.xrTableCell16.StylePriority.UseBorders = false; - this.xrTableCell16.StylePriority.UseFont = false; - this.xrTableCell16.StylePriority.UseTextAlignment = false; - this.xrTableCell16.Text = "QHK"; - this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell16.Weight = 0.13748585478599326D; + this.xrTableCell32.Weight = 0.20622877966436398D; // // xrTableCell7 // @@ -527,7 +473,7 @@ namespace CaritasverbandKelheim this.xrTableCell7.StylePriority.UseTextAlignment = false; this.xrTableCell7.Text = "FK"; this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell7.Weight = 0.13728485410074559D; + this.xrTableCell7.Weight = 0.20622879132349931D; // // xrTableCell33 // @@ -545,25 +491,7 @@ namespace CaritasverbandKelheim this.xrTableCell33.StylePriority.UseTextAlignment = false; this.xrTableCell33.Text = "HK"; this.xrTableCell33.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell33.Weight = 0.137284858015197D; - // - // xrTableCell17 - // - this.xrTableCell17.BackColor = System.Drawing.Color.Gainsboro; - this.xrTableCell17.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell17.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.xrTableCell17.Multiline = true; - this.xrTableCell17.Name = "xrTableCell17"; - this.xrTableCell17.StylePriority.UseBackColor = false; - this.xrTableCell17.StylePriority.UseBorders = false; - this.xrTableCell17.StylePriority.UseFont = false; - this.xrTableCell17.StylePriority.UseTextAlignment = false; - this.xrTableCell17.Text = "QHK"; - this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell17.Weight = 0.14403320354621768D; + this.xrTableCell33.Weight = 0.21237412433866099D; // // bindingSource1 // @@ -1079,10 +1007,8 @@ namespace CaritasverbandKelheim this.xrTableCell37, this.lblEinzelFK, this.lblEinzelHK, - this.lblEinzelQHK, this.lblGruppeFK, - this.lblGruppeHK, - this.lblGruppeQHK}); + this.lblGruppeHK}); this.xrTableRow9.Name = "xrTableRow9"; this.xrTableRow9.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); this.xrTableRow9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; @@ -1112,7 +1038,7 @@ namespace CaritasverbandKelheim this.lblEinzelFK.StylePriority.UsePadding = false; this.lblEinzelFK.StylePriority.UseTextAlignment = false; this.lblEinzelFK.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.lblEinzelFK.Weight = 0.089194234150972523D; + this.lblEinzelFK.Weight = 0.13394451009405561D; // // lblEinzelHK // @@ -1124,19 +1050,7 @@ namespace CaritasverbandKelheim this.lblEinzelHK.StylePriority.UsePadding = false; this.lblEinzelHK.StylePriority.UseTextAlignment = false; this.lblEinzelHK.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.lblEinzelHK.Weight = 0.089500407761533757D; - // - // lblEinzelQHK - // - this.lblEinzelQHK.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.lblEinzelQHK.Multiline = true; - this.lblEinzelQHK.Name = "lblEinzelQHK"; - this.lblEinzelQHK.StylePriority.UseFont = false; - this.lblEinzelQHK.StylePriority.UsePadding = false; - this.lblEinzelQHK.StylePriority.UseTextAlignment = false; - this.lblEinzelQHK.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.lblEinzelQHK.Weight = 0.089500474314579026D; + this.lblEinzelHK.Weight = 0.13425060613302969D; // // lblGruppeFK // @@ -1148,7 +1062,7 @@ namespace CaritasverbandKelheim this.lblGruppeFK.StylePriority.UsePadding = false; this.lblGruppeFK.StylePriority.UseTextAlignment = false; this.lblGruppeFK.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.lblGruppeFK.Weight = 0.0893696275947415D; + this.lblGruppeFK.Weight = 0.13425068027173454D; // // lblGruppeHK // @@ -1160,19 +1074,7 @@ namespace CaritasverbandKelheim this.lblGruppeHK.StylePriority.UsePadding = false; this.lblGruppeHK.StylePriority.UseTextAlignment = false; this.lblGruppeHK.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.lblGruppeHK.Weight = 0.089369693260415384D; - // - // lblGruppeQHK - // - this.lblGruppeQHK.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.lblGruppeQHK.Multiline = true; - this.lblGruppeQHK.Name = "lblGruppeQHK"; - this.lblGruppeQHK.StylePriority.UseFont = false; - this.lblGruppeQHK.StylePriority.UsePadding = false; - this.lblGruppeQHK.StylePriority.UseTextAlignment = false; - this.lblGruppeQHK.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.lblGruppeQHK.Weight = 0.093762576926714747D; + this.lblGruppeHK.Weight = 0.13825121751013708D; // // lblUnterschriftKlient // @@ -1315,16 +1217,10 @@ namespace CaritasverbandKelheim private DevExpress.XtraReports.UI.XRLabel xrLabel13; private DevExpress.XtraReports.UI.XRLabel xrLabel11; private DevExpress.XtraReports.UI.XRLabel xrLabel10; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell18; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell19; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell16; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell17; private DevExpress.XtraReports.UI.XRLabel xrLabel18; private DevExpress.XtraReports.UI.XRLabel lblApprovedQASS; private DevExpress.XtraReports.UI.XRLabel xrLabel20; private DevExpress.XtraReports.UI.XRLabel xrLabel21; private DevExpress.XtraReports.UI.XRLabel xrLabel17; - private DevExpress.XtraReports.UI.XRTableCell lblEinzelQHK; - private DevExpress.XtraReports.UI.XRTableCell lblGruppeQHK; } } diff --git a/ReportImp/CaritasverbandKelheim/LeistungsnachweisAnlage5.cs b/ReportImp/CaritasverbandKelheim/LeistungsnachweisAnlage5.cs index b9e79cebd..14994e4c1 100644 --- a/ReportImp/CaritasverbandKelheim/LeistungsnachweisAnlage5.cs +++ b/ReportImp/CaritasverbandKelheim/LeistungsnachweisAnlage5.cs @@ -142,10 +142,10 @@ namespace CaritasverbandKelheim lblEinzelFK.Text = string.Format("{0:0.00}", gesamtEinzelFK); lblEinzelHK.Text = string.Format("{0:0.00}", gesamtEinzelHK); - lblEinzelQHK.Text = string.Format("{0:0.00}", gesamtEinzelQHK); + //lblEinzelQHK.Text = string.Format("{0:0.00}", gesamtEinzelQHK); lblGruppeFK.Text = string.Format("{0:0.00}", gesamtGruppeFK); lblGruppeHK.Text = string.Format("{0:0.00}", gesamtGruppeHK); - lblGruppeQHK.Text = string.Format("{0:0.00}", gesamtGruppeQHK); + //lblGruppeQHK.Text = string.Format("{0:0.00}", gesamtGruppeQHK); pRO.Services = servicesBillable; }