diff --git a/ReportImp/AkggMid/LeistungsnachweisHelper.cs b/ReportImp/AkggMid/LeistungsnachweisHelper.cs index dbcc6495f..5db09665e 100644 --- a/ReportImp/AkggMid/LeistungsnachweisHelper.cs +++ b/ReportImp/AkggMid/LeistungsnachweisHelper.cs @@ -163,7 +163,7 @@ namespace AkggMid newSr.Notice = "Wochensumme"; newSr.IstFerien = true; newSr.TimeRangeString = String.Format("{0:00}z", i); - newSr.Minutes = Rundeauf15Minuten(wochensumme); + newSr.Minutes = wochensumme; //Rundung am 25.09.2023 entfernt // Rundeauf15Minuten(wochensumme); wochensumme = 0; result.Add(newSr); } @@ -171,7 +171,7 @@ namespace AkggMid } - double minutenGesamt = 0; + double stdGesamt = 0; foreach (var record in result) { if (record.StartDate.DayOfWeek != DayOfWeek.Saturday && record.StartDate.DayOfWeek != DayOfWeek.Sunday && IstAbwesend(record.StartDate)) @@ -184,7 +184,7 @@ namespace AkggMid } if (record.IstFerien) // Wochensumme { - minutenGesamt += record.Minutes; + stdGesamt += Math.Round(record.Minutes / 60, 2, MidpointRounding.AwayFromZero); //Anpassung, das Wochensumme nicht mehr gerundet auf 15 min } @@ -197,7 +197,7 @@ namespace AkggMid record.IstSonntag = true; } } - pRO.TotalFLM = minutenGesamt; + pRO.TotalFLS = stdGesamt; return result.OrderBy(r => r.TimeRangeString).ToList(); } diff --git a/ReportImp/AkggMid/LeistungsnachweisSozialamt.designer.cs b/ReportImp/AkggMid/LeistungsnachweisSozialamt.designer.cs index 4a6a2c712..b19339b72 100644 --- a/ReportImp/AkggMid/LeistungsnachweisSozialamt.designer.cs +++ b/ReportImp/AkggMid/LeistungsnachweisSozialamt.designer.cs @@ -73,9 +73,9 @@ namespace AkggMid this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.fieldStd = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldTotalStd = new DevExpress.XtraReports.UI.CalculatedField(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); @@ -561,13 +561,9 @@ namespace AkggMid this.xrLabel1.StylePriority.UseBorders = false; this.xrLabel1.StylePriority.UseFont = false; this.xrLabel1.StylePriority.UseTextAlignment = false; - this.xrLabel1.Text = "Summe der gel. Stunden: [fieldTotalStd!0.00]"; + this.xrLabel1.Text = "Summe der gel. Stunden: [TotalFLS!0.00]"; this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); - // // fieldStd // this.fieldStd.DataMember = "Services"; @@ -581,6 +577,10 @@ namespace AkggMid this.fieldTotalStd.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; this.fieldTotalStd.Name = "fieldTotalStd"; // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); + // // LeistungsnachweisSozialamt // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { diff --git a/ReportImp/AkggMid/LeistungsnachweisSozialamtMitBlutzucker.designer.cs b/ReportImp/AkggMid/LeistungsnachweisSozialamtMitBlutzucker.designer.cs index e83449439..7b4ce629c 100644 --- a/ReportImp/AkggMid/LeistungsnachweisSozialamtMitBlutzucker.designer.cs +++ b/ReportImp/AkggMid/LeistungsnachweisSozialamtMitBlutzucker.designer.cs @@ -587,7 +587,7 @@ namespace AkggMid this.xrLabel1.StylePriority.UseBorders = false; this.xrLabel1.StylePriority.UseFont = false; this.xrLabel1.StylePriority.UseTextAlignment = false; - this.xrLabel1.Text = "Summe der gel. Stunden: [fieldTotalStd!0.00]"; + this.xrLabel1.Text = "Summe der gel. Stunden: [TotalFLS!0.00]"; this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft; // // bindingSource1 diff --git a/ReportImp/AkggMid/LeistungsnachweisSozialamtMitBlutzuckerPumpe.designer.cs b/ReportImp/AkggMid/LeistungsnachweisSozialamtMitBlutzuckerPumpe.designer.cs index 7aef1eeda..e0dbb772a 100644 --- a/ReportImp/AkggMid/LeistungsnachweisSozialamtMitBlutzuckerPumpe.designer.cs +++ b/ReportImp/AkggMid/LeistungsnachweisSozialamtMitBlutzuckerPumpe.designer.cs @@ -611,7 +611,7 @@ namespace AkggMid this.xrLabel1.StylePriority.UseBorders = false; this.xrLabel1.StylePriority.UseFont = false; this.xrLabel1.StylePriority.UseTextAlignment = false; - this.xrLabel1.Text = "Summe der gel. Stunden: [fieldTotalStd!0.00]"; + this.xrLabel1.Text = "Summe der gel. Stunden: [TotalFLS!0.00]"; this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft; // // bindingSource1