From ff990faa1a9a42cf0e311a84f7a014633d5c1015 Mon Sep 17 00:00:00 2001 From: Alexandra Date: Tue, 11 Jul 2023 16:29:41 +0200 Subject: [PATCH] SKMKrefeld/Mitarbeiterstundenkonto - NUR FLS --- ...CustomMitarbeiterstundenkontoBerechnung.cs | 4 +- .../SKMKrefeld/Mitarbeiterstundenkonto.cs | 8 +- .../Mitarbeiterstundenkonto.designer.cs | 163 +---------------- .../SKMKrefeld/MitarbeiterstundenkontoJahr.cs | 8 +- .../MitarbeiterstundenkontoJahr.designer.cs | 172 +----------------- 5 files changed, 26 insertions(+), 329 deletions(-) diff --git a/ReportImp/SKMKrefeld/CustomMitarbeiterstundenkontoBerechnung.cs b/ReportImp/SKMKrefeld/CustomMitarbeiterstundenkontoBerechnung.cs index 01008057e..0fedd051e 100644 --- a/ReportImp/SKMKrefeld/CustomMitarbeiterstundenkontoBerechnung.cs +++ b/ReportImp/SKMKrefeld/CustomMitarbeiterstundenkontoBerechnung.cs @@ -71,8 +71,8 @@ namespace SkmKrefeld if (item.ServiceDescription.Name.Contains("Fehlkontakt")) { - durationNA = duration * 0.2m; - duration *= 0.8m; + durationNA = duration; + //duration *= 0.8m; } diff --git a/ReportImp/SKMKrefeld/Mitarbeiterstundenkonto.cs b/ReportImp/SKMKrefeld/Mitarbeiterstundenkonto.cs index 5cb4fa36a..d826c449b 100644 --- a/ReportImp/SKMKrefeld/Mitarbeiterstundenkonto.cs +++ b/ReportImp/SKMKrefeld/Mitarbeiterstundenkonto.cs @@ -41,15 +41,15 @@ namespace SkmKrefeld if (sr.ServiceDescription.ProzentStundenkonto < 100) { prozent = sr.ServiceDescription.ProzentStundenkonto.Value; - ausfall = Convert.ToDecimal(sr.DurationMinutes / 60); - ausfall *= prozent / 100; + ausfall = Convert.ToDecimal(sr.RoundedDuration / 60); + //ausfall *= prozent / 100; ausfallstunden += ausfall; summeAusfallstunden += ausfall; } else { - ausfallstunden += Convert.ToDecimal(sr.DurationMinutes / 60); - summeAusfallstunden += Convert.ToDecimal(sr.DurationMinutes / 60); + ausfallstunden += Convert.ToDecimal(sr.RoundedDuration / 60); + summeAusfallstunden += Convert.ToDecimal(sr.RoundedDuration / 60); } } } diff --git a/ReportImp/SKMKrefeld/Mitarbeiterstundenkonto.designer.cs b/ReportImp/SKMKrefeld/Mitarbeiterstundenkonto.designer.cs index 88d995b2e..1275a39ed 100644 --- a/ReportImp/SKMKrefeld/Mitarbeiterstundenkonto.designer.cs +++ b/ReportImp/SKMKrefeld/Mitarbeiterstundenkonto.designer.cs @@ -41,12 +41,7 @@ namespace SkmKrefeld this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell(); 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.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell(); this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); this.xrTableHeader = new DevExpress.XtraReports.UI.XRTable(); @@ -58,12 +53,7 @@ namespace SkmKrefeld this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell1 = 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(); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); @@ -74,12 +64,7 @@ namespace SkmKrefeld this.cellFLSSollGesamt = new DevExpress.XtraReports.UI.XRTableCell(); this.cellFLSIstGesamt = new DevExpress.XtraReports.UI.XRTableCell(); this.cellFLSPlusMinusGesamt = new DevExpress.XtraReports.UI.XRTableCell(); - this.cellGesamtGesamt = new DevExpress.XtraReports.UI.XRTableCell(); - this.cellRelationGesamt = new DevExpress.XtraReports.UI.XRTableCell(); this.cellAusfallGesamt = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell51 = 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(); @@ -125,7 +110,7 @@ namespace SkmKrefeld 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(1030F, 25F); + this.xrTableDetail.SizeF = new System.Drawing.SizeF(700F, 25F); this.xrTableDetail.StylePriority.UseBorders = false; this.xrTableDetail.StylePriority.UseFont = false; this.xrTableDetail.StylePriority.UsePadding = false; @@ -142,12 +127,7 @@ namespace SkmKrefeld this.xrTableCell16, this.xrTableCell27, this.xrTableCell22, - this.xrTableCell23, - this.xrTableCell21, - this.xrTableCell6, - this.xrTableCell25, - this.xrTableCell24, - this.xrTableCell26}); + this.xrTableCell6}); this.xrTableRowDetail.Name = "xrTableRowDetail"; this.xrTableRowDetail.Weight = 1D; // @@ -212,22 +192,6 @@ namespace SkmKrefeld this.xrTableCell22.Text = "xrTableCell22"; this.xrTableCell22.Weight = 0.058611361587015326D; // - // xrTableCell23 - // - this.xrTableCell23.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.StundenGesamtIst", "{0:0.00}")}); - this.xrTableCell23.Name = "xrTableCell23"; - this.xrTableCell23.Text = "xrTableCell23"; - this.xrTableCell23.Weight = 0.058611361587015305D; - // - // xrTableCell21 - // - this.xrTableCell21.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.RelationFlsZuMittelbar", "{0:0.00}")}); - this.xrTableCell21.Name = "xrTableCell21"; - this.xrTableCell21.Text = "xrTableCell21"; - this.xrTableCell21.Weight = 0.0631199278629396D; - // // xrTableCell6 // this.xrTableCell6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { @@ -236,30 +200,6 @@ namespace SkmKrefeld this.xrTableCell6.Text = "xrTableCell6"; this.xrTableCell6.Weight = 0.058611361587015347D; // - // xrTableCell25 - // - this.xrTableCell25.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Ueberstunden", "{0:0.00}")}); - this.xrTableCell25.Name = "xrTableCell25"; - this.xrTableCell25.Text = "xrTableCell25"; - this.xrTableCell25.Weight = 0.058611361587015333D; - // - // xrTableCell24 - // - this.xrTableCell24.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UeberstundenVormonat", "{0:0.00}")}); - this.xrTableCell24.Name = "xrTableCell24"; - this.xrTableCell24.Text = "xrTableCell24"; - this.xrTableCell24.Weight = 0.058611361587015361D; - // - // xrTableCell26 - // - this.xrTableCell26.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UeberstundenGesamt", "{0:0.00}")}); - this.xrTableCell26.Name = "xrTableCell26"; - this.xrTableCell26.Text = "xrTableCell26"; - this.xrTableCell26.Weight = 0.058611334068910594D; - // // DetailReport // this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -290,7 +230,7 @@ namespace SkmKrefeld 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(1030F, 70F); + this.xrTableHeader.SizeF = new System.Drawing.SizeF(700F, 70F); this.xrTableHeader.StylePriority.UseBorders = false; this.xrTableHeader.StylePriority.UseFont = false; this.xrTableHeader.StylePriority.UsePadding = false; @@ -307,12 +247,7 @@ namespace SkmKrefeld this.xrTableCell8, this.xrTableCell10, this.xrTableCell7, - this.xrTableCell11, - this.xrTableCell12, - this.xrTableCell1, - this.xrTableCell13, - this.xrTableCell14, - this.xrTableCell15}); + this.xrTableCell1}); this.xrTableRowHeader.Name = "xrTableRowHeader"; this.xrTableRowHeader.Weight = 2.8D; // @@ -364,45 +299,12 @@ namespace SkmKrefeld this.xrTableCell7.Text = "FLS Plus/Minus lfd. Monat"; this.xrTableCell7.Weight = 0.058611361303184159D; // - // xrTableCell11 - // - this.xrTableCell11.Multiline = true; - this.xrTableCell11.Name = "xrTableCell11"; - this.xrTableCell11.StylePriority.UseBackColor = false; - this.xrTableCell11.Text = "Gesamt-\r\nstunden lfd. Monat"; - this.xrTableCell11.Weight = 0.058611361445099763D; - // - // xrTableCell12 - // - this.xrTableCell12.Name = "xrTableCell12"; - this.xrTableCell12.Text = "Relation FLS IST zu Mittelbare IST (in %)"; - this.xrTableCell12.Weight = 0.063119929511863376D; - // // xrTableCell1 // this.xrTableCell1.Name = "xrTableCell1"; - this.xrTableCell1.Text = "Anzahl der Fehl-kontakte von FLS"; + this.xrTableCell1.Text = "Dauer der Fehl-kontakte"; this.xrTableCell1.Weight = 0.058611363227973307D; // - // xrTableCell13 - // - this.xrTableCell13.Name = "xrTableCell13"; - this.xrTableCell13.Text = "Überstd. neu"; - this.xrTableCell13.Weight = 0.058611362411477186D; - // - // xrTableCell14 - // - this.xrTableCell14.Name = "xrTableCell14"; - this.xrTableCell14.StylePriority.UseBackColor = false; - this.xrTableCell14.Text = "Überstd. Vormonat"; - this.xrTableCell14.Weight = 0.05861136199924627D; - // - // xrTableCell15 - // - this.xrTableCell15.Name = "xrTableCell15"; - this.xrTableCell15.Text = "Überstd. Gesamt"; - this.xrTableCell15.Weight = 0.058611355119720057D; - // // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -420,7 +322,7 @@ namespace SkmKrefeld 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(1030F, 25F); + this.xrTable1.SizeF = new System.Drawing.SizeF(700.0001F, 25F); this.xrTable1.StylePriority.UseBorders = false; this.xrTable1.StylePriority.UseFont = false; this.xrTable1.StylePriority.UsePadding = false; @@ -437,12 +339,7 @@ namespace SkmKrefeld this.cellFLSSollGesamt, this.cellFLSIstGesamt, this.cellFLSPlusMinusGesamt, - this.cellGesamtGesamt, - this.cellRelationGesamt, - this.cellAusfallGesamt, - this.xrTableCell48, - this.xrTableCell17, - this.xrTableCell51}); + this.cellAusfallGesamt}); this.xrTableRow1.Name = "xrTableRow1"; this.xrTableRow1.Weight = 1D; // @@ -499,42 +396,11 @@ namespace SkmKrefeld this.cellFLSPlusMinusGesamt.Text = "cellFLSPlusMinusGesamt"; this.cellFLSPlusMinusGesamt.Weight = 0.058611471659434172D; // - // cellGesamtGesamt - // - this.cellGesamtGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "StundenGesamt", "{0:0.00}")}); - this.cellGesamtGesamt.Name = "cellGesamtGesamt"; - this.cellGesamtGesamt.Text = "cellGesamtGesamt"; - this.cellGesamtGesamt.Weight = 0.058611306550805896D; - // - // cellRelationGesamt - // - this.cellRelationGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "RelationFlsZuMittelbar", "{0:0.00}")}); - this.cellRelationGesamt.Name = "cellRelationGesamt"; - this.cellRelationGesamt.Text = "cellRelationGesamt"; - this.cellRelationGesamt.Weight = 0.063119872826730178D; - // // cellAusfallGesamt // this.cellAusfallGesamt.Name = "cellAusfallGesamt"; this.cellAusfallGesamt.Weight = 0.058611416623224749D; // - // xrTableCell48 - // - this.xrTableCell48.Name = "xrTableCell48"; - this.xrTableCell48.Weight = 0.058611361587015326D; - // - // xrTableCell17 - // - this.xrTableCell17.Name = "xrTableCell17"; - this.xrTableCell17.Weight = 0.058611361587015354D; - // - // xrTableCell51 - // - this.xrTableCell51.Name = "xrTableCell51"; - this.xrTableCell51.Weight = 0.058611361587015319D; - // // bindingSource1 // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO); @@ -702,8 +568,6 @@ namespace SkmKrefeld private DevExpress.XtraReports.UI.XRTableCell cellFLSSollGesamt; private DevExpress.XtraReports.UI.XRTableCell cellFLSIstGesamt; private DevExpress.XtraReports.UI.XRTableCell cellFLSPlusMinusGesamt; - private DevExpress.XtraReports.UI.XRTableCell cellGesamtGesamt; - private DevExpress.XtraReports.UI.XRTableCell cellRelationGesamt; private DevExpress.XtraReports.UI.XRTable xrTableDetail; private DevExpress.XtraReports.UI.XRTableRow xrTableRowDetail; private DevExpress.XtraReports.UI.XRTableCell xrTableCell3; @@ -713,11 +577,6 @@ namespace SkmKrefeld private DevExpress.XtraReports.UI.XRTableCell xrTableCell16; private DevExpress.XtraReports.UI.XRTableCell xrTableCell27; private DevExpress.XtraReports.UI.XRTableCell xrTableCell22; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell23; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell21; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell25; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell24; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell26; private DevExpress.XtraReports.UI.XRTable xrTableHeader; private DevExpress.XtraReports.UI.XRTableRow xrTableRowHeader; private DevExpress.XtraReports.UI.XRTableCell xrTableCell5; @@ -727,18 +586,10 @@ namespace SkmKrefeld private DevExpress.XtraReports.UI.XRTableCell xrTableCell8; private DevExpress.XtraReports.UI.XRTableCell xrTableCell10; private DevExpress.XtraReports.UI.XRTableCell xrTableCell7; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell11; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell12; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell13; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell14; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell15; private DevExpress.XtraReports.UI.XRTableCell xrTableCell37; private DevExpress.XtraReports.UI.XRTableCell xrTableCell39; private DevExpress.XtraReports.UI.XRTableCell cellAusfallGesamt; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell48; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell51; private DevExpress.XtraReports.UI.XRTableCell xrTableCell6; private DevExpress.XtraReports.UI.XRTableCell xrTableCell1; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell17; } } diff --git a/ReportImp/SKMKrefeld/MitarbeiterstundenkontoJahr.cs b/ReportImp/SKMKrefeld/MitarbeiterstundenkontoJahr.cs index 8caa49d23..26687cb98 100644 --- a/ReportImp/SKMKrefeld/MitarbeiterstundenkontoJahr.cs +++ b/ReportImp/SKMKrefeld/MitarbeiterstundenkontoJahr.cs @@ -42,15 +42,15 @@ namespace SkmKrefeld if (sr.ServiceDescription.ProzentStundenkonto < 100) { prozent = sr.ServiceDescription.ProzentStundenkonto.Value; - ausfall = Convert.ToDecimal(sr.DurationMinutes / 60); - ausfall *= prozent / 100; + ausfall = Convert.ToDecimal(sr.RoundedDuration / 60); + //ausfall *= prozent / 100; ausfallstunden += ausfall; summeAusfallstunden += ausfall; } else { - ausfallstunden += Convert.ToDecimal(sr.DurationMinutes / 60); - summeAusfallstunden += Convert.ToDecimal(sr.DurationMinutes / 60); + ausfallstunden += Convert.ToDecimal(sr.RoundedDuration / 60); + summeAusfallstunden += Convert.ToDecimal(sr.RoundedDuration / 60); } } } diff --git a/ReportImp/SKMKrefeld/MitarbeiterstundenkontoJahr.designer.cs b/ReportImp/SKMKrefeld/MitarbeiterstundenkontoJahr.designer.cs index 6ce1b24b0..f895165cc 100644 --- a/ReportImp/SKMKrefeld/MitarbeiterstundenkontoJahr.designer.cs +++ b/ReportImp/SKMKrefeld/MitarbeiterstundenkontoJahr.designer.cs @@ -34,7 +34,6 @@ namespace SkmKrefeld DevExpress.XtraReports.UI.XRSummary xrSummary2 = new DevExpress.XtraReports.UI.XRSummary(); DevExpress.XtraReports.UI.XRSummary xrSummary3 = new DevExpress.XtraReports.UI.XRSummary(); DevExpress.XtraReports.UI.XRSummary xrSummary4 = new DevExpress.XtraReports.UI.XRSummary(); - DevExpress.XtraReports.UI.XRSummary xrSummary5 = new DevExpress.XtraReports.UI.XRSummary(); this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.xrTableDetail = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRowDetail = new DevExpress.XtraReports.UI.XRTableRow(); @@ -45,12 +44,7 @@ namespace SkmKrefeld this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell1 = 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(); this.xrTableHeader = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRowHeader = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -60,12 +54,7 @@ namespace SkmKrefeld this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell6 = 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(); this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -75,12 +64,7 @@ namespace SkmKrefeld this.cellFLSSollGesamt = new DevExpress.XtraReports.UI.XRTableCell(); this.cellFLSIstGesamt = new DevExpress.XtraReports.UI.XRTableCell(); this.cellFLSPlusMinusGesamt = new DevExpress.XtraReports.UI.XRTableCell(); - this.cellGesamtGesamt = new DevExpress.XtraReports.UI.XRTableCell(); - this.cellRelationGesamt = new DevExpress.XtraReports.UI.XRTableCell(); this.cellAusfallGesamt = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell48 = 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(); this.xrPageInfo1 = new DevExpress.XtraReports.UI.XRPageInfo(); @@ -124,7 +108,7 @@ namespace SkmKrefeld 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(1020F, 25F); + this.xrTableDetail.SizeF = new System.Drawing.SizeF(690F, 25F); this.xrTableDetail.StylePriority.UseBorders = false; this.xrTableDetail.StylePriority.UseFont = false; this.xrTableDetail.StylePriority.UsePadding = false; @@ -141,12 +125,7 @@ namespace SkmKrefeld this.xrTableCell16, this.xrTableCell27, this.xrTableCell22, - this.xrTableCell23, - this.xrTableCell21, - this.xrTableCell1, - this.xrTableCell25, - this.xrTableCell24, - this.xrTableCell26}); + this.xrTableCell1}); this.xrTableRowDetail.Name = "xrTableRowDetail"; this.xrTableRowDetail.Weight = 1D; // @@ -210,22 +189,6 @@ namespace SkmKrefeld this.xrTableCell22.Text = "xrTableCell22"; this.xrTableCell22.Weight = 0.058611361587015326D; // - // xrTableCell23 - // - this.xrTableCell23.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.StundenGesamtIst", "{0:0.00}")}); - this.xrTableCell23.Name = "xrTableCell23"; - this.xrTableCell23.Text = "xrTableCell23"; - this.xrTableCell23.Weight = 0.0586113615870153D; - // - // xrTableCell21 - // - this.xrTableCell21.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.RelationFlsZuMittelbar", "{0:0.00}")}); - this.xrTableCell21.Name = "xrTableCell21"; - this.xrTableCell21.Text = "xrTableCell21"; - this.xrTableCell21.Weight = 0.063119927862939615D; - // // xrTableCell1 // this.xrTableCell1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { @@ -233,30 +196,6 @@ namespace SkmKrefeld this.xrTableCell1.Name = "xrTableCell1"; this.xrTableCell1.Weight = 0.058611361587015361D; // - // xrTableCell25 - // - this.xrTableCell25.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - 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.058611361587015333D; - // - // xrTableCell24 - // - 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.058611361587015361D; - // - // xrTableCell26 - // - this.xrTableCell26.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - 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.058611361587015312D; - // // xrTableHeader // this.xrTableHeader.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) @@ -268,7 +207,7 @@ namespace SkmKrefeld 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(1020F, 70F); + this.xrTableHeader.SizeF = new System.Drawing.SizeF(690F, 70F); this.xrTableHeader.StylePriority.UseBorders = false; this.xrTableHeader.StylePriority.UseFont = false; this.xrTableHeader.StylePriority.UsePadding = false; @@ -285,12 +224,7 @@ namespace SkmKrefeld this.xrTableCell8, this.xrTableCell10, this.xrTableCell7, - this.xrTableCell11, - this.xrTableCell12, - this.xrTableCell6, - this.xrTableCell13, - this.xrTableCell14, - this.xrTableCell15}); + this.xrTableCell6}); this.xrTableRowHeader.Name = "xrTableRowHeader"; this.xrTableRowHeader.Weight = 2.8D; // @@ -342,47 +276,12 @@ namespace SkmKrefeld this.xrTableCell7.Text = "FLS Plus/Minus lfd. Monat"; this.xrTableCell7.Weight = 0.058611361303184159D; // - // xrTableCell11 - // - this.xrTableCell11.Multiline = true; - this.xrTableCell11.Name = "xrTableCell11"; - this.xrTableCell11.StylePriority.UseBackColor = false; - this.xrTableCell11.Text = "Gesamt-\r\nstunden lfd. Monat"; - this.xrTableCell11.Weight = 0.058611361445099756D; - // - // xrTableCell12 - // - this.xrTableCell12.Name = "xrTableCell12"; - this.xrTableCell12.Text = "Relation FLS IST zu Mittelbare IST (in %)"; - this.xrTableCell12.Weight = 0.063119929511863376D; - // // xrTableCell6 // this.xrTableCell6.Name = "xrTableCell6"; - this.xrTableCell6.Text = "Anzahl der Fehl-kontakte von FLS"; + this.xrTableCell6.Text = "Dauer der Fehl-kontakte"; this.xrTableCell6.Weight = 0.058611363228269708D; // - // xrTableCell13 - // - this.xrTableCell13.Name = "xrTableCell13"; - this.xrTableCell13.Text = "Überstd. neu"; - this.xrTableCell13.Weight = 0.05861136235012189D; - // - // xrTableCell14 - // - this.xrTableCell14.Multiline = true; - this.xrTableCell14.Name = "xrTableCell14"; - this.xrTableCell14.StylePriority.UseBackColor = false; - this.xrTableCell14.Text = "Überstd.\r\ndieses Jahr"; - this.xrTableCell14.Weight = 0.058611361991576863D; - // - // xrTableCell15 - // - this.xrTableCell15.Multiline = true; - this.xrTableCell15.Name = "xrTableCell15"; - this.xrTableCell15.Text = "Überstd. Gesamt"; - this.xrTableCell15.Weight = 0.05861135511205063D; - // // xrTable1 // this.xrTable1.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); @@ -391,7 +290,7 @@ namespace SkmKrefeld 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(1020F, 25F); + this.xrTable1.SizeF = new System.Drawing.SizeF(689.9999F, 25F); this.xrTable1.StylePriority.UseBorders = false; this.xrTable1.StylePriority.UseFont = false; this.xrTable1.StylePriority.UsePadding = false; @@ -408,12 +307,7 @@ namespace SkmKrefeld this.cellFLSSollGesamt, this.cellFLSIstGesamt, this.cellFLSPlusMinusGesamt, - this.cellGesamtGesamt, - this.cellRelationGesamt, - this.cellAusfallGesamt, - this.xrTableCell47, - this.xrTableCell48, - this.xrTableCell51}); + this.cellAusfallGesamt}); this.xrTableRow1.Name = "xrTableRow1"; this.xrTableRow1.Weight = 1D; // @@ -478,43 +372,10 @@ namespace SkmKrefeld this.cellFLSPlusMinusGesamt.Summary = xrSummary4; this.cellFLSPlusMinusGesamt.Weight = 0.0586113065508059D; // - // cellGesamtGesamt - // - this.cellGesamtGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.StundenGesamtIst")}); - this.cellGesamtGesamt.Name = "cellGesamtGesamt"; - xrSummary5.FormatString = "{0:0.00}"; - xrSummary5.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; - this.cellGesamtGesamt.Summary = xrSummary5; - this.cellGesamtGesamt.Weight = 0.058611306550805889D; - // - // cellRelationGesamt - // - this.cellRelationGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.fieldRelationGesamt", "{0:0.00}")}); - this.cellRelationGesamt.Name = "cellRelationGesamt"; - this.cellRelationGesamt.Text = "cellRelationGesamt"; - this.cellRelationGesamt.Weight = 0.063119982899149024D; - // // cellAusfallGesamt // this.cellAusfallGesamt.Name = "cellAusfallGesamt"; - this.cellAusfallGesamt.Weight = 0.058611361587015347D; - // - // xrTableCell47 - // - this.xrTableCell47.Name = "xrTableCell47"; - this.xrTableCell47.Weight = 0.058611361587015333D; - // - // xrTableCell48 - // - this.xrTableCell48.Name = "xrTableCell48"; - this.xrTableCell48.Weight = 0.058611416623224742D; - // - // xrTableCell51 - // - this.xrTableCell51.Name = "xrTableCell51"; - this.xrTableCell51.Weight = 0.058611251514596466D; + this.cellAusfallGesamt.Weight = 0.058611251514596466D; // // pageFooterBand1 // @@ -742,22 +603,12 @@ namespace SkmKrefeld private DevExpress.XtraReports.UI.XRTableCell xrTableCell8; private DevExpress.XtraReports.UI.XRTableCell xrTableCell10; private DevExpress.XtraReports.UI.XRTableCell xrTableCell7; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell11; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell12; private DevExpress.XtraReports.UI.XRTableCell xrTableCell19; private DevExpress.XtraReports.UI.XRTableCell xrTableCell20; private DevExpress.XtraReports.UI.XRTableCell xrTableCell28; private DevExpress.XtraReports.UI.XRTableCell xrTableCell16; private DevExpress.XtraReports.UI.XRTableCell xrTableCell27; private DevExpress.XtraReports.UI.XRTableCell xrTableCell22; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell23; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell21; - 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; private DevExpress.XtraReports.UI.XRTableCell xrTableCell35; @@ -767,11 +618,7 @@ namespace SkmKrefeld private DevExpress.XtraReports.UI.XRTableCell cellFLSSollGesamt; private DevExpress.XtraReports.UI.XRTableCell cellFLSIstGesamt; private DevExpress.XtraReports.UI.XRTableCell cellFLSPlusMinusGesamt; - private DevExpress.XtraReports.UI.XRTableCell cellGesamtGesamt; - private DevExpress.XtraReports.UI.XRTableCell cellRelationGesamt; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell47; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell48; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell51; + private DevExpress.XtraReports.UI.XRTableCell cellAusfallGesamt; private DevExpress.XtraReports.UI.DetailReportBand DetailReport1; private DevExpress.XtraReports.UI.DetailBand Detail2; private DevExpress.XtraReports.UI.DetailReportBand DetailReport2; @@ -783,6 +630,5 @@ namespace SkmKrefeld private DevExpress.XtraReports.UI.CalculatedField fieldRelationGesamt; private DevExpress.XtraReports.UI.XRTableCell xrTableCell1; private DevExpress.XtraReports.UI.XRTableCell xrTableCell6; - private DevExpress.XtraReports.UI.XRTableCell cellAusfallGesamt; } }