diff --git a/ReportImp/PZDDuesseldorf/CustomMitarbeiterstundenkontoBerechnung.cs b/ReportImp/PZDDuesseldorf/CustomMitarbeiterstundenkontoBerechnung.cs index 7e0c4f653..80503a71b 100644 --- a/ReportImp/PZDDuesseldorf/CustomMitarbeiterstundenkontoBerechnung.cs +++ b/ReportImp/PZDDuesseldorf/CustomMitarbeiterstundenkontoBerechnung.cs @@ -35,20 +35,16 @@ namespace PZDDuesseldorf if (item.ServiceDescription.ServiceCategory.IsBillable && (cat.StartsWith("fachleistung") || kurz == "fl")) { - emp.Custom1 += duration / 60; + emp.Custom1 += duration; } else if (item.ServiceDescription.ServiceCategory.IsBillable && (cat.StartsWith("assistenz") || kurz == "as")) { - emp.Custom2 += duration / 60; + emp.Custom2 += duration; } else if (item.ServiceDescription.ServiceCategory.IsBillable && (cat.StartsWith("arbeitszeit") || kurz == "az")) { - emp.Custom3 += duration / 60; + emp.Custom3 += duration; } - - emp.Custom1 = Math.Round(emp.Custom1 / totalDuration, 2); - emp.Custom2 = Math.Round(emp.Custom2 / totalDuration, 2); - emp.Custom3 = Math.Round(emp.Custom3 / totalDuration, 2); } } diff --git a/ReportImp/PZDDuesseldorf/Mitarbeiterstundenkonto.cs b/ReportImp/PZDDuesseldorf/Mitarbeiterstundenkonto.cs index 179fda776..669d9da53 100644 --- a/ReportImp/PZDDuesseldorf/Mitarbeiterstundenkonto.cs +++ b/ReportImp/PZDDuesseldorf/Mitarbeiterstundenkonto.cs @@ -20,8 +20,17 @@ namespace PZDDuesseldorf var msb = new CustomMitarbeiterstundenkontoBerechnung(); msb.CreateReport(pRO); + foreach (var ed in pRO.EmployeeDetailList) + { + if (ed.StundenGesamtIst > 0) + { + ed.Custom1 = Math.Round(ed.Custom1 / 60 / ed.StundenGesamtIst, 4); + ed.Custom2 = Math.Round(ed.Custom2 / 60 / ed.StundenGesamtIst, 4); + ed.Custom3 = Math.Round(ed.Custom3 / 60 / ed.StundenGesamtIst, 4); + } + } + this.bindingSource1.DataSource = pRO; } - } } diff --git a/ReportImp/PZDDuesseldorf/Mitarbeiterstundenkonto.designer.cs b/ReportImp/PZDDuesseldorf/Mitarbeiterstundenkonto.designer.cs index 8f38b3a0c..6a79c86e7 100644 --- a/ReportImp/PZDDuesseldorf/Mitarbeiterstundenkonto.designer.cs +++ b/ReportImp/PZDDuesseldorf/Mitarbeiterstundenkonto.designer.cs @@ -43,6 +43,8 @@ namespace PZDDuesseldorf this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -58,7 +60,9 @@ namespace PZDDuesseldorf this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -77,6 +81,8 @@ namespace PZDDuesseldorf this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell51 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); this.lblMonat = new DevExpress.XtraReports.UI.XRLabel(); @@ -90,12 +96,6 @@ namespace PZDDuesseldorf this.fieldFLS = new DevExpress.XtraReports.UI.CalculatedField(); this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); - this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell(); ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); @@ -226,9 +226,25 @@ namespace PZDDuesseldorf // // xrTableCell21 // + this.xrTableCell21.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom1", "{0:0.00%}")}); this.xrTableCell21.Name = "xrTableCell21"; this.xrTableCell21.Weight = 0.063119927862939629D; // + // xrTableCell6 + // + this.xrTableCell6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom2", "{0:0.00%}")}); + this.xrTableCell6.Name = "xrTableCell6"; + this.xrTableCell6.Weight = 0.063119927862939587D; + // + // xrTableCell17 + // + this.xrTableCell17.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom3", "{0:0.00%}")}); + this.xrTableCell17.Name = "xrTableCell17"; + this.xrTableCell17.Weight = 0.063119927862939587D; + // // xrTableCell25 // this.xrTableCell25.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { @@ -372,6 +388,13 @@ namespace PZDDuesseldorf this.xrTableCell11.Text = "Gesamt-\r\nstunden lfd. Monat"; this.xrTableCell11.Weight = 0.063119927721024011D; // + // xrTableCell1 + // + this.xrTableCell1.KeepTogether = true; + this.xrTableCell1.Name = "xrTableCell1"; + this.xrTableCell1.Text = "Anteil FLS an Gesamt-stunden"; + this.xrTableCell1.Weight = 0.063119928687401475D; + // // xrTableCell12 // this.xrTableCell12.KeepTogether = true; @@ -379,6 +402,12 @@ namespace PZDDuesseldorf this.xrTableCell12.Text = "Anteil Assistenz an Gesamt-stunden"; this.xrTableCell12.Weight = 0.063119928687401489D; // + // xrTableCell18 + // + this.xrTableCell18.Name = "xrTableCell18"; + this.xrTableCell18.Text = "Anteil Arbeitszeit an Gesamt-stunden"; + this.xrTableCell18.Weight = 0.063119928687401489D; + // // xrTableCell13 // this.xrTableCell13.KeepTogether = true; @@ -526,6 +555,16 @@ namespace PZDDuesseldorf this.xrTableCell51.Name = "xrTableCell51"; this.xrTableCell51.Weight = 0.063119927862939559D; // + // xrTableCell29 + // + this.xrTableCell29.Name = "xrTableCell29"; + this.xrTableCell29.Weight = 0.063119927862939559D; + // + // xrTableCell30 + // + this.xrTableCell30.Name = "xrTableCell30"; + this.xrTableCell30.Weight = 0.063119927862939559D; + // // bindingSource1 // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO); @@ -635,39 +674,6 @@ namespace PZDDuesseldorf this.bottomMarginBand1.HeightF = 31.99997F; this.bottomMarginBand1.Name = "bottomMarginBand1"; // - // xrTableCell1 - // - this.xrTableCell1.KeepTogether = true; - this.xrTableCell1.Name = "xrTableCell1"; - this.xrTableCell1.Text = "Anteil FLS an Gesamt-stunden"; - this.xrTableCell1.Weight = 0.063119928687401475D; - // - // xrTableCell6 - // - this.xrTableCell6.Name = "xrTableCell6"; - this.xrTableCell6.Weight = 0.063119927862939587D; - // - // xrTableCell17 - // - this.xrTableCell17.Name = "xrTableCell17"; - this.xrTableCell17.Weight = 0.063119927862939587D; - // - // xrTableCell18 - // - this.xrTableCell18.Name = "xrTableCell18"; - this.xrTableCell18.Text = "Anteil Arbeitszeit an Gesamt-stunden"; - this.xrTableCell18.Weight = 0.063119928687401489D; - // - // xrTableCell29 - // - this.xrTableCell29.Name = "xrTableCell29"; - this.xrTableCell29.Weight = 0.063119927862939559D; - // - // xrTableCell30 - // - this.xrTableCell30.Name = "xrTableCell30"; - this.xrTableCell30.Weight = 0.063119927862939559D; - // // Mitarbeiterstundenkonto // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {