diff --git a/ReportImp/BeWoPyramide/BeWoPyramide.csproj b/ReportImp/BeWoPyramide/BeWoPyramide.csproj index f6ecb3cd4..b3ca5908e 100644 --- a/ReportImp/BeWoPyramide/BeWoPyramide.csproj +++ b/ReportImp/BeWoPyramide/BeWoPyramide.csproj @@ -31,6 +31,7 @@ 4 + @@ -39,6 +40,7 @@ + diff --git a/ReportImp/BeWoPyramide/Mitarbeiterstundenkonto.designer.cs b/ReportImp/BeWoPyramide/Mitarbeiterstundenkonto.designer.cs index e762f0075..2ae26d4ff 100644 --- a/ReportImp/BeWoPyramide/Mitarbeiterstundenkonto.designer.cs +++ b/ReportImp/BeWoPyramide/Mitarbeiterstundenkonto.designer.cs @@ -42,6 +42,7 @@ namespace BeWoPyramide this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -58,6 +59,7 @@ namespace BeWoPyramide this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -73,6 +75,7 @@ namespace BeWoPyramide this.cellSollGesamt = new DevExpress.XtraReports.UI.XRTableCell(); this.cellFLSIstGesamt = new DevExpress.XtraReports.UI.XRTableCell(); this.cellFLSPlusMinusGesamt = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell(); this.cellGesamtGesamt = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -90,9 +93,6 @@ namespace BeWoPyramide this.fieldFLS = new DevExpress.XtraReports.UI.CalculatedField(); this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); - this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit(); @@ -178,7 +178,7 @@ namespace BeWoPyramide // xrTableCell20 // this.xrTableCell20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom1", "{0:0.00}")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.TageUrlaub", "{0:0.00}")}); this.xrTableCell20.Name = "xrTableCell20"; this.xrTableCell20.Text = "xrTableCell20"; this.xrTableCell20.Weight = 0.073474920097250415D; @@ -186,7 +186,7 @@ namespace BeWoPyramide // xrTableCell6 // this.xrTableCell6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom2")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.TageKrankheit")}); this.xrTableCell6.Multiline = true; this.xrTableCell6.Name = "xrTableCell6"; this.xrTableCell6.TextFormatString = "{0:0.00}"; @@ -198,23 +198,32 @@ namespace BeWoPyramide new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.StundenSollOhneUrlaubKrankheit", "{0:0.00}")}); this.xrTableCell28.Name = "xrTableCell28"; this.xrTableCell28.Text = "xrTableCell28"; - this.xrTableCell28.Weight = 0.10922457470630435D; + this.xrTableCell28.Weight = 0.099048935486823156D; // // xrTableCell27 // this.xrTableCell27.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FlsIst", "{0:0.00}")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FlsSoll", "{0:0.00}")}); this.xrTableCell27.Name = "xrTableCell27"; this.xrTableCell27.Text = "xrTableCell27"; - this.xrTableCell27.Weight = 0.081160008068460673D; + this.xrTableCell27.Weight = 0.091335647287941871D; // // xrTableCell22 // this.xrTableCell22.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FlsDiff", "{0:0.00}")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FlsIst", "{0:0.00}")}); this.xrTableCell22.Name = "xrTableCell22"; this.xrTableCell22.Text = "xrTableCell22"; - this.xrTableCell22.Weight = 0.080932067830889687D; + this.xrTableCell22.Weight = 0.092125101792834174D; + // + // xrTableCell16 + // + this.xrTableCell16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.MittelbarIst")}); + this.xrTableCell16.Multiline = true; + this.xrTableCell16.Name = "xrTableCell16"; + this.xrTableCell16.TextFormatString = "{0:0.00}"; + this.xrTableCell16.Weight = 0.073809060009242866D; // // xrTableCell23 // @@ -327,7 +336,7 @@ namespace BeWoPyramide // this.xrTableCell4.Multiline = true; this.xrTableCell4.Name = "xrTableCell4"; - this.xrTableCell4.Text = "Reguläre SOLL Stunden lt. Arbeitsvertrag"; + this.xrTableCell4.Text = "Reguläre SOLL Gesamstunden \r\n(FLS + Admin)"; this.xrTableCell4.Weight = 0.0841890706295664D; // // xrTableCell2 @@ -348,36 +357,43 @@ namespace BeWoPyramide // this.xrTableCell9.Multiline = true; this.xrTableCell9.Name = "xrTableCell9"; - this.xrTableCell9.Text = "Tatsächliche SOLL Stunden lt.\r\nArbeitsvertrag"; - this.xrTableCell9.Weight = 0.10922453132027059D; + this.xrTableCell9.Text = "Tatsächlich \r\nzu erbringende Gesamtstunden\r\n(FLS + Admin)"; + this.xrTableCell9.Weight = 0.09904893045718266D; // // xrTableCell10 // this.xrTableCell10.Multiline = true; this.xrTableCell10.Name = "xrTableCell10"; this.xrTableCell10.StylePriority.UseBackColor = false; - this.xrTableCell10.Text = "Geleistete abrechenbare\r\nStunden "; - this.xrTableCell10.Weight = 0.081160175222247735D; + this.xrTableCell10.Text = "Tatsächlich zu erbringende \r\nFachleistungs-Stunden"; + this.xrTableCell10.Weight = 0.091335776085335663D; // // xrTableCell7 // this.xrTableCell7.Multiline = true; this.xrTableCell7.Name = "xrTableCell7"; - this.xrTableCell7.Text = "Abrechenbare\r\nStunden Plus/Minus lfd. Monat"; - this.xrTableCell7.Weight = 0.080931882814507083D; + this.xrTableCell7.Text = "Erbrachte\r\nFachleistungs-Stunden"; + this.xrTableCell7.Weight = 0.092125034820495874D; + // + // xrTableCell8 + // + this.xrTableCell8.Multiline = true; + this.xrTableCell8.Name = "xrTableCell8"; + this.xrTableCell8.Text = "Erbrachte\r\nAdmin-\r\nStunden"; + this.xrTableCell8.Weight = 0.073808995002841285D; // // xrTableCell11 // this.xrTableCell11.Multiline = true; this.xrTableCell11.Name = "xrTableCell11"; this.xrTableCell11.StylePriority.UseBackColor = false; - this.xrTableCell11.Text = "Gesamt-\r\nstunden lfd. Monat"; + this.xrTableCell11.Text = "Erbrachte Gesamt-stunden lfd. Monat\r\n(FLS + Admin)"; this.xrTableCell11.Weight = 0.082037701978632416D; // // xrTableCell13 // this.xrTableCell13.Name = "xrTableCell13"; - this.xrTableCell13.Text = "Überstd. neu"; + this.xrTableCell13.Text = "Überstd. neu lfd. Monat"; this.xrTableCell13.Weight = 0.069681727563423543D; // // xrTableCell14 @@ -478,23 +494,32 @@ namespace BeWoPyramide new DevExpress.XtraReports.UI.XRBinding("Text", null, "SollGesamt", "{0:0.00}")}); this.cellSollGesamt.Name = "cellSollGesamt"; this.cellSollGesamt.Text = "cellSollGesamt"; - this.cellSollGesamt.Weight = 0.10912441190254743D; + this.cellSollGesamt.Weight = 0.098958197541459375D; // // cellFLSIstGesamt // this.cellFLSIstGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "FlsIstGesamt", "{0:0.00}")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "FlsSollGesamt", "{0:0.00}")}); this.cellFLSIstGesamt.Name = "cellFLSIstGesamt"; this.cellFLSIstGesamt.Text = "cellFLSIstGesamt"; - this.cellFLSIstGesamt.Weight = 0.081085664785240763D; + this.cellFLSIstGesamt.Weight = 0.091251879146328818D; // // cellFLSPlusMinusGesamt // this.cellFLSPlusMinusGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "FlsDiffGesamt", "{0:0.00}")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "FlsIstGesamt", "{0:0.00}")}); this.cellFLSPlusMinusGesamt.Name = "cellFLSPlusMinusGesamt"; this.cellFLSPlusMinusGesamt.Text = "cellFLSPlusMinusGesamt"; - this.cellFLSPlusMinusGesamt.Weight = 0.080857758900604121D; + this.cellFLSPlusMinusGesamt.Weight = 0.092040532151328028D; + // + // xrTableCell31 + // + this.xrTableCell31.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "MittelbarIst")}); + this.xrTableCell31.Multiline = true; + this.xrTableCell31.Name = "xrTableCell31"; + this.xrTableCell31.TextFormatString = "{0:0.00}"; + this.xrTableCell31.Weight = 0.073741519048771034D; // // cellGesamtGesamt // @@ -630,31 +655,6 @@ namespace BeWoPyramide this.bottomMarginBand1.HeightF = 30F; this.bottomMarginBand1.Name = "bottomMarginBand1"; // - // xrTableCell8 - // - this.xrTableCell8.Multiline = true; - this.xrTableCell8.Name = "xrTableCell8"; - this.xrTableCell8.Text = "Erbrachte\r\nAdmin-\r\nStunden"; - this.xrTableCell8.Weight = 0.085002147008830076D; - // - // xrTableCell16 - // - this.xrTableCell16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.MittelbarIst")}); - this.xrTableCell16.Multiline = true; - this.xrTableCell16.Name = "xrTableCell16"; - this.xrTableCell16.TextFormatString = "{0:0.00}"; - this.xrTableCell16.Weight = 0.08500209397118734D; - // - // xrTableCell31 - // - this.xrTableCell31.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "MittelbarIst")}); - this.xrTableCell31.Multiline = true; - this.xrTableCell31.Name = "xrTableCell31"; - this.xrTableCell31.TextFormatString = "{0:0.00}"; - this.xrTableCell31.Weight = 0.084924292299494941D; - // // bindingSource1 // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO); diff --git a/ReportImp/BeWoPyramide/MitarbeiterstundenkontoJahr.designer.cs b/ReportImp/BeWoPyramide/MitarbeiterstundenkontoJahr.designer.cs index bae6223de..56243ebb1 100644 --- a/ReportImp/BeWoPyramide/MitarbeiterstundenkontoJahr.designer.cs +++ b/ReportImp/BeWoPyramide/MitarbeiterstundenkontoJahr.designer.cs @@ -29,11 +29,12 @@ namespace BeWo.Report.DefaultReports /// private void InitializeComponent() { + this.components = new System.ComponentModel.Container(); DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary(); DevExpress.XtraReports.UI.XRSummary xrSummary2 = new DevExpress.XtraReports.UI.XRSummary(); DevExpress.XtraReports.UI.XRSummary xrSummary3 = new DevExpress.XtraReports.UI.XRSummary(); - DevExpress.XtraReports.UI.XRSummary xrSummary5 = 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.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark(); this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.xrTableDetail = new DevExpress.XtraReports.UI.XRTable(); @@ -46,8 +47,9 @@ namespace BeWo.Report.DefaultReports this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableHeader = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRowHeader = new DevExpress.XtraReports.UI.XRTableRow(); @@ -59,8 +61,9 @@ namespace BeWo.Report.DefaultReports this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); @@ -70,9 +73,10 @@ namespace BeWo.Report.DefaultReports this.cellSollGesamt = new DevExpress.XtraReports.UI.XRTableCell(); this.cellFLSIstGesamt = new DevExpress.XtraReports.UI.XRTableCell(); this.cellFLSPlusMinusGesamt = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell(); this.cellGesamtGesamt = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell51 = new DevExpress.XtraReports.UI.XRTableCell(); this.pageFooterBand1 = new DevExpress.XtraReports.UI.PageFooterBand(); this.xrPageInfo2 = new DevExpress.XtraReports.UI.XRPageInfo(); @@ -93,13 +97,7 @@ namespace BeWo.Report.DefaultReports this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.GroupFooter2 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.fieldRelationGesamt = new DevExpress.XtraReports.UI.CalculatedField(); - this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(); + 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(); @@ -124,7 +122,7 @@ namespace BeWo.Report.DefaultReports this.xrTableDetail.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrTableDetail.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRowDetail}); - this.xrTableDetail.SizeF = new System.Drawing.SizeF(1103F, 25F); + this.xrTableDetail.SizeF = new System.Drawing.SizeF(1041.541F, 25F); this.xrTableDetail.StylePriority.UseBorders = false; this.xrTableDetail.StylePriority.UseFont = false; this.xrTableDetail.StylePriority.UsePadding = false; @@ -144,7 +142,6 @@ namespace BeWo.Report.DefaultReports this.xrTableCell23, this.xrTableCell12, this.xrTableCell25, - this.xrTableCell24, this.xrTableCell18, this.xrTableCell26}); this.xrTableRowDetail.Name = "xrTableRowDetail"; @@ -173,7 +170,7 @@ namespace BeWo.Report.DefaultReports // xrTableCell20 // this.xrTableCell20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.Custom1")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.TageUrlaub")}); this.xrTableCell20.Name = "xrTableCell20"; this.xrTableCell20.Text = "xrTableCell20"; this.xrTableCell20.TextFormatString = "{0:0.00}"; @@ -182,7 +179,7 @@ namespace BeWo.Report.DefaultReports // xrTableCell6 // this.xrTableCell6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.Custom2")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.TageKrankheit")}); this.xrTableCell6.Multiline = true; this.xrTableCell6.Name = "xrTableCell6"; this.xrTableCell6.TextFormatString = "{0:0.00}"; @@ -199,7 +196,7 @@ namespace BeWo.Report.DefaultReports // xrTableCell27 // this.xrTableCell27.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.FlsIst", "{0:0.00}")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.FlsSoll", "{0:0.00}")}); this.xrTableCell27.Name = "xrTableCell27"; this.xrTableCell27.Text = "xrTableCell27"; this.xrTableCell27.Weight = 0.080195772315728026D; @@ -207,10 +204,10 @@ namespace BeWo.Report.DefaultReports // xrTableCell22 // this.xrTableCell22.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.FlsDiff", "{0:0.00}")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.FlsIst", "{0:0.00}")}); this.xrTableCell22.Name = "xrTableCell22"; this.xrTableCell22.Text = "xrTableCell22"; - this.xrTableCell22.Weight = 0.073917419475203444D; + this.xrTableCell22.Weight = 0.083429934432064451D; // // xrTableCell23 // @@ -218,7 +215,15 @@ namespace BeWo.Report.DefaultReports new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.StundenMittelbarIst", "{0:0.00}")}); this.xrTableCell23.Name = "xrTableCell23"; this.xrTableCell23.Text = "xrTableCell23"; - this.xrTableCell23.Weight = 0.076160632803850548D; + this.xrTableCell23.Weight = 0.066648117846989541D; + // + // xrTableCell12 + // + this.xrTableCell12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.StundenGesamtIst")}); + this.xrTableCell12.Name = "xrTableCell12"; + this.xrTableCell12.TextFormatString = "{0:0.00}"; + this.xrTableCell12.Weight = 0.077392503034074411D; // // xrTableCell25 // @@ -226,15 +231,16 @@ namespace BeWo.Report.DefaultReports new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.Ueberstunden", "{0:0.00}")}); this.xrTableCell25.Name = "xrTableCell25"; this.xrTableCell25.Text = "xrTableCell25"; - this.xrTableCell25.Weight = 0.0850922328825746D; + this.xrTableCell25.Weight = 0.0831994527768745D; // - // xrTableCell24 + // xrTableCell18 // - this.xrTableCell24.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.LaufendeGesamtsumme", "{0:0.00}")}); - this.xrTableCell24.Name = "xrTableCell24"; - this.xrTableCell24.Text = "xrTableCell24"; - this.xrTableCell24.Weight = 0.066878166488619023D; + this.xrTableCell18.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.UeberstundenAusbezahlt")}); + this.xrTableCell18.Multiline = true; + this.xrTableCell18.Name = "xrTableCell18"; + this.xrTableCell18.TextFormatString = "{0:0.00}"; + this.xrTableCell18.Weight = 0.075579810863956431D; // // xrTableCell26 // @@ -242,7 +248,7 @@ namespace BeWo.Report.DefaultReports new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.UeberstundenGesamt", "{0:0.00}")}); this.xrTableCell26.Name = "xrTableCell26"; this.xrTableCell26.Text = "xrTableCell26"; - this.xrTableCell26.Weight = 0.077688179216946346D; + this.xrTableCell26.Weight = 0.080541715298604682D; // // xrTableHeader // @@ -255,7 +261,7 @@ namespace BeWo.Report.DefaultReports this.xrTableHeader.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrTableHeader.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRowHeader}); - this.xrTableHeader.SizeF = new System.Drawing.SizeF(1103F, 70F); + this.xrTableHeader.SizeF = new System.Drawing.SizeF(1041.541F, 70F); this.xrTableHeader.StylePriority.UseBorders = false; this.xrTableHeader.StylePriority.UseFont = false; this.xrTableHeader.StylePriority.UsePadding = false; @@ -275,7 +281,6 @@ namespace BeWo.Report.DefaultReports this.xrTableCell11, this.xrTableCell8, this.xrTableCell13, - this.xrTableCell14, this.xrTableCell17, this.xrTableCell15}); this.xrTableRowHeader.Name = "xrTableRowHeader"; @@ -293,8 +298,9 @@ namespace BeWo.Report.DefaultReports // // xrTableCell4 // + this.xrTableCell4.Multiline = true; this.xrTableCell4.Name = "xrTableCell4"; - this.xrTableCell4.Text = "Reguläre SOLL Stunden lt. Arbeitsvertrag"; + this.xrTableCell4.Text = "Reguläre SOLL Gesamstunden \r\n(FLS + Admin)"; this.xrTableCell4.Weight = 0.086772110582925041D; // // xrTableCell2 @@ -314,7 +320,7 @@ namespace BeWo.Report.DefaultReports // this.xrTableCell9.Multiline = true; this.xrTableCell9.Name = "xrTableCell9"; - this.xrTableCell9.Text = "Tatsächliche SOLL Stunden lt.\r\nArbeitsvertrag"; + this.xrTableCell9.Text = "Tatsächlich \r\nzu erbringende Gesamtstunden\r\n(FLS + Admin)"; this.xrTableCell9.Weight = 0.10022545399328517D; // // xrTableCell10 @@ -322,15 +328,15 @@ namespace BeWo.Report.DefaultReports this.xrTableCell10.Multiline = true; this.xrTableCell10.Name = "xrTableCell10"; this.xrTableCell10.StylePriority.UseBackColor = false; - this.xrTableCell10.Text = "Geleistete abrechenbare\r\nStunden "; + this.xrTableCell10.Text = "Tatsächlich zu erbringende \r\nFachleistungs-Stunden"; this.xrTableCell10.Weight = 0.08025517698462753D; // // xrTableCell7 // this.xrTableCell7.Multiline = true; this.xrTableCell7.Name = "xrTableCell7"; - this.xrTableCell7.Text = "Abrechenbare\r\nStunden Plus/Minus lfd. Monat"; - this.xrTableCell7.Weight = 0.073972117778875038D; + this.xrTableCell7.Text = "Erbrachte\r\nFachleistungs-Stunden"; + this.xrTableCell7.Weight = 0.083491655223042638D; // // xrTableCell11 // @@ -338,28 +344,35 @@ namespace BeWo.Report.DefaultReports this.xrTableCell11.Name = "xrTableCell11"; this.xrTableCell11.StylePriority.UseBackColor = false; this.xrTableCell11.Text = "Erbrachte\r\nAdmin-\r\nStunden"; - this.xrTableCell11.Weight = 0.07635738556555674D; + this.xrTableCell11.Weight = 0.066837848121389126D; + // + // xrTableCell8 + // + this.xrTableCell8.Multiline = true; + this.xrTableCell8.Name = "xrTableCell8"; + this.xrTableCell8.Text = "Erbrachte Gesamt-stunden lfd. Monat\r\n(FLS + Admin)"; + this.xrTableCell8.Weight = 0.077309361082474728D; // // xrTableCell13 // this.xrTableCell13.Name = "xrTableCell13"; - this.xrTableCell13.Text = "Überstd. neu"; - this.xrTableCell13.Weight = 0.085014919049127211D; + this.xrTableCell13.Text = "Überstd. neu lfd. Monat"; + this.xrTableCell13.Weight = 0.083401674983903981D; // - // xrTableCell14 + // xrTableCell17 // - this.xrTableCell14.Multiline = true; - this.xrTableCell14.Name = "xrTableCell14"; - this.xrTableCell14.StylePriority.UseBackColor = false; - this.xrTableCell14.Text = "Überstd.\r\ndieses Jahr"; - this.xrTableCell14.Weight = 0.066927707215509419D; + this.xrTableCell17.Multiline = true; + this.xrTableCell17.Name = "xrTableCell17"; + this.xrTableCell17.StylePriority.UseBackColor = false; + this.xrTableCell17.Text = "Anpassung Überstunden"; + this.xrTableCell17.Weight = 0.075495268603757243D; // // xrTableCell15 // this.xrTableCell15.Multiline = true; this.xrTableCell15.Name = "xrTableCell15"; this.xrTableCell15.Text = "Überstd. Gesamt"; - this.xrTableCell15.Weight = 0.077745572578547362D; + this.xrTableCell15.Weight = 0.08060123546448221D; // // xrTable1 // @@ -370,7 +383,7 @@ namespace BeWo.Report.DefaultReports this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow1}); - this.xrTable1.SizeF = new System.Drawing.SizeF(1103F, 25F); + this.xrTable1.SizeF = new System.Drawing.SizeF(1041.541F, 25F); this.xrTable1.StylePriority.UseBorders = false; this.xrTable1.StylePriority.UseFont = false; this.xrTable1.StylePriority.UsePadding = false; @@ -389,7 +402,6 @@ namespace BeWo.Report.DefaultReports this.xrTableCell16, this.cellGesamtGesamt, this.xrTableCell47, - this.xrTableCell48, this.xrTableCell21, this.xrTableCell51}); this.xrTableRow1.Name = "xrTableRow1"; @@ -429,7 +441,7 @@ namespace BeWo.Report.DefaultReports // cellFLSIstGesamt // this.cellFLSIstGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.FlsIst")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.FlsSoll")}); this.cellFLSIstGesamt.Name = "cellFLSIstGesamt"; xrSummary2.FormatString = "{0:0.00}"; xrSummary2.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; @@ -439,12 +451,23 @@ namespace BeWo.Report.DefaultReports // cellFLSPlusMinusGesamt // this.cellFLSPlusMinusGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.FlsDiff")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.FlsIst")}); this.cellFLSPlusMinusGesamt.Name = "cellFLSPlusMinusGesamt"; xrSummary3.FormatString = "{0:0.00}"; xrSummary3.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; this.cellFLSPlusMinusGesamt.Summary = xrSummary3; - this.cellFLSPlusMinusGesamt.Weight = 0.072987479922790824D; + this.cellFLSPlusMinusGesamt.Weight = 0.082380179511251414D; + // + // xrTableCell16 + // + this.xrTableCell16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.StundenMittelbarIst")}); + this.xrTableCell16.Multiline = true; + this.xrTableCell16.Name = "xrTableCell16"; + xrSummary4.FormatString = "{0:0.00}"; + xrSummary4.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.xrTableCell16.Summary = xrSummary4; + this.xrTableCell16.Weight = 0.065809657546345532D; // // cellGesamtGesamt // @@ -454,22 +477,23 @@ namespace BeWo.Report.DefaultReports xrSummary5.FormatString = "{0:0.00}"; xrSummary5.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; this.cellGesamtGesamt.Summary = xrSummary5; - this.cellGesamtGesamt.Weight = 0.065809431023041987D; + this.cellGesamtGesamt.Weight = 0.076418602820587059D; // // xrTableCell47 // this.xrTableCell47.Name = "xrTableCell47"; - this.xrTableCell47.Weight = 0.084160153807405186D; + this.xrTableCell47.Weight = 0.082291400234857148D; // - // xrTableCell48 + // xrTableCell21 // - this.xrTableCell48.Name = "xrTableCell48"; - this.xrTableCell48.Weight = 0.0660367855566253D; + this.xrTableCell21.Multiline = true; + this.xrTableCell21.Name = "xrTableCell21"; + this.xrTableCell21.Weight = 0.074628872879250269D; // // xrTableCell51 // this.xrTableCell51.Name = "xrTableCell51"; - this.xrTableCell51.Weight = 0.0765720087568224D; + this.xrTableCell51.Weight = 0.0793896284301426D; // // pageFooterBand1 // @@ -635,54 +659,6 @@ namespace BeWo.Report.DefaultReports this.fieldRelationGesamt.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; this.fieldRelationGesamt.Name = "fieldRelationGesamt"; // - // xrTableCell8 - // - this.xrTableCell8.Name = "xrTableCell8"; - this.xrTableCell8.Text = "Gesamt-\r\nstunden lfd. Monat"; - this.xrTableCell8.Weight = 0.066837847582387325D; - // - // xrTableCell12 - // - this.xrTableCell12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.StundenGesamtIst")}); - this.xrTableCell12.Name = "xrTableCell12"; - this.xrTableCell12.TextFormatString = "{0:0.00}"; - this.xrTableCell12.Weight = 0.066648085093909432D; - // - // xrTableCell16 - // - this.xrTableCell16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.StundenMittelbarIst")}); - this.xrTableCell16.Multiline = true; - this.xrTableCell16.Name = "xrTableCell16"; - xrSummary4.FormatString = "{0:0.00}"; - xrSummary4.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; - this.xrTableCell16.Summary = xrSummary4; - this.xrTableCell16.Weight = 0.075202357134806122D; - // - // xrTableCell17 - // - this.xrTableCell17.Multiline = true; - this.xrTableCell17.Name = "xrTableCell17"; - this.xrTableCell17.StylePriority.UseBackColor = false; - this.xrTableCell17.Text = "Anpassung Überstunden"; - this.xrTableCell17.Weight = 0.076447244659677033D; - // - // xrTableCell18 - // - this.xrTableCell18.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.UeberstundenAusbezahlt")}); - this.xrTableCell18.Multiline = true; - this.xrTableCell18.Name = "xrTableCell18"; - this.xrTableCell18.TextFormatString = "{0:0.00}"; - this.xrTableCell18.Weight = 0.076531012892622319D; - // - // xrTableCell21 - // - this.xrTableCell21.Multiline = true; - this.xrTableCell21.Name = "xrTableCell21"; - this.xrTableCell21.Weight = 0.075568175859821785D; - // // bindingSource1 // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoMonateRO); @@ -754,10 +730,8 @@ namespace BeWo.Report.DefaultReports private DevExpress.XtraReports.UI.XRTableCell xrTableCell22; private DevExpress.XtraReports.UI.XRTableCell xrTableCell23; private DevExpress.XtraReports.UI.XRTableCell xrTableCell25; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell24; private DevExpress.XtraReports.UI.XRTableCell xrTableCell26; private DevExpress.XtraReports.UI.XRTableCell xrTableCell13; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell14; private DevExpress.XtraReports.UI.XRTableCell xrTableCell15; private DevExpress.XtraReports.UI.XRTable xrTable1; private DevExpress.XtraReports.UI.XRTableRow xrTableRow1; @@ -769,7 +743,6 @@ namespace BeWo.Report.DefaultReports private DevExpress.XtraReports.UI.XRTableCell cellFLSPlusMinusGesamt; private DevExpress.XtraReports.UI.XRTableCell cellGesamtGesamt; private DevExpress.XtraReports.UI.XRTableCell xrTableCell47; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell48; private DevExpress.XtraReports.UI.XRTableCell xrTableCell51; private DevExpress.XtraReports.UI.DetailReportBand DetailReport1; private DevExpress.XtraReports.UI.DetailBand Detail2; diff --git a/ReportImp/BetreuwoWesel/Mitarbeiterarbeitszeitkonto.cs b/ReportImp/BetreuwoWesel/Mitarbeiterarbeitszeitkonto.cs index 54f258817..1b85bb003 100644 --- a/ReportImp/BetreuwoWesel/Mitarbeiterarbeitszeitkonto.cs +++ b/ReportImp/BetreuwoWesel/Mitarbeiterarbeitszeitkonto.cs @@ -43,23 +43,23 @@ namespace BetreuWoWesel { if (dayDetail.ServiceRecords != null && dayDetail.ServiceRecords.Count > 0) { - var sr = dayDetail.ServiceRecords[0]; + foreach (var sr in dayDetail.ServiceRecords) + { + // Es muss gezählt werden, wie oft die Leistung "Kommen aus frei" eingetragen wurde und am Ende mit 25 EUR multipliziert werden (Feld Regelarbeitszeit) + if (sr.ServiceDescription.Name.ToLower().Contains("kommen aus frei")) + kommenAusFrei++; - // Es muss gezählt werden, wie oft die Leistung "Kommen aus frei" eingetragen wurde und am Ende mit 25 EUR multipliziert werden (Feld Regelarbeitszeit) - if (sr.ServiceDescription.Name.ToLower().Contains("kommen aus frei")) - kommenAusFrei++; + if (sr.Customer != null) + { + dayDetail.Custom1 = String.Format("{0}, {1}", sr.Customer.Person.LastName, + sr.Customer.Person.FirstName); + } - if (sr.Customer != null) - { - dayDetail.Custom1 = String.Format("{0}, {1}", sr.Customer.Person.LastName, - sr.Customer.Person.FirstName); + if (String.IsNullOrEmpty(dayDetail.Custom2) && sr.ServiceDescription != null) + { + dayDetail.Custom2 = sr.ServiceDescription.Name; + } } - - if (String.IsNullOrEmpty(dayDetail.Custom2) && sr.ServiceDescription != null) - { - dayDetail.Custom2 = sr.ServiceDescription.Name; - } - } if (dayDetail.StartDateTime1.HasValue || dayDetail.EndDateTime1.HasValue) diff --git a/ReportImp/BetreuwoWesel/Mitarbeiterarbeitszeitkonto.designer.cs b/ReportImp/BetreuwoWesel/Mitarbeiterarbeitszeitkonto.designer.cs index 91dae3332..d15ab9101 100644 --- a/ReportImp/BetreuwoWesel/Mitarbeiterarbeitszeitkonto.designer.cs +++ b/ReportImp/BetreuwoWesel/Mitarbeiterarbeitszeitkonto.designer.cs @@ -103,6 +103,7 @@ namespace BetreuWoWesel this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.Title = new DevExpress.XtraReports.UI.XRControlStyle(); this.FieldCaption = new DevExpress.XtraReports.UI.XRControlStyle(); this.PageInfo = new DevExpress.XtraReports.UI.XRControlStyle(); @@ -126,7 +127,6 @@ namespace BetreuWoWesel this.fieldSundayHours = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldHolidayHours = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldMinutenGesamtIst = new DevExpress.XtraReports.UI.CalculatedField(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit(); @@ -240,7 +240,7 @@ namespace BetreuWoWesel new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Days.MinutesTotal", "{0:0.##}")}); this.xrTableCell20.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.xrTableCell20.Name = "xrTableCell20"; - this.xrTableCell20.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 100F); + this.xrTableCell20.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); this.xrTableCell20.StylePriority.UseFont = false; this.xrTableCell20.StylePriority.UsePadding = false; this.xrTableCell20.StylePriority.UseTextAlignment = false; @@ -366,7 +366,7 @@ namespace BetreuWoWesel // this.xrTableCell1.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); this.xrTableCell1.Name = "xrTableCell1"; - this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 100F); + this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); this.xrTableCell1.StylePriority.UseFont = false; this.xrTableCell1.StylePriority.UsePadding = false; this.xrTableCell1.StylePriority.UseTextAlignment = false; @@ -1005,6 +1005,10 @@ namespace BetreuWoWesel this.xrLabel7.Text = "Su. Feiertagszuschläge / Leistungsmonat"; this.xrLabel7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO); + // // Title // this.Title.BackColor = System.Drawing.Color.White; @@ -1171,10 +1175,6 @@ namespace BetreuWoWesel this.fieldMinutenGesamtIst.Expression = "[StundenGesamtIst] * 60\n"; this.fieldMinutenGesamtIst.Name = "fieldMinutenGesamtIst"; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO); - // // Mitarbeiterarbeitszeitkonto // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -1205,7 +1205,7 @@ namespace BetreuWoWesel this.Font = new DevExpress.Drawing.DXFont("Arial", 8F); this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] { this.ruleIstFeiertagOderWE}); - this.Margins = new DevExpress.Drawing.DXMargins(75F, 14F, 50F, 50F); + this.Margins = new DevExpress.Drawing.DXMargins(68F, 14F, 50F, 50F); this.PageHeight = 1169; this.PageWidth = 827; this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; diff --git a/ReportImp/BetreuwoWesel/Mitarbeiterstundenkonto.cs b/ReportImp/BetreuwoWesel/Mitarbeiterstundenkonto.cs index 916bd5df3..b1715a314 100644 --- a/ReportImp/BetreuwoWesel/Mitarbeiterstundenkonto.cs +++ b/ReportImp/BetreuwoWesel/Mitarbeiterstundenkonto.cs @@ -36,11 +36,13 @@ namespace BetreuWoWesel { if (dayDetail.ServiceRecords != null && dayDetail.ServiceRecords.Count > 0) { - var sr = dayDetail.ServiceRecords[0]; - - // Es muss gezählt werden, wie oft die Leistung "Kommen aus frei" eingetragen wurde und am Ende mit 25 EUR multipliziert werden (Feld Regelarbeitszeit) - if (sr.ServiceDescription.Name.ToLower().Contains("kommen aus frei")) - kommenAusFrei++; + foreach (var sr in dayDetail.ServiceRecords) + { + // Es muss gezählt werden, wie oft die Leistung "Kommen aus frei" eingetragen wurde und am Ende mit 25 EUR multipliziert werden (Feld Regelarbeitszeit) + if (sr.ServiceDescription.Name.ToLower().Contains("kommen aus frei")) + kommenAusFrei++; + } + if (dayDetail.HoursSunday > 0) ed.Custom1 += dayDetail.HoursSunday; diff --git a/ReportImp/CaritasverbandKelheim/CaritasverbandKelheim.csproj b/ReportImp/CaritasverbandKelheim/CaritasverbandKelheim.csproj index 95a6c30f4..f80f5270a 100644 --- a/ReportImp/CaritasverbandKelheim/CaritasverbandKelheim.csproj +++ b/ReportImp/CaritasverbandKelheim/CaritasverbandKelheim.csproj @@ -31,6 +31,7 @@ 4 + @@ -39,6 +40,7 @@ + diff --git a/ReportImp/CaritasverbandKelheim/CustomMitarbeiterstundenkontoBerechnung.cs b/ReportImp/CaritasverbandKelheim/CustomMitarbeiterstundenkontoBerechnung.cs index 9c6b8a61d..dedbc22cf 100644 --- a/ReportImp/CaritasverbandKelheim/CustomMitarbeiterstundenkontoBerechnung.cs +++ b/ReportImp/CaritasverbandKelheim/CustomMitarbeiterstundenkontoBerechnung.cs @@ -93,5 +93,13 @@ namespace CaritasverbandKelheim return sum; } + + public override bool IstAnrechenbareAbsenceTime(AbsenceTime item) + { + if (item.AbsenceReason.Description.ToLower().Contains("zeitausgleich")) + return false; + else + return base.IstAnrechenbareAbsenceTime(item); + } } } diff --git a/ReportImp/CaritasverbandKelheim/CustomReportCreator.cs b/ReportImp/CaritasverbandKelheim/CustomReportCreator.cs index 0005adb71..0bc1ccfe9 100644 --- a/ReportImp/CaritasverbandKelheim/CustomReportCreator.cs +++ b/ReportImp/CaritasverbandKelheim/CustomReportCreator.cs @@ -92,7 +92,7 @@ namespace CaritasverbandKelheim // Notice 4 Gruppentermin FK // Notice 5 Gruppentermin HK - if (sd.ServiceCategory.ToLower().Contains("fachkraft")) + if (sd.ServiceCategory.ToLower().Contains("fachkraft") || sd.ServiceCategory.ToLower().Contains("direkte leistung abw")) { if (!sd.IsGroup) sd.Notice2 = string.Format("{0:0.00}", sd.Minutes / 60); diff --git a/ReportImp/CaritasverbandKelheim/LeistungsnachweisAnlage4.cs b/ReportImp/CaritasverbandKelheim/LeistungsnachweisAnlage4.cs index 7af48efb3..2b9be4d87 100644 --- a/ReportImp/CaritasverbandKelheim/LeistungsnachweisAnlage4.cs +++ b/ReportImp/CaritasverbandKelheim/LeistungsnachweisAnlage4.cs @@ -21,13 +21,35 @@ namespace CaritasverbandKelheim public void SetReportDataSource(ServicesOverviewRO pRO) { - if (pRO.SupportConceptCostBearer.ApprovalPeriodList.Count > 0) + if (pRO.SupportConceptCostBearer == null) + { + if (pRO.CostBearer2SupportConceptList != null && pRO.CostBearer2SupportConceptList.Count > 0) + { + foreach (var c2s in pRO.CostBearer2SupportConceptList) + { + if (c2s.IsActive == BS.Shared.ActivationTypeId.Active) + { + foreach (var item in c2s.ApprovalPeriodList) + { + if (item.ServiceCategory != null) + { + if (item.ServiceCategory.Name.ToLower().Contains("fachkraft") || item.ServiceCategory.Name.ToLower().Contains("direkte leistung abw")) + lblApprovedFLS.Text = string.Format("{0:0.00}", item.ApprovedBEPerInterval); + else if (item.ServiceCategory.Name.ToLower().Contains("hilfskraft")) + lblApprovedASS.Text = string.Format("{0:0.00}", item.ApprovedBEPerInterval); + } + } + } + } + } + } + else if (pRO.SupportConceptCostBearer != null && pRO.SupportConceptCostBearer.ApprovalPeriodList.Count > 0) { foreach (var item in pRO.SupportConceptCostBearer.ApprovalPeriodList) { if (item.ServiceCategory != null) { - if (item.ServiceCategory.Name.ToLower().Contains("fachkraft")) + if (item.ServiceCategory.Name.ToLower().Contains("fachkraft") || item.ServiceCategory.Name.ToLower().Contains("direkte leistung abw")) lblApprovedFLS.Text = string.Format("{0:0.00}", item.ApprovedBEPerInterval); else if (item.ServiceCategory.Name.ToLower().Contains("hilfskraft")) lblApprovedASS.Text = string.Format("{0:0.00}", item.ApprovedBEPerInterval); diff --git a/ReportImp/CaritasverbandKelheim/LeistungsnachweisAnlage5.cs b/ReportImp/CaritasverbandKelheim/LeistungsnachweisAnlage5.cs index 7c9990cc0..559c8b00e 100644 --- a/ReportImp/CaritasverbandKelheim/LeistungsnachweisAnlage5.cs +++ b/ReportImp/CaritasverbandKelheim/LeistungsnachweisAnlage5.cs @@ -35,7 +35,29 @@ namespace CaritasverbandKelheim if (pRO.Services != null) { - if (pRO.SupportConceptCostBearer.ApprovalPeriodList.Count > 0) + if (pRO.SupportConceptCostBearer == null) + { + if (pRO.CostBearer2SupportConceptList != null && pRO.CostBearer2SupportConceptList.Count > 0) + { + foreach (var c2s in pRO.CostBearer2SupportConceptList) + { + if (c2s.IsActive == BS.Shared.ActivationTypeId.Active) + { + foreach (var item in c2s.ApprovalPeriodList) + { + if (item.ServiceCategory != null) + { + if (item.ServiceCategory.Name.ToLower().Contains("fachkraft") || item.ServiceCategory.Name.ToLower().Contains("direkte leistung abw")) + lblApprovedFLS.Text = string.Format("{0:0.00}", item.ApprovedBEPerInterval); + else if (item.ServiceCategory.Name.ToLower().Contains("hilfskraft")) + lblApprovedASS.Text = string.Format("{0:0.00}", item.ApprovedBEPerInterval); + } + } + } + } + } + } + else if (pRO.SupportConceptCostBearer.ApprovalPeriodList.Count > 0) { foreach (var item in pRO.SupportConceptCostBearer.ApprovalPeriodList) {