From 147859bfb1282392487a90ff62d56841baa5f644 Mon Sep 17 00:00:00 2001 From: Marcel Hirschle Date: Wed, 20 Dec 2023 13:44:30 +0100 Subject: [PATCH] MH: Schubkraft diverses --- .../Quittierungsbeleg.Designer.cs | 16 ++++++++-------- .../Service/CustomServiceRecordValidator.cs | 2 +- .../ABCBetreuungenReports/SettlementReport.cs | 8 +++++++- .../ABCBetreuungenReports/SettlementReport2.cs | 12 ++++++++++++ 4 files changed, 28 insertions(+), 10 deletions(-) diff --git a/ReportImp/ABCBetreuungenReports/Quittierungsbeleg.Designer.cs b/ReportImp/ABCBetreuungenReports/Quittierungsbeleg.Designer.cs index 74a290348..b276aa8dc 100644 --- a/ReportImp/ABCBetreuungenReports/Quittierungsbeleg.Designer.cs +++ b/ReportImp/ABCBetreuungenReports/Quittierungsbeleg.Designer.cs @@ -66,6 +66,7 @@ namespace ABCBetreuungenReports this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell32 = 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(); this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); @@ -116,7 +117,6 @@ namespace ABCBetreuungenReports this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.fieldKontaktArt = new DevExpress.XtraReports.UI.CalculatedField(); this.wennGruppeAnzPersonen = new DevExpress.XtraReports.UI.CalculatedField(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); @@ -606,6 +606,10 @@ namespace ABCBetreuungenReports this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; this.xrTableCell17.Weight = 0.46708556807362822D; // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); + // // formattingRuleStartDate // this.formattingRuleStartDate.Condition = "[StartDate2] < [StartDate]"; @@ -665,7 +669,7 @@ namespace ABCBetreuungenReports // this.lblGesamtbudgetQuali.Font = new System.Drawing.Font("Calibri", 9.75F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline))), System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblGesamtbudgetQuali.ForeColor = System.Drawing.Color.Black; - this.lblGesamtbudgetQuali.LocationFloat = new DevExpress.Utils.PointFloat(288.9635F, 133.3332F); + this.lblGesamtbudgetQuali.LocationFloat = new DevExpress.Utils.PointFloat(303.5468F, 133.3333F); this.lblGesamtbudgetQuali.Multiline = true; this.lblGesamtbudgetQuali.Name = "lblGesamtbudgetQuali"; this.lblGesamtbudgetQuali.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -800,12 +804,12 @@ namespace ABCBetreuungenReports this.xrLabel29.Multiline = true; this.xrLabel29.Name = "xrLabel29"; this.xrLabel29.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); - this.xrLabel29.SizeF = new System.Drawing.SizeF(288.9636F, 17.42422F); + this.xrLabel29.SizeF = new System.Drawing.SizeF(296.4236F, 17.42422F); this.xrLabel29.StylePriority.UseFont = false; this.xrLabel29.StylePriority.UseForeColor = false; this.xrLabel29.StylePriority.UsePadding = false; this.xrLabel29.StylePriority.UseTextAlignment = false; - this.xrLabel29.Text = "Gesamtbudget / Restbudget (6 Monate: Zeitraum) "; + this.xrLabel29.Text = "Gesamtbudget / Restbudget (12 Monate: Zeitraum) "; this.xrLabel29.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; // // xrLabel28 @@ -1363,10 +1367,6 @@ namespace ABCBetreuungenReports this.wennGruppeAnzPersonen.Expression = "Iif([CustomerCount] > 1,[CustomerCount],\'\')"; this.wennGruppeAnzPersonen.Name = "wennGruppeAnzPersonen"; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); - // // Quittierungsbeleg // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { diff --git a/ReportImp/ABCBetreuungenReports/Service/CustomServiceRecordValidator.cs b/ReportImp/ABCBetreuungenReports/Service/CustomServiceRecordValidator.cs index 020c69b8f..862e6df8e 100644 --- a/ReportImp/ABCBetreuungenReports/Service/CustomServiceRecordValidator.cs +++ b/ReportImp/ABCBetreuungenReports/Service/CustomServiceRecordValidator.cs @@ -16,7 +16,7 @@ namespace ABCBetreuungenReports.Service var validation = base.ValidateServiceRecord(newServiceRecord, statistics, maxDaysEditServiceRecordsAllowed, employeeOids, cb2scOids); // Prüfen, dass beim Speichern der Doku bei Kategorie "Wegezeit" nur Fahrtenbuch ausgefüllt werden muss und ansonsten alles AUßER Fahrtenbuch - if (newServiceRecord.ServiceDescription.Name.ToLower().Contains("wegezeit")) + if (newServiceRecord.ServiceDescription.Category.Name.ToLower().Contains("wegezeit")) { if (newServiceRecord.Notice2.IsNullOrEmpty()) { diff --git a/ReportImp/ABCBetreuungenReports/SettlementReport.cs b/ReportImp/ABCBetreuungenReports/SettlementReport.cs index 0cf2549cc..342fe13fd 100644 --- a/ReportImp/ABCBetreuungenReports/SettlementReport.cs +++ b/ReportImp/ABCBetreuungenReports/SettlementReport.cs @@ -18,7 +18,13 @@ namespace BeWo.ABCBetreuungenReports.Alt public void SetReportDataSource(SettlementRO pRO) { - StringBuilder sb = new StringBuilder(); + if (pRO.RecipientOrganisation.ToLower().Contains("neu")) + { + var fls = pRO.ApprovedFLS.Split(' ')[0]; + pRO.ApprovedFLS = string.Format("{0:0.00} FLS", Convert.ToDecimal(fls) / 50 * 60); + } + + StringBuilder sb = new StringBuilder(); if (!String.IsNullOrEmpty(pRO.RecipientOrganisation)) { diff --git a/ReportImp/ABCBetreuungenReports/SettlementReport2.cs b/ReportImp/ABCBetreuungenReports/SettlementReport2.cs index 712941301..78cc39879 100644 --- a/ReportImp/ABCBetreuungenReports/SettlementReport2.cs +++ b/ReportImp/ABCBetreuungenReports/SettlementReport2.cs @@ -18,6 +18,18 @@ namespace BeWo.ABCBetreuungenReports public void SetReportDataSource(Settlement2RO pRO) { + if (pRO.RecipientOrganisation.ToLower().Contains("neu")) + { + var fls = pRO.ApprovedFLS.Split(' ')[0]; + pRO.ApprovedFLS = string.Format("{0:0.00} FLS", Convert.ToDecimal(fls) / 50 * 60); + } + + foreach (var item in pRO.InvoiceItems) + { + if (item.ItemDescription == "Kontaktpauschale") + item.AbrechnungsText = item.AbrechnungsText.Replace("FLS", "Fahrten"); + } + StringBuilder sb = new StringBuilder(); if (!String.IsNullOrEmpty(pRO.RecipientOrganisation))