From 1daeafffe3a14bdfe6ee1c97c43db63640009e4d Mon Sep 17 00:00:00 2001 From: Alexandra Date: Tue, 15 Aug 2023 16:24:11 +0200 Subject: [PATCH] HausDuelken/Finanzauswertung Spalten angepasst --- ReportImp/HausDuelken/Finanzauswertung.cs | 11 +- .../HausDuelken/Finanzauswertung.designer.cs | 181 +++++++++--------- 2 files changed, 98 insertions(+), 94 deletions(-) diff --git a/ReportImp/HausDuelken/Finanzauswertung.cs b/ReportImp/HausDuelken/Finanzauswertung.cs index 98ac399b2..f91929c9e 100644 --- a/ReportImp/HausDuelken/Finanzauswertung.cs +++ b/ReportImp/HausDuelken/Finanzauswertung.cs @@ -27,14 +27,14 @@ namespace HausDuelken end.Day == DateTime.DaysInMonth(end.Year, end.Month)) { lblTitel.Text = String.Format("Finanzauswertung {0:MMMM yyyy}", start); - cellBewilligtImZeitraumHeader.Text = String.Format("bewilligte GesamtStd. {0:MMMM}", start); - cellGeleistetImZeitraumHeader.Text = String.Format("abrechen-bare geleistete GesamtStd. {0:MMMM}", start); + cellGeleistetImZeitraumHeader.Text = String.Format("bewilligte GesamtStd. {0:MMMM}", start); + cellGeleistetImZeitraumHeader.Text = String.Format("geleistete GesamtStd. {0:MMMM}", start); } else { lblTitel.Text = String.Format("Finanzauswertung {0:dd.MM.yyyy}-{1:dd.MM.yyyy}", start, end); - cellBewilligtImZeitraumHeader.Text = String.Format("bewilligte GesamtStd {0:dd.MM.yyyy}-{1:dd.MM.yyyy}", start, end); - cellGeleistetImZeitraumHeader.Text = String.Format("abrechen-bare geleistete GesamtStd. {0:dd.MM.yyyy}-{1:dd.MM.yyyy}", start, end); + cellGeleistetImZeitraumHeader.Text = String.Format("bewilligte GesamtStd {0:dd.MM.yyyy}-{1:dd.MM.yyyy}", start, end); + cellGeleistetImZeitraumHeader.Text = String.Format("geleistete GesamtStd. {0:dd.MM.yyyy}-{1:dd.MM.yyyy}", start, end); } //if (pRO.RateFactor.HasValue) //{ @@ -48,9 +48,8 @@ namespace HausDuelken } else { - cellBewilligtImZeitraumHeader.Visible = false; + cellGeleistetImZeitraumHeader.Visible = false; cellBewilligteFLSImBereich.Visible = false; - cellGeleistetImBereich.Visible = false; cellGeleistetImZeitraumHeader.Visible = false; //cellRateFactorHeader.Visible = false; //cellRateFactor.Visible = false; diff --git a/ReportImp/HausDuelken/Finanzauswertung.designer.cs b/ReportImp/HausDuelken/Finanzauswertung.designer.cs index 8d3721e7e..ca1b9a853 100644 --- a/ReportImp/HausDuelken/Finanzauswertung.designer.cs +++ b/ReportImp/HausDuelken/Finanzauswertung.designer.cs @@ -35,7 +35,6 @@ namespace HausDuelken DevExpress.XtraReports.UI.XRSummary xrSummary3 = new DevExpress.XtraReports.UI.XRSummary(); DevExpress.XtraReports.UI.XRSummary xrSummary4 = new DevExpress.XtraReports.UI.XRSummary(); DevExpress.XtraReports.UI.XRSummary xrSummary5 = new DevExpress.XtraReports.UI.XRSummary(); - DevExpress.XtraReports.UI.XRSummary xrSummary6 = new DevExpress.XtraReports.UI.XRSummary(); DevExpress.XtraReports.UI.XRSummary xrSummary7 = new DevExpress.XtraReports.UI.XRSummary(); DevExpress.XtraReports.UI.XRSummary xrSummary8 = new DevExpress.XtraReports.UI.XRSummary(); DevExpress.XtraReports.UI.XRSummary xrSummary9 = new DevExpress.XtraReports.UI.XRSummary(); @@ -44,10 +43,11 @@ namespace HausDuelken DevExpress.XtraReports.UI.XRSummary xrSummary12 = new DevExpress.XtraReports.UI.XRSummary(); DevExpress.XtraReports.UI.XRSummary xrSummary13 = new DevExpress.XtraReports.UI.XRSummary(); DevExpress.XtraReports.UI.XRSummary xrSummary14 = new DevExpress.XtraReports.UI.XRSummary(); - DevExpress.XtraReports.UI.XRSummary xrSummary15 = new DevExpress.XtraReports.UI.XRSummary(); DevExpress.XtraReports.UI.XRSummary xrSummary16 = new DevExpress.XtraReports.UI.XRSummary(); DevExpress.XtraReports.UI.XRSummary xrSummary17 = new DevExpress.XtraReports.UI.XRSummary(); DevExpress.XtraReports.UI.XRSummary xrSummary18 = new DevExpress.XtraReports.UI.XRSummary(); + DevExpress.XtraReports.UI.XRSummary xrSummary6 = new DevExpress.XtraReports.UI.XRSummary(); + DevExpress.XtraReports.UI.XRSummary xrSummary15 = new DevExpress.XtraReports.UI.XRSummary(); this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); this.xrTable2 = new DevExpress.XtraReports.UI.XRTable(); @@ -61,7 +61,6 @@ namespace HausDuelken this.xrTableCell37 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); this.cellBewilligteFLSImBereich = new DevExpress.XtraReports.UI.XRTableCell(); - this.cellGeleistetImBereich = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell(); this.lblTitel = new DevExpress.XtraReports.UI.XRLabel(); this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); @@ -77,7 +76,6 @@ namespace HausDuelken this.xrTableCell39 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell34 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell36 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell38 = new DevExpress.XtraReports.UI.XRTableCell(); this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand(); this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); @@ -89,7 +87,6 @@ namespace HausDuelken this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell(); this.cellBewilligtImZeitraumHeader = new DevExpress.XtraReports.UI.XRTableCell(); this.cellGeleistetImZeitraumHeader = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -105,7 +102,6 @@ namespace HausDuelken this.xrTableCell40 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell(); this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); @@ -123,6 +119,11 @@ namespace HausDuelken this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.StundenAbrechenbar = new DevExpress.XtraReports.UI.CalculatedField(); + this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell36 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell41 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell42 = new DevExpress.XtraReports.UI.XRTableCell(); + this.GesBewilligung = new DevExpress.XtraReports.UI.CalculatedField(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); @@ -174,9 +175,9 @@ namespace HausDuelken this.xrTableCell10, this.xrTableCell14, this.xrTableCell37, + this.xrTableCell36, this.xrTableCell12, this.cellBewilligteFLSImBereich, - this.cellGeleistetImBereich, this.xrTableCell26}); this.xrTableRow2.Name = "xrTableRow2"; this.xrTableRow2.Weight = 1D; @@ -250,7 +251,7 @@ namespace HausDuelken // xrTableCell12 // this.xrTableCell12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.BillableHours", "{0:0.00}")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.ApprovedHoursInReportTimeSpan", "{0:0.00}")}); this.xrTableCell12.Name = "xrTableCell12"; this.xrTableCell12.StylePriority.UseTextAlignment = false; this.xrTableCell12.Text = "xrTableCell12"; @@ -260,23 +261,13 @@ namespace HausDuelken // cellBewilligteFLSImBereich // this.cellBewilligteFLSImBereich.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.ApprovedHoursInReportTimeSpan", "{0:0.00}")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.StundenAbrechenbar", "{0:0.00}")}); this.cellBewilligteFLSImBereich.Name = "cellBewilligteFLSImBereich"; this.cellBewilligteFLSImBereich.StylePriority.UseTextAlignment = false; this.cellBewilligteFLSImBereich.Text = "cellBewilligteFLSImBereich"; this.cellBewilligteFLSImBereich.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; this.cellBewilligteFLSImBereich.Weight = 0.35450403735467684D; // - // cellGeleistetImBereich - // - this.cellGeleistetImBereich.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.StundenAbrechenbar", "{0:0.00}")}); - this.cellGeleistetImBereich.Name = "cellGeleistetImBereich"; - this.cellGeleistetImBereich.StylePriority.UseTextAlignment = false; - this.cellGeleistetImBereich.Text = "cellGeleistetImBereich"; - this.cellGeleistetImBereich.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.cellGeleistetImBereich.Weight = 0.35450540655668883D; - // // xrTableCell26 // this.xrTableCell26.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { @@ -344,9 +335,9 @@ namespace HausDuelken this.xrTableCell32, this.xrTableCell33, this.xrTableCell39, + this.xrTableCell41, this.xrTableCell34, this.xrTableCell35, - this.xrTableCell36, this.xrTableCell38}); this.xrTableRow4.Name = "xrTableRow4"; this.xrTableRow4.Weight = 1D; @@ -451,15 +442,15 @@ namespace HausDuelken // this.xrTableCell34.CanGrow = false; this.xrTableCell34.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.BillableHours")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.ApprovedHoursInReportTimeSpan")}); this.xrTableCell34.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold); this.xrTableCell34.Name = "xrTableCell34"; this.xrTableCell34.StylePriority.UseFont = false; this.xrTableCell34.StylePriority.UseTextAlignment = false; - xrSummary6.FormatString = "{0:0.00}"; - xrSummary6.IgnoreNullValues = true; - xrSummary6.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; - this.xrTableCell34.Summary = xrSummary6; + xrSummary7.FormatString = "{0:0.00}"; + xrSummary7.IgnoreNullValues = true; + xrSummary7.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.xrTableCell34.Summary = xrSummary7; this.xrTableCell34.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; this.xrTableCell34.Weight = 0.35450493847041725D; // @@ -467,33 +458,17 @@ namespace HausDuelken // this.xrTableCell35.CanGrow = false; this.xrTableCell35.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.ApprovedHoursInReportTimeSpan")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.StundenAbrechenbar")}); this.xrTableCell35.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold); this.xrTableCell35.Name = "xrTableCell35"; this.xrTableCell35.StylePriority.UseFont = false; this.xrTableCell35.StylePriority.UseTextAlignment = false; - xrSummary7.FormatString = "{0:0.00}"; - xrSummary7.IgnoreNullValues = true; - xrSummary7.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; - this.xrTableCell35.Summary = xrSummary7; - this.xrTableCell35.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell35.Weight = 0.35450522064326395D; - // - // xrTableCell36 - // - this.xrTableCell36.CanGrow = false; - this.xrTableCell36.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.StundenAbrechenbar")}); - this.xrTableCell36.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold); - this.xrTableCell36.Name = "xrTableCell36"; - this.xrTableCell36.StylePriority.UseFont = false; - this.xrTableCell36.StylePriority.UseTextAlignment = false; xrSummary8.FormatString = "{0:0.00}"; xrSummary8.IgnoreNullValues = true; xrSummary8.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; - this.xrTableCell36.Summary = xrSummary8; - this.xrTableCell36.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell36.Weight = 0.35450522061135104D; + this.xrTableCell35.Summary = xrSummary8; + this.xrTableCell35.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell35.Weight = 0.35450522064326395D; // // xrTableCell38 // @@ -545,7 +520,7 @@ namespace HausDuelken this.xrTableCell5, this.xrTableCell13, this.xrTableCell11, - this.xrTableCell24, + this.xrTableCell23, this.cellBewilligtImZeitraumHeader, this.cellGeleistetImZeitraumHeader, this.xrTableCell25}); @@ -607,29 +582,21 @@ namespace HausDuelken this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; this.xrTableCell11.Weight = 0.35450442917546354D; // - // xrTableCell24 - // - this.xrTableCell24.Name = "xrTableCell24"; - this.xrTableCell24.StylePriority.UseTextAlignment = false; - this.xrTableCell24.Text = "Bis dato geleistete GesamtStd."; - this.xrTableCell24.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell24.Weight = 0.35450551103964922D; - // // cellBewilligtImZeitraumHeader // this.cellBewilligtImZeitraumHeader.Name = "cellBewilligtImZeitraumHeader"; this.cellBewilligtImZeitraumHeader.StylePriority.UseTextAlignment = false; - this.cellBewilligtImZeitraumHeader.Text = "bewilligte GesamtStd."; + this.cellBewilligtImZeitraumHeader.Text = "Bis dato bewilligte GesamtStd."; this.cellBewilligtImZeitraumHeader.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.cellBewilligtImZeitraumHeader.Weight = 0.35450550801344416D; + this.cellBewilligtImZeitraumHeader.Weight = 0.35450551103964922D; // // cellGeleistetImZeitraumHeader // this.cellGeleistetImZeitraumHeader.Name = "cellGeleistetImZeitraumHeader"; this.cellGeleistetImZeitraumHeader.StylePriority.UseTextAlignment = false; - this.cellGeleistetImZeitraumHeader.Text = "abrechen-bare geleistete GesamtStd."; + this.cellGeleistetImZeitraumHeader.Text = "geleistete GesamtStd."; this.cellGeleistetImZeitraumHeader.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.cellGeleistetImZeitraumHeader.Weight = 0.35450550798153124D; + this.cellGeleistetImZeitraumHeader.Weight = 0.35450550801344416D; // // xrTableCell25 // @@ -675,9 +642,9 @@ namespace HausDuelken this.xrTableCell19, this.xrTableCell20, this.xrTableCell40, + this.xrTableCell42, this.xrTableCell21, this.xrTableCell22, - this.xrTableCell23, this.xrTableCell27}); this.xrTableRow3.Name = "xrTableRow3"; this.xrTableRow3.Weight = 1D; @@ -770,13 +737,13 @@ namespace HausDuelken // this.xrTableCell21.CanGrow = false; this.xrTableCell21.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.BillableHours")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.ApprovedHoursInReportTimeSpan")}); this.xrTableCell21.Name = "xrTableCell21"; this.xrTableCell21.StylePriority.UseTextAlignment = false; - xrSummary15.FormatString = "{0:0.00}"; - xrSummary15.IgnoreNullValues = true; - xrSummary15.Running = DevExpress.XtraReports.UI.SummaryRunning.Report; - this.xrTableCell21.Summary = xrSummary15; + xrSummary16.FormatString = "{0:0.00}"; + xrSummary16.IgnoreNullValues = true; + xrSummary16.Running = DevExpress.XtraReports.UI.SummaryRunning.Report; + this.xrTableCell21.Summary = xrSummary16; this.xrTableCell21.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; this.xrTableCell21.Weight = 0.35450521149040726D; // @@ -784,29 +751,15 @@ namespace HausDuelken // this.xrTableCell22.CanGrow = false; this.xrTableCell22.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.ApprovedHoursInReportTimeSpan")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.StundenAbrechenbar")}); this.xrTableCell22.Name = "xrTableCell22"; this.xrTableCell22.StylePriority.UseTextAlignment = false; - xrSummary16.FormatString = "{0:0.00}"; - xrSummary16.IgnoreNullValues = true; - xrSummary16.Running = DevExpress.XtraReports.UI.SummaryRunning.Report; - this.xrTableCell22.Summary = xrSummary16; - this.xrTableCell22.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell22.Weight = 0.35450522064326473D; - // - // xrTableCell23 - // - this.xrTableCell23.CanGrow = false; - this.xrTableCell23.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.StundenAbrechenbar")}); - this.xrTableCell23.Name = "xrTableCell23"; - this.xrTableCell23.StylePriority.UseTextAlignment = false; xrSummary17.FormatString = "{0:0.00}"; xrSummary17.IgnoreNullValues = true; xrSummary17.Running = DevExpress.XtraReports.UI.SummaryRunning.Report; - this.xrTableCell23.Summary = xrSummary17; - this.xrTableCell23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell23.Weight = 0.35450522061135181D; + this.xrTableCell22.Summary = xrSummary17; + this.xrTableCell22.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell22.Weight = 0.35450522064326473D; // // xrTableCell27 // @@ -959,6 +912,56 @@ namespace HausDuelken this.StundenAbrechenbar.Expression = "[StundenFehlkontakteInReportTimeSpan]+[StundenNichtFehlkontakteInReportTimeSpan]"; this.StundenAbrechenbar.Name = "StundenAbrechenbar"; // + // xrTableCell23 + // + this.xrTableCell23.Multiline = true; + this.xrTableCell23.Name = "xrTableCell23"; + this.xrTableCell23.StylePriority.UseTextAlignment = false; + this.xrTableCell23.Text = "Bewilligte GesamtStd\r\nFLS + ASS"; + this.xrTableCell23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell23.Weight = 0.35450442917546354D; + // + // xrTableCell36 + // + this.xrTableCell36.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.GesBewilligung", "{0:0.00}")}); + this.xrTableCell36.Name = "xrTableCell36"; + this.xrTableCell36.StylePriority.UseTextAlignment = false; + this.xrTableCell36.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell36.Weight = 0.35450543784289873D; + // + // xrTableCell41 + // + this.xrTableCell41.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.GesBewilligung")}); + this.xrTableCell41.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold); + this.xrTableCell41.Name = "xrTableCell41"; + this.xrTableCell41.StylePriority.UseFont = false; + this.xrTableCell41.StylePriority.UseTextAlignment = false; + xrSummary6.FormatString = "{0:0.00}"; + xrSummary6.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.xrTableCell41.Summary = xrSummary6; + this.xrTableCell41.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell41.Weight = 0.35450466800440311D; + // + // xrTableCell42 + // + this.xrTableCell42.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.GesBewilligung")}); + this.xrTableCell42.Name = "xrTableCell42"; + this.xrTableCell42.StylePriority.UseTextAlignment = false; + xrSummary15.FormatString = "{0:0.00}"; + xrSummary15.Running = DevExpress.XtraReports.UI.SummaryRunning.Report; + this.xrTableCell42.Summary = xrSummary15; + this.xrTableCell42.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell42.Weight = 0.35450495792851527D; + // + // GesBewilligung + // + this.GesBewilligung.DataMember = "SupportConceptFinanceList"; + this.GesBewilligung.Expression = "[AmountNichtFehlkontakteInReportTimeSpan]+[ApprovedHours]"; + this.GesBewilligung.Name = "GesBewilligung"; + // // Finanzauswertung // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -969,7 +972,8 @@ namespace HausDuelken this.topMarginBand1, this.bottomMarginBand1}); this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] { - this.StundenAbrechenbar}); + this.StundenAbrechenbar, + this.GesBewilligung}); this.DataSource = this.bindingSource1; this.Landscape = true; this.Margins = new System.Drawing.Printing.Margins(55, 55, 50, 30); @@ -1021,7 +1025,6 @@ namespace HausDuelken private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader2; private DevExpress.XtraReports.UI.XRTableCell xrTableCell14; private DevExpress.XtraReports.UI.XRTableCell cellBewilligteFLSImBereich; - private DevExpress.XtraReports.UI.XRTableCell cellGeleistetImBereich; private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter2; private DevExpress.XtraReports.UI.XRTable xrTable3; private DevExpress.XtraReports.UI.XRTableRow xrTableRow3; @@ -1033,7 +1036,6 @@ namespace HausDuelken private DevExpress.XtraReports.UI.XRTableCell xrTableCell20; private DevExpress.XtraReports.UI.XRTableCell xrTableCell21; private DevExpress.XtraReports.UI.XRTableCell xrTableCell22; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell23; private DevExpress.XtraReports.UI.XRTableCell xrTableCell26; private DevExpress.XtraReports.UI.XRTableCell xrTableCell27; private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader1; @@ -1047,7 +1049,6 @@ namespace HausDuelken private DevExpress.XtraReports.UI.XRTableCell xrTableCell33; private DevExpress.XtraReports.UI.XRTableCell xrTableCell34; private DevExpress.XtraReports.UI.XRTableCell xrTableCell35; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell36; private DevExpress.XtraReports.UI.XRTableCell xrTableCell38; private DevExpress.XtraReports.UI.XRLabel xrLabel1; private DevExpress.XtraReports.UI.XRLabel xrLabel2; @@ -1060,13 +1061,17 @@ namespace HausDuelken private DevExpress.XtraReports.UI.XRTableCell xrTableCell5; private DevExpress.XtraReports.UI.XRTableCell xrTableCell13; private DevExpress.XtraReports.UI.XRTableCell xrTableCell11; - private DevExpress.XtraReports.UI.XRTableCell cellBewilligtImZeitraumHeader; private DevExpress.XtraReports.UI.XRTableCell cellGeleistetImZeitraumHeader; private DevExpress.XtraReports.UI.XRTableCell xrTableCell25; private DevExpress.XtraReports.UI.CalculatedField StundenAbrechenbar; private DevExpress.XtraReports.UI.XRTableCell xrTableCell37; private DevExpress.XtraReports.UI.XRTableCell xrTableCell39; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell24; + private DevExpress.XtraReports.UI.XRTableCell cellBewilligtImZeitraumHeader; private DevExpress.XtraReports.UI.XRTableCell xrTableCell40; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell36; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell41; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell23; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell42; + private DevExpress.XtraReports.UI.CalculatedField GesBewilligung; } }