diff --git a/ReportImp/HausDuelken/Calculations/CustomServiceRecordStatisticFactory.cs b/ReportImp/HausDuelken/Calculations/CustomServiceRecordStatisticFactory.cs new file mode 100644 index 000000000..dcbf17468 --- /dev/null +++ b/ReportImp/HausDuelken/Calculations/CustomServiceRecordStatisticFactory.cs @@ -0,0 +1,121 @@ +using System; +using System.Collections.Generic; +using BeWo.Data.Access; +using BeWo.Data.Entities; +using BeWo.Service.Plugins; +using BS.Shared; +using BS.Shared.DataContracts; + + +namespace HausDuelken.Calculations +{ + public class CustomServiceRecordStatisticFactory : ServiceRecordStatisticFactory + { + + public override ServiceRecordStatisticsInfoDC GetServiceRecordStatisticInfo(long costBearer2SupportConceptOid, DateTime statisticsDate) + { + var cb2sc = DAOFactory.GenericDAO.LoadByID(costBearer2SupportConceptOid); + if (!cb2sc.ApprovedStartDate.HasValue) + { + var stats = CreateSupportConceptStatisticsImpl(costBearer2SupportConceptOid, statisticsDate); + var dc = new ServiceRecordStatisticsInfoDC(); + + dc.Header = new string[4]; + dc.Header[0] = "Bewilligungszeitraum:"; + dc.Header[1] = "Geleistet diese Woche/Gesamt:"; + dc.Header[2] = "Bewilligt pro Woche/Gesamt:"; + dc.Header[3] = "Frei pro Woche/Gesamt:"; + + dc.ForegroundColor = new string[4]; + dc.ForegroundColor[0] = "#FF2B508B"; + dc.ForegroundColor[1] = "#FF2B508B"; + dc.ForegroundColor[2] = "#FF2B508B"; + dc.ForegroundColor[3] = "#FF2B508B"; + + dc.PeriodStatisticInfos = new List(); + + if (stats != null) + { + if (stats.PeriodStatistics.Count > 1 && !TimeSpanIsEqual(stats)) + dc.PeriodStatisticInfos.Add(CreateTotalStatistics(stats)); + + foreach (var pdc in stats.PeriodStatistics) + { + bool showOutOfPeriod = stats.PeriodStatistics.Count == 1; + dc.PeriodStatisticInfos.Add(CreateServiceRecordPeriodStatisticsInfo(stats, pdc, showOutOfPeriod)); + } + } + + return dc; + } + return null; + } + + + public ServiceRecordPeriodStatisticsInfoDC CreateTotalStatistics(SupportConceptStatisticsDC stats) + { + var dc = CreateDefaultServiceRecordPeriodStatisticsInfo(4); + dc.LeftValues[0] = "Gesamt"; + + dc.LeftValues[1] = String.Format("{0:0.00}", stats.MinutesProvidedThisWeek / 60); + dc.RightValues[1] = String.Format("{0:0.00}", stats.MinutesProvidedTotalRounded / 60); + + dc.LeftValues[2] = "0.00"; + dc.RightValues[2] = "0.00"; + + dc.LeftValues[3] = String.Format("{0:0.00}", (stats.MinutesProvidedTotal - stats.ApprovedMinutesTillNow) / 60); + dc.RightValues[3] = String.Format("{0:0.00}", stats.MinutesProvidedTotalRounded / 60); + if (Math.Abs(stats.MinutesProvidedTotal / 60) > 8) + { + dc.LeftValueColors[3] = "#FFFF0000"; + } + + return dc; + } + + public ServiceRecordPeriodStatisticsInfoDC CreateServiceRecordPeriodStatisticsInfo(SupportConceptStatisticsDC stats, SupportConceptPeriodStatisticsDC periodStats, bool showOutOfPeriod) + { + var dc = CreateDefaultServiceRecordPeriodStatisticsInfo(4); + + if (periodStats.SupportConceptApprovalPeriod != null) + { + if (periodStats.SupportConceptApprovalPeriod.ServiceCategory != null) + { + if (periodStats.SupportConceptApprovalPeriod.StartDate.HasValue && periodStats.SupportConceptApprovalPeriod.EndDate.HasValue && + periodStats.SupportConceptApprovalPeriod.StartDate.Value.Date == stats.StatisticsStartDate.Date && + periodStats.SupportConceptApprovalPeriod.EndDate.Value.Date == stats.StatisticsEndDate.Date) + { + dc.LeftValues[0] = periodStats.SupportConceptApprovalPeriod.ServiceCategory.Name; + } + else + { + dc.LeftValues[0] = String.Format("{0}: {1:dd.MM.yy} - {2:dd.MM.yy}", + periodStats.SupportConceptApprovalPeriod.ServiceCategory.Name, + periodStats.SupportConceptApprovalPeriod.StartDate, + periodStats.SupportConceptApprovalPeriod.EndDate); + } + } + else + { + dc.LeftValues[0] = String.Format("{0:dd.MM.yy} - {1:dd.MM.yy}", + periodStats.SupportConceptApprovalPeriod.StartDate, + periodStats.SupportConceptApprovalPeriod.EndDate); + } + } + + dc.LeftValues[1] = String.Format("{0:0.00}", periodStats.MinutesProvidedThisWeek / 60); + dc.RightValues[1] = String.Format("{0:0.00}", periodStats.MinutesProvidedTotalRounded / 60); + + dc.LeftValues[2] = "0.00"; + dc.RightValues[2] = "0.00"; + + dc.LeftValues[3] = "0.00"; + dc.RightValues[3] = String.Format("{0:0.00}", -periodStats.MinutesProvidedTotalRounded / 60); + if (Math.Abs(periodStats.MinutesProvidedTotal / 60) > 8) + { + dc.RightValueColors[3] = "#FFFF0000"; + } + return dc; + } + } +} diff --git a/ReportImp/HausDuelken/Finanzauswertung.cs b/ReportImp/HausDuelken/Finanzauswertung.cs index 4ff22f835..98ac399b2 100644 --- a/ReportImp/HausDuelken/Finanzauswertung.cs +++ b/ReportImp/HausDuelken/Finanzauswertung.cs @@ -1,5 +1,7 @@ using System; using System.Linq; +using BS.Shared; +using BS.Shared.Services; using BeWo.Report; using BeWo.Report.ReportObjects; @@ -25,26 +27,24 @@ namespace HausDuelken end.Day == DateTime.DaysInMonth(end.Year, end.Month)) { lblTitel.Text = String.Format("Finanzauswertung {0:MMMM yyyy}", start); - cellBewilligtImZeitraumHeader.Text = String.Format("bewilligte FLS {0:MMMM}", start); - cellGeleistetImZeitraumHeader.Text = String.Format("geleistete Std. {0:MMMM}", start); - + cellBewilligtImZeitraumHeader.Text = String.Format("bewilligte GesamtStd. {0:MMMM}", start); + cellGeleistetImZeitraumHeader.Text = String.Format("abrechen-bare 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 FLS {0:dd.MM.yyyy}-{1:dd.MM.yyyy}", start, end); - cellGeleistetImZeitraumHeader.Text = String.Format("geleistete Std. {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); } - if (pRO.RateFactor.HasValue) - { - cellRateFactorHeader.Text = String.Format("geleistete Std. x {0:0.##}", pRO.RateFactor); - } - else - { - cellRateFactorHeader.Visible = false; - cellRateFactor.Visible = false; - } + //if (pRO.RateFactor.HasValue) + //{ + // cellRateFactorHeader.Text = String.Format("geleistete Std. x {0:0.##}", pRO.RateFactor); + //} + //else + //{ + // cellRateFactorHeader.Visible = false; + // cellRateFactor.Visible = false; + //} } else { @@ -52,14 +52,39 @@ namespace HausDuelken cellBewilligteFLSImBereich.Visible = false; cellGeleistetImBereich.Visible = false; cellGeleistetImZeitraumHeader.Visible = false; - cellRateFactorHeader.Visible = false; - cellRateFactor.Visible = false; + //cellRateFactorHeader.Visible = false; + //cellRateFactor.Visible = false; } pRO.SupportConceptFinanceList = (System.Collections.Generic.IList)pRO.SupportConceptFinanceList.Where(s => s.Costbearer2Supportconcept.SupportConcept.ActivationType == BS.Shared.ActivationTypeId.Active).ToList(); foreach (var sc in pRO.SupportConceptFinanceList) { + sc.ApprovedHours = 0; + sc.AmountNichtFehlkontakteInReportTimeSpan = 0; + + foreach (var ap in sc.Costbearer2Supportconcept.ApprovalPeriodList) + { + var calc = BS.Shared.Services.Calculations.GetInstance(sc.Costbearer2Supportconcept.CostBearer.CostBearerOid.ToString()); + if (ap.ServiceCategory != null && ap.ServiceCategory.Name.StartsWith("Direkte Leistungen")) + { + sc.ApprovedHours = calc.GetApprovedHoursForPeriod(ap, sc.Costbearer2Supportconcept.CostBearer.CostRatePeriods, sc.Costbearer2Supportconcept.StartDate, sc.Costbearer2Supportconcept.EndDate) ?? 0; + } + if (ap.ServiceCategory != null && ap.ServiceCategory.Name.StartsWith("Assistenz")) + { + sc.AmountNichtFehlkontakteInReportTimeSpan = calc.GetApprovedHoursForPeriod(ap, sc.Costbearer2Supportconcept.CostBearer.CostRatePeriods, sc.Costbearer2Supportconcept.StartDate, sc.Costbearer2Supportconcept.EndDate) ?? 0; + sc.ApprovedHoursInReportTimeSpan += calc.GetApprovedHoursForPeriod(ap, sc.Costbearer2Supportconcept.CostBearer.CostRatePeriods, pRO.ReportStartDate, pRO.ReportEndDate) ?? 0; + if (sc.ApprovedHours + sc.AmountNichtFehlkontakteInReportTimeSpan < sc.ApprovedHoursInReportTimeSpan) + { + sc.ApprovedHoursInReportTimeSpan = sc.ApprovedHours + (decimal)sc.AmountNichtFehlkontakteInReportTimeSpan; + + } + } + } + if (sc.SupportConceptTimeSpanString.Length == 0) + { + sc.SupportConceptTimeSpanString = String.Format("beantragt: {0:dd.MM.yyyy} - {1:dd.MM.yyyy}", sc.Costbearer2Supportconcept.RequestedStartDate, sc.Costbearer2Supportconcept.RequestedEndDate); + } if (sc.CostBearerName.ToLower().Contains("stationär")) { sc.Custom5 = "Stationär"; diff --git a/ReportImp/HausDuelken/Finanzauswertung.designer.cs b/ReportImp/HausDuelken/Finanzauswertung.designer.cs index c9bf1545e..8d3721e7e 100644 --- a/ReportImp/HausDuelken/Finanzauswertung.designer.cs +++ b/ReportImp/HausDuelken/Finanzauswertung.designer.cs @@ -58,10 +58,10 @@ namespace HausDuelken this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); + 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.cellRateFactor = 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(); @@ -74,10 +74,10 @@ namespace HausDuelken this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell32 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell33 = new DevExpress.XtraReports.UI.XRTableCell(); + 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.xrTableCell37 = 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,9 +89,9 @@ 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.cellRateFactorHeader = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell(); this.GroupFooter2 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrTable3 = new DevExpress.XtraReports.UI.XRTable(); @@ -102,15 +102,17 @@ namespace HausDuelken this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell(); + 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.xrTableCell24 = 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(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); this.pageFooterBand1 = new DevExpress.XtraReports.UI.PageFooterBand(); + this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); this.xrPageInfo2 = new DevExpress.XtraReports.UI.XRPageInfo(); this.xrPageInfo1 = new DevExpress.XtraReports.UI.XRPageInfo(); this.Title = new DevExpress.XtraReports.UI.XRControlStyle(); @@ -120,7 +122,7 @@ namespace HausDuelken this.fieldFLS = new DevExpress.XtraReports.UI.CalculatedField(); this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.StundenAbrechenbar = new DevExpress.XtraReports.UI.CalculatedField(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); @@ -171,10 +173,10 @@ namespace HausDuelken this.xrTableCell9, this.xrTableCell10, this.xrTableCell14, + this.xrTableCell37, this.xrTableCell12, this.cellBewilligteFLSImBereich, this.cellGeleistetImBereich, - this.cellRateFactor, this.xrTableCell26}); this.xrTableRow2.Name = "xrTableRow2"; this.xrTableRow2.Weight = 1D; @@ -184,7 +186,7 @@ namespace HausDuelken this.xrTableCell6.Multiline = true; this.xrTableCell6.Name = "xrTableCell6"; this.xrTableCell6.Text = "[CustomerName]\r\n[SupportConceptTimeSpanString]"; - this.xrTableCell6.Weight = 0.66469718772399189D; + this.xrTableCell6.Weight = 0.92226701212306872D; // // xrTableCell7 // @@ -194,7 +196,7 @@ namespace HausDuelken this.xrTableCell7.StylePriority.UseTextAlignment = false; this.xrTableCell7.Text = "Mitarbeiter/in"; this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell7.Weight = 0.5317577529262556D; + this.xrTableCell7.Weight = 0.38404783108073487D; // // xrTableCell8 // @@ -204,7 +206,7 @@ namespace HausDuelken this.xrTableCell8.StylePriority.UseTextAlignment = false; this.xrTableCell8.Text = "xrTableCell8"; this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell8.Weight = 0.44313146794248365D; + this.xrTableCell8.Weight = 0.39881818711460371D; // // xrTableCell9 // @@ -214,7 +216,7 @@ namespace HausDuelken this.xrTableCell9.StylePriority.UseTextAlignment = false; this.xrTableCell9.Text = "xrTableCell9"; this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell9.Weight = 0.44313146335503761D; + this.xrTableCell9.Weight = 0.39881818252715784D; // // xrTableCell10 // @@ -224,18 +226,26 @@ namespace HausDuelken this.xrTableCell10.StylePriority.UseTextAlignment = false; this.xrTableCell10.Text = "xrTableCell10"; this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell10.Weight = 0.44313146284443172D; + this.xrTableCell10.Weight = 0.3988184524825284D; // // xrTableCell14 // this.xrTableCell14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.Costbearer2Supportconcept.ApprovalPeriodList.ApprovedBE" + - "Total", "{0:0.00}")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.ApprovedHours", "{0:0.00}")}); this.xrTableCell14.Name = "xrTableCell14"; this.xrTableCell14.StylePriority.UseTextAlignment = false; this.xrTableCell14.Text = "xrTableCell14"; this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell14.Weight = 0.35450517012236349D; + this.xrTableCell14.Weight = 0.35450544058834016D; + // + // xrTableCell37 + // + this.xrTableCell37.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.AmountNichtFehlkontakteInReportTimeSpan", "{0:0.00}")}); + this.xrTableCell37.Name = "xrTableCell37"; + this.xrTableCell37.StylePriority.UseTextAlignment = false; + this.xrTableCell37.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell37.Weight = 0.35450543784289873D; // // xrTableCell12 // @@ -245,7 +255,7 @@ namespace HausDuelken this.xrTableCell12.StylePriority.UseTextAlignment = false; this.xrTableCell12.Text = "xrTableCell12"; this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell12.Weight = 0.35450516999471204D; + this.xrTableCell12.Weight = 0.35450514608828865D; // // cellBewilligteFLSImBereich // @@ -255,27 +265,17 @@ namespace HausDuelken this.cellBewilligteFLSImBereich.StylePriority.UseTextAlignment = false; this.cellBewilligteFLSImBereich.Text = "cellBewilligteFLSImBereich"; this.cellBewilligteFLSImBereich.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.cellBewilligteFLSImBereich.Weight = 0.35450516993088632D; + this.cellBewilligteFLSImBereich.Weight = 0.35450403735467684D; // // cellGeleistetImBereich // this.cellGeleistetImBereich.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.BillableHoursInReportTimeSpan", "{0:0.00}")}); + 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.3545051698989734D; - // - // cellRateFactor - // - this.cellRateFactor.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.BillableHoursInReportTimeSpanWithFactor", "{0:0.00}")}); - this.cellRateFactor.Name = "cellRateFactor"; - this.cellRateFactor.StylePriority.UseTextAlignment = false; - this.cellRateFactor.Text = "cellRateFactor"; - this.cellRateFactor.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.cellRateFactor.Weight = 0.35450516989897335D; + this.cellGeleistetImBereich.Weight = 0.35450540655668883D; // // xrTableCell26 // @@ -284,7 +284,7 @@ namespace HausDuelken this.xrTableCell26.Name = "xrTableCell26"; this.xrTableCell26.StylePriority.UseTextAlignment = false; this.xrTableCell26.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell26.Weight = 0.39438700150929118D; + this.xrTableCell26.Weight = 0.41746506128787281D; // // lblTitel // @@ -343,10 +343,10 @@ namespace HausDuelken this.xrTableCell31, this.xrTableCell32, this.xrTableCell33, + this.xrTableCell39, this.xrTableCell34, this.xrTableCell35, this.xrTableCell36, - this.xrTableCell37, this.xrTableCell38}); this.xrTableRow4.Name = "xrTableRow4"; this.xrTableRow4.Weight = 1D; @@ -359,7 +359,7 @@ namespace HausDuelken this.xrTableCell28.Name = "xrTableCell28"; this.xrTableCell28.StylePriority.UseFont = false; this.xrTableCell28.Text = "Zwischensumme"; - this.xrTableCell28.Weight = 0.66469718772399189D; + this.xrTableCell28.Weight = 0.92226738232165273D; // // xrTableCell29 // @@ -367,7 +367,7 @@ namespace HausDuelken this.xrTableCell29.Name = "xrTableCell29"; this.xrTableCell29.StylePriority.UseTextAlignment = false; this.xrTableCell29.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell29.Weight = 0.5317577529262556D; + this.xrTableCell29.Weight = 0.38404760768514989D; // // xrTableCell30 // @@ -383,7 +383,7 @@ namespace HausDuelken xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; this.xrTableCell30.Summary = xrSummary1; this.xrTableCell30.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell30.Weight = 0.44313146794248365D; + this.xrTableCell30.Weight = 0.39881824856724274D; // // xrTableCell31 // @@ -399,7 +399,7 @@ namespace HausDuelken xrSummary2.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; this.xrTableCell31.Summary = xrSummary2; this.xrTableCell31.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell31.Weight = 0.4431314633550375D; + this.xrTableCell31.Weight = 0.39881824397979665D; // // xrTableCell32 // @@ -415,14 +415,13 @@ namespace HausDuelken xrSummary3.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; this.xrTableCell32.Summary = xrSummary3; this.xrTableCell32.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell32.Weight = 0.44313146284443172D; + this.xrTableCell32.Weight = 0.398818513935205D; // // xrTableCell33 // this.xrTableCell33.CanGrow = false; this.xrTableCell33.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.Costbearer2Supportconcept.ApprovalPeriodList.ApprovedBE" + - "Total")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.ApprovedHours")}); this.xrTableCell33.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold); this.xrTableCell33.Name = "xrTableCell33"; this.xrTableCell33.StylePriority.UseFont = false; @@ -432,7 +431,21 @@ namespace HausDuelken xrSummary4.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; this.xrTableCell33.Summary = xrSummary4; this.xrTableCell33.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell33.Weight = 0.35450517012236349D; + this.xrTableCell33.Weight = 0.35450547439662933D; + // + // xrTableCell39 + // + this.xrTableCell39.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.AmountNichtFehlkontakteInReportTimeSpan")}); + this.xrTableCell39.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold); + this.xrTableCell39.Name = "xrTableCell39"; + this.xrTableCell39.StylePriority.UseFont = false; + this.xrTableCell39.StylePriority.UseTextAlignment = false; + xrSummary5.FormatString = "{0:0.00}"; + xrSummary5.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.xrTableCell39.Summary = xrSummary5; + this.xrTableCell39.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell39.Weight = 0.35450466800440311D; // // xrTableCell34 // @@ -443,12 +456,12 @@ namespace HausDuelken this.xrTableCell34.Name = "xrTableCell34"; this.xrTableCell34.StylePriority.UseFont = false; this.xrTableCell34.StylePriority.UseTextAlignment = false; - xrSummary5.FormatString = "{0:0.00}"; - xrSummary5.IgnoreNullValues = true; - xrSummary5.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; - this.xrTableCell34.Summary = xrSummary5; + xrSummary6.FormatString = "{0:0.00}"; + xrSummary6.IgnoreNullValues = true; + xrSummary6.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.xrTableCell34.Summary = xrSummary6; this.xrTableCell34.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell34.Weight = 0.35450516999471215D; + this.xrTableCell34.Weight = 0.35450493847041725D; // // xrTableCell35 // @@ -459,44 +472,28 @@ namespace HausDuelken this.xrTableCell35.Name = "xrTableCell35"; this.xrTableCell35.StylePriority.UseFont = false; this.xrTableCell35.StylePriority.UseTextAlignment = false; - xrSummary6.FormatString = "{0:0.00}"; - xrSummary6.IgnoreNullValues = true; - xrSummary6.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; - this.xrTableCell35.Summary = xrSummary6; + 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.35450516993088632D; + 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.BillableHoursInReportTimeSpan")}); + 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; - xrSummary7.FormatString = "{0:0.00}"; - xrSummary7.IgnoreNullValues = true; - xrSummary7.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; - this.xrTableCell36.Summary = xrSummary7; - this.xrTableCell36.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell36.Weight = 0.3545051698989734D; - // - // xrTableCell37 - // - this.xrTableCell37.CanGrow = false; - this.xrTableCell37.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.BillableHoursInReportTimeSpanWithFactor")}); - this.xrTableCell37.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold); - this.xrTableCell37.Name = "xrTableCell37"; - this.xrTableCell37.StylePriority.UseFont = false; - this.xrTableCell37.StylePriority.UseTextAlignment = false; xrSummary8.FormatString = "{0:0.00}"; xrSummary8.IgnoreNullValues = true; xrSummary8.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; - this.xrTableCell37.Summary = xrSummary8; - this.xrTableCell37.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell37.Weight = 0.35450516989897335D; + this.xrTableCell36.Summary = xrSummary8; + this.xrTableCell36.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell36.Weight = 0.35450522061135104D; // // xrTableCell38 // @@ -510,13 +507,13 @@ namespace HausDuelken xrSummary9.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; this.xrTableCell38.Summary = xrSummary9; this.xrTableCell38.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell38.Weight = 0.39438754244125207D; + this.xrTableCell38.Weight = 0.41746506316091558D; // // GroupHeader2 // this.GroupHeader2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrTable1}); - this.GroupHeader2.HeightF = 50F; + this.GroupHeader2.HeightF = 89.58334F; this.GroupHeader2.Name = "GroupHeader2"; this.GroupHeader2.RepeatEveryPage = true; // @@ -531,7 +528,7 @@ namespace HausDuelken this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F); this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow1}); - this.xrTable1.SizeF = new System.Drawing.SizeF(1059F, 50F); + this.xrTable1.SizeF = new System.Drawing.SizeF(1059F, 89.58334F); this.xrTable1.StylePriority.UseBorders = false; this.xrTable1.StylePriority.UseFont = false; this.xrTable1.StylePriority.UsePadding = false; @@ -548,18 +545,18 @@ namespace HausDuelken this.xrTableCell5, this.xrTableCell13, this.xrTableCell11, + this.xrTableCell24, this.cellBewilligtImZeitraumHeader, this.cellGeleistetImZeitraumHeader, - this.cellRateFactorHeader, this.xrTableCell25}); this.xrTableRow1.Name = "xrTableRow1"; - this.xrTableRow1.Weight = 1.3953493323567705D; + this.xrTableRow1.Weight = 2.5000009581103511D; // // xrTableCell1 // this.xrTableCell1.Name = "xrTableCell1"; this.xrTableCell1.Text = "KlientIn/Hilfeplan"; - this.xrTableCell1.Weight = 0.66469718772399189D; + this.xrTableCell1.Weight = 0.92226799087018463D; // // xrTableCell2 // @@ -567,7 +564,7 @@ namespace HausDuelken this.xrTableCell2.StylePriority.UseTextAlignment = false; this.xrTableCell2.Text = "Kostenträger"; this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell2.Weight = 0.53175775292625538D; + this.xrTableCell2.Weight = 0.38404704759828112D; // // xrTableCell3 // @@ -575,7 +572,7 @@ namespace HausDuelken this.xrTableCell3.StylePriority.UseTextAlignment = false; this.xrTableCell3.Text = "Gesamt laut Bewilligung"; this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell3.Weight = 0.44313146794248376D; + this.xrTableCell3.Weight = 0.39881844567032593D; // // xrTableCell4 // @@ -583,7 +580,7 @@ namespace HausDuelken this.xrTableCell4.StylePriority.UseTextAlignment = false; this.xrTableCell4.Text = "Bereits gezahlt"; this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell4.Weight = 0.44313146335503761D; + this.xrTableCell4.Weight = 0.39881844108287973D; // // xrTableCell5 // @@ -591,48 +588,48 @@ namespace HausDuelken this.xrTableCell5.StylePriority.UseTextAlignment = false; this.xrTableCell5.Text = "Noch offen"; this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell5.Weight = 0.4431314628444315D; + this.xrTableCell5.Weight = 0.39881844057227367D; // // xrTableCell13 // this.xrTableCell13.Multiline = true; this.xrTableCell13.Name = "xrTableCell13"; this.xrTableCell13.StylePriority.UseTextAlignment = false; - this.xrTableCell13.Text = "Bewilligte FLS \r\nGesamt"; + this.xrTableCell13.Text = "Bewilligte FLS"; this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell13.Weight = 0.35450517012236349D; + this.xrTableCell13.Weight = 0.35450527154713191D; // // xrTableCell11 // this.xrTableCell11.Name = "xrTableCell11"; this.xrTableCell11.StylePriority.UseTextAlignment = false; - this.xrTableCell11.Text = "Bis dato geleistete FLS"; + this.xrTableCell11.Text = "Bewilligte ASS"; this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell11.Weight = 0.35450516999471204D; + 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 FLS"; + this.cellBewilligtImZeitraumHeader.Text = "bewilligte GesamtStd."; this.cellBewilligtImZeitraumHeader.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.cellBewilligtImZeitraumHeader.Weight = 0.35450516993088627D; + this.cellBewilligtImZeitraumHeader.Weight = 0.35450550801344416D; // // cellGeleistetImZeitraumHeader // this.cellGeleistetImZeitraumHeader.Name = "cellGeleistetImZeitraumHeader"; this.cellGeleistetImZeitraumHeader.StylePriority.UseTextAlignment = false; - this.cellGeleistetImZeitraumHeader.Text = "geleistete FLS"; + this.cellGeleistetImZeitraumHeader.Text = "abrechen-bare geleistete GesamtStd."; this.cellGeleistetImZeitraumHeader.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.cellGeleistetImZeitraumHeader.Weight = 0.35450516989897335D; - // - // cellRateFactorHeader - // - this.cellRateFactorHeader.Name = "cellRateFactorHeader"; - this.cellRateFactorHeader.StylePriority.UseTextAlignment = false; - this.cellRateFactorHeader.Text = "geleistete Std. x 1,2"; - this.cellRateFactorHeader.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.cellRateFactorHeader.Weight = 0.3545051698989734D; + this.cellGeleistetImZeitraumHeader.Weight = 0.35450550798153124D; // // xrTableCell25 // @@ -640,7 +637,7 @@ namespace HausDuelken this.xrTableCell25.StylePriority.UseTextAlignment = false; this.xrTableCell25.Text = "Betrag"; this.xrTableCell25.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell25.Weight = 0.39438754244125213D; + this.xrTableCell25.Weight = 0.41746509552711253D; // // GroupFooter2 // @@ -677,10 +674,10 @@ namespace HausDuelken this.xrTableCell18, this.xrTableCell19, this.xrTableCell20, + this.xrTableCell40, this.xrTableCell21, this.xrTableCell22, this.xrTableCell23, - this.xrTableCell24, this.xrTableCell27}); this.xrTableRow3.Name = "xrTableRow3"; this.xrTableRow3.Weight = 1D; @@ -691,7 +688,7 @@ namespace HausDuelken this.xrTableCell15.Multiline = true; this.xrTableCell15.Name = "xrTableCell15"; this.xrTableCell15.Text = "Gesamtsumme"; - this.xrTableCell15.Weight = 0.66469718772399189D; + this.xrTableCell15.Weight = 0.92226799087018463D; // // xrTableCell16 // @@ -699,7 +696,7 @@ namespace HausDuelken this.xrTableCell16.Name = "xrTableCell16"; this.xrTableCell16.StylePriority.UseTextAlignment = false; this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell16.Weight = 0.5317577529262556D; + this.xrTableCell16.Weight = 0.38404699700830158D; // // xrTableCell17 // @@ -713,7 +710,7 @@ namespace HausDuelken xrSummary10.Running = DevExpress.XtraReports.UI.SummaryRunning.Report; this.xrTableCell17.Summary = xrSummary10; this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell17.Weight = 0.44313146794248365D; + this.xrTableCell17.Weight = 0.39881824792874787D; // // xrTableCell18 // @@ -727,7 +724,7 @@ namespace HausDuelken xrSummary11.Running = DevExpress.XtraReports.UI.SummaryRunning.Report; this.xrTableCell18.Summary = xrSummary11; this.xrTableCell18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell18.Weight = 0.4431314633550375D; + this.xrTableCell18.Weight = 0.39881851380731981D; // // xrTableCell19 // @@ -741,14 +738,13 @@ namespace HausDuelken xrSummary12.Running = DevExpress.XtraReports.UI.SummaryRunning.Report; this.xrTableCell19.Summary = xrSummary12; this.xrTableCell19.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell19.Weight = 0.44313146284443172D; + this.xrTableCell19.Weight = 0.398818242830696D; // // xrTableCell20 // this.xrTableCell20.CanGrow = false; this.xrTableCell20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.Costbearer2Supportconcept.ApprovalPeriodList.ApprovedBE" + - "Total")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.ApprovedHours")}); this.xrTableCell20.Name = "xrTableCell20"; this.xrTableCell20.StylePriority.UseTextAlignment = false; xrSummary13.FormatString = "{0:0.00}"; @@ -756,7 +752,19 @@ namespace HausDuelken xrSummary13.Running = DevExpress.XtraReports.UI.SummaryRunning.Report; this.xrTableCell20.Summary = xrSummary13; this.xrTableCell20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell20.Weight = 0.35450517012236349D; + this.xrTableCell20.Weight = 0.354505508204886D; + // + // xrTableCell40 + // + this.xrTableCell40.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.AmountNichtFehlkontakteInReportTimeSpan")}); + this.xrTableCell40.Name = "xrTableCell40"; + this.xrTableCell40.StylePriority.UseTextAlignment = false; + xrSummary14.FormatString = "{0:0.00}"; + xrSummary14.Running = DevExpress.XtraReports.UI.SummaryRunning.Report; + this.xrTableCell40.Summary = xrSummary14; + this.xrTableCell40.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell40.Weight = 0.35450495792851527D; // // xrTableCell21 // @@ -765,12 +773,12 @@ namespace HausDuelken new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.BillableHours")}); this.xrTableCell21.Name = "xrTableCell21"; this.xrTableCell21.StylePriority.UseTextAlignment = false; - xrSummary14.FormatString = "{0:0.00}"; - xrSummary14.IgnoreNullValues = true; - xrSummary14.Running = DevExpress.XtraReports.UI.SummaryRunning.Report; - this.xrTableCell21.Summary = xrSummary14; + xrSummary15.FormatString = "{0:0.00}"; + xrSummary15.IgnoreNullValues = true; + xrSummary15.Running = DevExpress.XtraReports.UI.SummaryRunning.Report; + this.xrTableCell21.Summary = xrSummary15; this.xrTableCell21.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell21.Weight = 0.35450516999471215D; + this.xrTableCell21.Weight = 0.35450521149040726D; // // xrTableCell22 // @@ -779,40 +787,26 @@ namespace HausDuelken new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.ApprovedHoursInReportTimeSpan")}); this.xrTableCell22.Name = "xrTableCell22"; this.xrTableCell22.StylePriority.UseTextAlignment = false; - xrSummary15.FormatString = "{0:0.00}"; - xrSummary15.IgnoreNullValues = true; - xrSummary15.Running = DevExpress.XtraReports.UI.SummaryRunning.Report; - this.xrTableCell22.Summary = xrSummary15; + 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.35450516993088632D; + 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.BillableHoursInReportTimeSpan")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.StundenAbrechenbar")}); this.xrTableCell23.Name = "xrTableCell23"; this.xrTableCell23.StylePriority.UseTextAlignment = false; - xrSummary16.FormatString = "{0:0.00}"; - xrSummary16.IgnoreNullValues = true; - xrSummary16.Running = DevExpress.XtraReports.UI.SummaryRunning.Report; - this.xrTableCell23.Summary = xrSummary16; - this.xrTableCell23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell23.Weight = 0.3545051698989734D; - // - // xrTableCell24 - // - this.xrTableCell24.CanGrow = false; - this.xrTableCell24.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.BillableHoursInReportTimeSpanWithFactor")}); - this.xrTableCell24.Name = "xrTableCell24"; - this.xrTableCell24.StylePriority.UseTextAlignment = false; xrSummary17.FormatString = "{0:0.00}"; xrSummary17.IgnoreNullValues = true; xrSummary17.Running = DevExpress.XtraReports.UI.SummaryRunning.Report; - this.xrTableCell24.Summary = xrSummary17; - this.xrTableCell24.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell24.Weight = 0.35450516989897335D; + this.xrTableCell23.Summary = xrSummary17; + this.xrTableCell23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell23.Weight = 0.35450522061135181D; // // xrTableCell27 // @@ -824,7 +818,7 @@ namespace HausDuelken xrSummary18.Running = DevExpress.XtraReports.UI.SummaryRunning.Report; this.xrTableCell27.Summary = xrSummary18; this.xrTableCell27.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell27.Weight = 0.39438754244125207D; + this.xrTableCell27.Weight = 0.41746535314471006D; // // GroupHeader1 // @@ -849,6 +843,10 @@ namespace HausDuelken this.xrLabel1.StylePriority.UseFont = false; this.xrLabel1.Text = "xrLabel1"; // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.FinanceRO); + // // ReportHeader // this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -859,11 +857,23 @@ namespace HausDuelken // pageFooterBand1 // this.pageFooterBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel2, this.xrPageInfo2, this.xrPageInfo1}); - this.pageFooterBand1.HeightF = 48.00002F; + this.pageFooterBand1.HeightF = 49.04168F; this.pageFooterBand1.Name = "pageFooterBand1"; // + // xrLabel2 + // + this.xrLabel2.CanShrink = true; + this.xrLabel2.Font = new System.Drawing.Font("Arial", 8F); + this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(321.0417F, 25F); + this.xrLabel2.Name = "xrLabel2"; + this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel2.SizeF = new System.Drawing.SizeF(377.2916F, 23F); + this.xrLabel2.StylePriority.UseFont = false; + this.xrLabel2.Text = "Gesamtstunden = Abrechenbare Stunden = FLS + Assistenz"; + // // xrPageInfo2 // this.xrPageInfo2.Font = new System.Drawing.Font("Arial", 8F); @@ -943,9 +953,11 @@ namespace HausDuelken this.bottomMarginBand1.HeightF = 30F; this.bottomMarginBand1.Name = "bottomMarginBand1"; // - // bindingSource1 + // StundenAbrechenbar // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.FinanceRO); + this.StundenAbrechenbar.DataMember = "SupportConceptFinanceList"; + this.StundenAbrechenbar.Expression = "[StundenFehlkontakteInReportTimeSpan]+[StundenNichtFehlkontakteInReportTimeSpan]"; + this.StundenAbrechenbar.Name = "StundenAbrechenbar"; // // Finanzauswertung // @@ -956,6 +968,8 @@ namespace HausDuelken this.pageFooterBand1, this.topMarginBand1, this.bottomMarginBand1}); + this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] { + this.StundenAbrechenbar}); this.DataSource = this.bindingSource1; this.Landscape = true; this.Margins = new System.Drawing.Printing.Margins(55, 55, 50, 30); @@ -1003,24 +1017,11 @@ namespace HausDuelken private DevExpress.XtraReports.UI.XRTableCell xrTableCell8; private DevExpress.XtraReports.UI.XRTableCell xrTableCell9; private DevExpress.XtraReports.UI.XRTableCell xrTableCell10; - private DevExpress.XtraReports.UI.XRTable xrTable1; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow1; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell1; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell2; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell3; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell4; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell5; private DevExpress.XtraReports.UI.XRTableCell xrTableCell12; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell11; private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader2; private DevExpress.XtraReports.UI.XRTableCell xrTableCell14; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell13; private DevExpress.XtraReports.UI.XRTableCell cellBewilligteFLSImBereich; private DevExpress.XtraReports.UI.XRTableCell cellGeleistetImBereich; - private DevExpress.XtraReports.UI.XRTableCell cellBewilligtImZeitraumHeader; - private DevExpress.XtraReports.UI.XRTableCell cellGeleistetImZeitraumHeader; - private DevExpress.XtraReports.UI.XRTableCell cellRateFactorHeader; - private DevExpress.XtraReports.UI.XRTableCell cellRateFactor; private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter2; private DevExpress.XtraReports.UI.XRTable xrTable3; private DevExpress.XtraReports.UI.XRTableRow xrTableRow3; @@ -1033,8 +1034,6 @@ namespace HausDuelken private DevExpress.XtraReports.UI.XRTableCell xrTableCell21; private DevExpress.XtraReports.UI.XRTableCell xrTableCell22; private DevExpress.XtraReports.UI.XRTableCell xrTableCell23; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell24; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell25; private DevExpress.XtraReports.UI.XRTableCell xrTableCell26; private DevExpress.XtraReports.UI.XRTableCell xrTableCell27; private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader1; @@ -1049,8 +1048,25 @@ namespace HausDuelken private DevExpress.XtraReports.UI.XRTableCell xrTableCell34; private DevExpress.XtraReports.UI.XRTableCell xrTableCell35; private DevExpress.XtraReports.UI.XRTableCell xrTableCell36; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell37; private DevExpress.XtraReports.UI.XRTableCell xrTableCell38; private DevExpress.XtraReports.UI.XRLabel xrLabel1; + private DevExpress.XtraReports.UI.XRLabel xrLabel2; + private DevExpress.XtraReports.UI.XRTable xrTable1; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow1; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell1; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell2; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell3; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell4; + 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 xrTableCell40; } } diff --git a/ReportImp/HausDuelken/HausDuelken.csproj b/ReportImp/HausDuelken/HausDuelken.csproj index f0ffa3af5..d0e1e4293 100644 --- a/ReportImp/HausDuelken/HausDuelken.csproj +++ b/ReportImp/HausDuelken/HausDuelken.csproj @@ -48,6 +48,7 @@ + Component diff --git a/ReportImp/HausDuelken/Invoicing/CustomInvoiceCreation.cs b/ReportImp/HausDuelken/Invoicing/CustomInvoiceCreation.cs index 9a481da98..01a07bb08 100644 --- a/ReportImp/HausDuelken/Invoicing/CustomInvoiceCreation.cs +++ b/ReportImp/HausDuelken/Invoicing/CustomInvoiceCreation.cs @@ -25,12 +25,12 @@ namespace HausDuelken.Invoicing } public override IList CreateSummaryInvoiceItems(IList itemList, - DateTimeSpan invoicePeriod, SupportConceptApprovalPeriod scap, Calculations calc, bool summaryPerMonth) + DateTimeSpan invoicePeriod, SupportConceptApprovalPeriod scap, BS.Shared.Services.Calculations calc, bool summaryPerMonth) { return CreateSummaryInvoiceItems(itemList, invoicePeriod, scap, calc, true); } - public override InvoiceItem CreateInvoiceItem(ServiceRecordDC iServiceRecord, SupportConceptApprovalPeriod scap, Calculations calc) + public override InvoiceItem CreateInvoiceItem(ServiceRecordDC iServiceRecord, SupportConceptApprovalPeriod scap, BS.Shared.Services.Calculations calc) { var ii = base.CreateInvoiceItem(iServiceRecord, scap, calc); @@ -73,7 +73,7 @@ namespace HausDuelken.Invoicing public override void CreateFixedAmounts(ServiceInvoicePeriod serviceInvoicePeriod, SupportConceptApprovalPeriodDC supportConceptApprovalPeriod, CostBearer2SupportConcept cb2sc) { - var calc = PluginLoader.FindClass(_SpecificID) ?? Calculations.GetInstance(_SpecificID); + var calc = PluginLoader.FindClass(_SpecificID) ?? BS.Shared.Services.Calculations.GetInstance(_SpecificID); var data = calc.GetFixedBillingData(supportConceptApprovalPeriod, serviceInvoicePeriod.Start, serviceInvoicePeriod.End); foreach (var billingData in data) { diff --git a/ReportImp/HausDuelken/Invoicing/CustomSettlementInvoiceCreation.cs b/ReportImp/HausDuelken/Invoicing/CustomSettlementInvoiceCreation.cs index 7f4eb4efe..0955b6f84 100644 --- a/ReportImp/HausDuelken/Invoicing/CustomSettlementInvoiceCreation.cs +++ b/ReportImp/HausDuelken/Invoicing/CustomSettlementInvoiceCreation.cs @@ -57,5 +57,14 @@ namespace HausDuelken item.RateFactor = null; return item; } + + public override bool IsServiceRecordBillable(ServiceRecord iRecord) + { + if (iRecord.ServiceDescription.ServiceCategory.Name.Contains("LT24")) + { + return false; + } + return true; + } } }