diff --git a/ReportImp/SozialeDiensteNiederrhein/Mitarbeiterstundenkonto.cs b/ReportImp/SozialeDiensteNiederrhein/Mitarbeiterstundenkonto.cs index 405390895..192c47cb4 100644 --- a/ReportImp/SozialeDiensteNiederrhein/Mitarbeiterstundenkonto.cs +++ b/ReportImp/SozialeDiensteNiederrhein/Mitarbeiterstundenkonto.cs @@ -20,8 +20,32 @@ namespace BeWo.SozialeDiensteNiederrhein { var msb = new SozialeDiensteNiederrheinMaStundenkontoBerechnung(); msb.CreateReport(pRO); - - this.bindingSource1.DataSource = pRO; + + var flsSollGesamt = 0m; + var flsIstGesamt = 0m; + pRO.RelationFlsZuMittelbar = 0; + + // Relation FLS zu Mittelbar ändern zu Relation FLS Soll zu Ist + foreach (var empDetail in pRO.EmployeeDetailList) + { + empDetail.RelationFlsZuMittelbar = 0; + + if (empDetail.FlsSoll != 0) + { + flsSollGesamt += empDetail.FlsSoll; + empDetail.RelationFlsZuMittelbar = empDetail.FlsIst / empDetail.FlsSoll * 100m; + } + if (empDetail.FlsIst != 0) + { + flsIstGesamt += empDetail.FlsIst; + } + } + + if (flsIstGesamt != 0) + pRO.RelationFlsZuMittelbar = flsIstGesamt / flsSollGesamt * 100m; + + + this.bindingSource1.DataSource = pRO; } } diff --git a/ReportImp/SozialeDiensteNiederrhein/Mitarbeiterstundenkonto.designer.cs b/ReportImp/SozialeDiensteNiederrhein/Mitarbeiterstundenkonto.designer.cs index 4be46a43a..1502a344a 100644 --- a/ReportImp/SozialeDiensteNiederrhein/Mitarbeiterstundenkonto.designer.cs +++ b/ReportImp/SozialeDiensteNiederrhein/Mitarbeiterstundenkonto.designer.cs @@ -30,7 +30,6 @@ namespace BeWo.SozialeDiensteNiederrhein private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary(); this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); this.xrTableDetail = new DevExpress.XtraReports.UI.XRTable(); @@ -42,10 +41,8 @@ namespace BeWo.SozialeDiensteNiederrhein this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell18 = 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.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell(); this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); @@ -59,10 +56,7 @@ namespace BeWo.SozialeDiensteNiederrhein this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell17 = 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.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell(); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); @@ -74,10 +68,8 @@ namespace BeWo.SozialeDiensteNiederrhein this.cellSollGesamt = new DevExpress.XtraReports.UI.XRTableCell(); this.cellFLSSollGesamt = new DevExpress.XtraReports.UI.XRTableCell(); this.cellFLSIstGesamt = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell29 = 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.cellRelationAssUndFlsGesamt = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell51 = new DevExpress.XtraReports.UI.XRTableCell(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); @@ -93,6 +85,10 @@ namespace BeWo.SozialeDiensteNiederrhein this.fieldFLS = new DevExpress.XtraReports.UI.CalculatedField(); this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); + this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell(); ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); @@ -110,7 +106,8 @@ namespace BeWo.SozialeDiensteNiederrhein // this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrTableDetail}); - this.Detail1.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.Detail1.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.Detail1.HeightF = 25F; this.Detail1.Name = "Detail1"; this.Detail1.StylePriority.UseFont = false; @@ -119,13 +116,14 @@ namespace BeWo.SozialeDiensteNiederrhein // this.xrTableDetail.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableDetail.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableDetail.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTableDetail.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrTableDetail.Name = "xrTableDetail"; 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(1129F, 25F); + this.xrTableDetail.SizeF = new System.Drawing.SizeF(1048.766F, 25F); this.xrTableDetail.StylePriority.UseBorders = false; this.xrTableDetail.StylePriority.UseFont = false; this.xrTableDetail.StylePriority.UsePadding = false; @@ -142,10 +140,9 @@ namespace BeWo.SozialeDiensteNiederrhein this.xrTableCell28, this.xrTableCell16, this.xrTableCell27, - this.xrTableCell18, this.xrTableCell22, + this.xrTableCell14, this.xrTableCell23, - this.xrTableCell21, this.xrTableCell25, this.xrTableCell26}); this.xrTableRowDetail.Name = "xrTableRowDetail"; @@ -212,14 +209,6 @@ namespace BeWo.SozialeDiensteNiederrhein this.xrTableCell27.Text = "xrTableCell27"; this.xrTableCell27.Weight = 0.063119927862939615D; // - // xrTableCell18 - // - this.xrTableCell18.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom1", "{0:0.00}")}); - this.xrTableCell18.Name = "xrTableCell18"; - this.xrTableCell18.Text = "xrTableCell18"; - this.xrTableCell18.Weight = 0.063119927862939587D; - // // xrTableCell22 // this.xrTableCell22.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { @@ -236,14 +225,6 @@ namespace BeWo.SozialeDiensteNiederrhein this.xrTableCell23.Text = "xrTableCell23"; this.xrTableCell23.Weight = 0.063119927862939559D; // - // 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.063119927862939615D; - // // xrTableCell25 // this.xrTableCell25.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { @@ -284,13 +265,13 @@ namespace BeWo.SozialeDiensteNiederrhein this.xrTableHeader.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableHeader.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold); + this.xrTableHeader.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold); this.xrTableHeader.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrTableHeader.Name = "xrTableHeader"; 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(1129F, 70F); + this.xrTableHeader.SizeF = new System.Drawing.SizeF(1048.766F, 70F); this.xrTableHeader.StylePriority.UseBorders = false; this.xrTableHeader.StylePriority.UseFont = false; this.xrTableHeader.StylePriority.UsePadding = false; @@ -307,10 +288,9 @@ namespace BeWo.SozialeDiensteNiederrhein this.xrTableCell9, this.xrTableCell8, this.xrTableCell10, - this.xrTableCell17, this.xrTableCell7, - this.xrTableCell11, this.xrTableCell12, + this.xrTableCell11, this.xrTableCell13, this.xrTableCell15}); this.xrTableRowHeader.Name = "xrTableRowHeader"; @@ -324,7 +304,7 @@ namespace BeWo.SozialeDiensteNiederrhein this.xrTableCell5.StylePriority.UseTextAlignment = false; this.xrTableCell5.Text = "Name"; this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell5.Weight = 0.13525698506097481D; + this.xrTableCell5.Weight = 0.1352569850609748D; // // xrTableCell4 // @@ -367,32 +347,12 @@ namespace BeWo.SozialeDiensteNiederrhein this.xrTableCell10.Text = "FLS IST lfd. Monat"; this.xrTableCell10.Weight = 0.063119927721024D; // - // xrTableCell17 - // - this.xrTableCell17.Name = "xrTableCell17"; - this.xrTableCell17.Text = "Ass. Std. IST lfd. Monat"; - this.xrTableCell17.Weight = 0.063119927721024011D; - // // xrTableCell7 // this.xrTableCell7.Name = "xrTableCell7"; this.xrTableCell7.Text = "FLS Plus/Minus lfd. Monat"; this.xrTableCell7.Weight = 0.063119927721024011D; // - // 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.063119927721024011D; - // - // xrTableCell12 - // - this.xrTableCell12.Name = "xrTableCell12"; - this.xrTableCell12.Text = "Relation FLS IST zu Mittelbare IST"; - this.xrTableCell12.Weight = 0.063119929511863376D; - // // xrTableCell13 // this.xrTableCell13.Name = "xrTableCell13"; @@ -409,20 +369,21 @@ namespace BeWo.SozialeDiensteNiederrhein // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrTable1}); - this.GroupFooter1.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); + this.GroupFooter1.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); this.GroupFooter1.HeightF = 48.95833F; this.GroupFooter1.Name = "GroupFooter1"; this.GroupFooter1.StylePriority.UseFont = false; // // xrTable1 // - this.xrTable1.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTable1.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrTable1.Name = "xrTable1"; 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(1129F, 25F); + this.xrTable1.SizeF = new System.Drawing.SizeF(1048.766F, 25F); this.xrTable1.StylePriority.UseBorders = false; this.xrTable1.StylePriority.UseFont = false; this.xrTable1.StylePriority.UsePadding = false; @@ -438,10 +399,9 @@ namespace BeWo.SozialeDiensteNiederrhein this.cellSollGesamt, this.cellFLSSollGesamt, this.cellFLSIstGesamt, - this.xrTableCell29, this.cellFLSPlusMinusGesamt, + this.xrTableCell17, this.cellGesamtGesamt, - this.cellRelationGesamt, this.cellRelationAssUndFlsGesamt, this.xrTableCell51}); this.xrTableRow1.Name = "xrTableRow1"; @@ -492,17 +452,6 @@ namespace BeWo.SozialeDiensteNiederrhein this.cellFLSIstGesamt.Text = "cellFLSIstGesamt"; this.cellFLSIstGesamt.Weight = 0.063760753761263875D; // - // xrTableCell29 - // - this.xrTableCell29.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom1")}); - this.xrTableCell29.Name = "xrTableCell29"; - xrSummary1.FormatString = "{0:0.00}"; - xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Report; - this.xrTableCell29.Summary = xrSummary1; - this.xrTableCell29.Text = "xrTableCell29"; - this.xrTableCell29.Weight = 0.063760750729763185D; - // // cellFLSPlusMinusGesamt // this.cellFLSPlusMinusGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { @@ -519,14 +468,6 @@ namespace BeWo.SozialeDiensteNiederrhein this.cellGesamtGesamt.Text = "cellGesamtGesamt"; this.cellGesamtGesamt.Weight = 0.063760750729763158D; // - // 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.063760750729763185D; - // // cellRelationAssUndFlsGesamt // this.cellRelationAssUndFlsGesamt.Name = "cellRelationAssUndFlsGesamt"; @@ -552,7 +493,7 @@ namespace BeWo.SozialeDiensteNiederrhein // this.lblMonat.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "ReportStartDate", "Stundenkonto {0:MMMM yy}")}); - this.lblMonat.Font = new System.Drawing.Font("Arial", 14F, System.Drawing.FontStyle.Bold); + this.lblMonat.Font = new DevExpress.Drawing.DXFont("Arial", 14F, DevExpress.Drawing.DXFontStyle.Bold); this.lblMonat.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.lblMonat.Multiline = true; this.lblMonat.Name = "lblMonat"; @@ -571,18 +512,18 @@ namespace BeWo.SozialeDiensteNiederrhein // // xrPageInfo2 // - this.xrPageInfo2.Font = new System.Drawing.Font("Arial", 8F); - this.xrPageInfo2.Format = "Seite {0} von {1}"; + this.xrPageInfo2.Font = new DevExpress.Drawing.DXFont("Arial", 8F); this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(984.9996F, 25F); this.xrPageInfo2.Name = "xrPageInfo2"; this.xrPageInfo2.SizeF = new System.Drawing.SizeF(140.0001F, 23F); this.xrPageInfo2.StyleName = "PageInfo"; this.xrPageInfo2.StylePriority.UseFont = false; this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrPageInfo2.TextFormatString = "Seite {0} von {1}"; // // xrPageInfo1 // - this.xrPageInfo1.Font = new System.Drawing.Font("Arial", 8F); + this.xrPageInfo1.Font = new DevExpress.Drawing.DXFont("Arial", 8F); this.xrPageInfo1.LocationFloat = new DevExpress.Utils.PointFloat(8F, 25F); this.xrPageInfo1.Name = "xrPageInfo1"; this.xrPageInfo1.PageInfo = DevExpress.XtraPrinting.PageInfo.DateTime; @@ -596,7 +537,7 @@ namespace BeWo.SozialeDiensteNiederrhein this.Title.BorderColor = System.Drawing.SystemColors.ControlText; this.Title.Borders = DevExpress.XtraPrinting.BorderSide.None; this.Title.BorderWidth = 1F; - this.Title.Font = new System.Drawing.Font("Times New Roman", 24F); + this.Title.Font = new DevExpress.Drawing.DXFont("Times New Roman", 24F); this.Title.ForeColor = System.Drawing.Color.Black; this.Title.Name = "Title"; // @@ -606,7 +547,7 @@ namespace BeWo.SozialeDiensteNiederrhein this.FieldCaption.BorderColor = System.Drawing.SystemColors.ControlText; this.FieldCaption.Borders = DevExpress.XtraPrinting.BorderSide.None; this.FieldCaption.BorderWidth = 1F; - this.FieldCaption.Font = new System.Drawing.Font("Times New Roman", 10F, System.Drawing.FontStyle.Bold); + this.FieldCaption.Font = new DevExpress.Drawing.DXFont("Times New Roman", 10F, DevExpress.Drawing.DXFontStyle.Bold); this.FieldCaption.ForeColor = System.Drawing.Color.Black; this.FieldCaption.Name = "FieldCaption"; // @@ -616,7 +557,7 @@ namespace BeWo.SozialeDiensteNiederrhein this.PageInfo.BorderColor = System.Drawing.SystemColors.ControlText; this.PageInfo.Borders = DevExpress.XtraPrinting.BorderSide.None; this.PageInfo.BorderWidth = 1F; - this.PageInfo.Font = new System.Drawing.Font("Times New Roman", 8F); + this.PageInfo.Font = new DevExpress.Drawing.DXFont("Times New Roman", 8F); this.PageInfo.ForeColor = System.Drawing.Color.Black; this.PageInfo.Name = "PageInfo"; // @@ -626,7 +567,7 @@ namespace BeWo.SozialeDiensteNiederrhein this.DataField.BorderColor = System.Drawing.SystemColors.ControlText; this.DataField.Borders = DevExpress.XtraPrinting.BorderSide.None; this.DataField.BorderWidth = 1F; - this.DataField.Font = new System.Drawing.Font("Times New Roman", 8F); + this.DataField.Font = new DevExpress.Drawing.DXFont("Times New Roman", 8F); this.DataField.ForeColor = System.Drawing.SystemColors.ControlText; this.DataField.Name = "DataField"; // @@ -647,6 +588,39 @@ namespace BeWo.SozialeDiensteNiederrhein this.bottomMarginBand1.HeightF = 30F; this.bottomMarginBand1.Name = "bottomMarginBand1"; // + // 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.063119927721024011D; + // + // xrTableCell12 + // + this.xrTableCell12.Multiline = true; + this.xrTableCell12.Name = "xrTableCell12"; + this.xrTableCell12.Text = "FLS Relation IST zu Soll"; + this.xrTableCell12.Weight = 0.063119927721024011D; + // + // xrTableCell14 + // + this.xrTableCell14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.RelationFlsZuMittelbar")}); + this.xrTableCell14.Multiline = true; + this.xrTableCell14.Name = "xrTableCell14"; + this.xrTableCell14.TextFormatString = "{0:0.00} %"; + this.xrTableCell14.Weight = 0.063119927862939587D; + // + // xrTableCell17 + // + this.xrTableCell17.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "RelationFlsZuMittelbar")}); + this.xrTableCell17.Multiline = true; + this.xrTableCell17.Name = "xrTableCell17"; + this.xrTableCell17.TextFormatString = "{0:0.00} %"; + this.xrTableCell17.Weight = 0.063760750729763185D; + // // Mitarbeiterstundenkonto // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -660,7 +634,7 @@ namespace BeWo.SozialeDiensteNiederrhein this.fieldFLS}); this.DataSource = this.bindingSource1; this.Landscape = true; - this.Margins = new System.Drawing.Printing.Margins(20, 20, 50, 30); + this.Margins = new DevExpress.Drawing.DXMargins(20F, 20F, 50F, 30F); this.PageHeight = 827; this.PageWidth = 1169; this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; @@ -669,7 +643,7 @@ namespace BeWo.SozialeDiensteNiederrhein this.FieldCaption, this.PageInfo, this.DataField}); - this.Version = "17.1"; + this.Version = "23.2"; ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); @@ -709,8 +683,6 @@ namespace BeWo.SozialeDiensteNiederrhein 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; @@ -718,7 +690,6 @@ namespace BeWo.SozialeDiensteNiederrhein 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 xrTableCell26; private DevExpress.XtraReports.UI.XRTableCell xrTableCell13; @@ -734,13 +705,13 @@ namespace BeWo.SozialeDiensteNiederrhein 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 xrTableCell51; private DevExpress.XtraReports.UI.XRTableCell xrTableCell6; private DevExpress.XtraReports.UI.XRTableCell xrTableCell1; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell18; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell17; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell29; private DevExpress.XtraReports.UI.XRTableCell cellRelationAssUndFlsGesamt; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell14; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell12; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell11; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell17; } } diff --git a/ReportImp/SozialeDiensteNiederrhein/Mitarbeiterstundenkonto.resx b/ReportImp/SozialeDiensteNiederrhein/Mitarbeiterstundenkonto.resx index 0f60e7858..c7e0d4bdf 100644 --- a/ReportImp/SozialeDiensteNiederrhein/Mitarbeiterstundenkonto.resx +++ b/ReportImp/SozialeDiensteNiederrhein/Mitarbeiterstundenkonto.resx @@ -117,7 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 17, 17 - \ No newline at end of file diff --git a/ReportImp/SozialeDiensteNiederrhein/MitarbeiterstundenkontoJahr.cs b/ReportImp/SozialeDiensteNiederrhein/MitarbeiterstundenkontoJahr.cs index 76f86ed85..c5113d044 100644 --- a/ReportImp/SozialeDiensteNiederrhein/MitarbeiterstundenkontoJahr.cs +++ b/ReportImp/SozialeDiensteNiederrhein/MitarbeiterstundenkontoJahr.cs @@ -21,6 +21,33 @@ namespace BeWo.SozialeDiensteNiederrhein var msb = new CustomMitarbeiterstundenkontoBerechnungMonate(); msb.CreateReport(pRO); + + + foreach (var info in pRO.EmployeeInfoList) + { + var flsSollGesamt = 0m; + var flsIstGesamt = 0m; + info.Custom1 = 0; + + foreach (var empDetail in info.EmployeeDetails) + { + empDetail.EmployeeDetail.RelationFlsZuMittelbar = 0; + + if (empDetail.EmployeeDetail.FlsSoll != 0) + { + flsSollGesamt += empDetail.EmployeeDetail.FlsSoll; + empDetail.EmployeeDetail.RelationFlsZuMittelbar = empDetail.EmployeeDetail.FlsIst / empDetail.EmployeeDetail.FlsSoll * 100m; + } + if (empDetail.EmployeeDetail.FlsIst != 0) + { + flsIstGesamt += empDetail.EmployeeDetail.FlsIst; + } + } + + if (flsIstGesamt != 0) + info.Custom1 = flsIstGesamt / flsSollGesamt * 100m; + } + this.bindingSource1.DataSource = pRO; } diff --git a/ReportImp/SozialeDiensteNiederrhein/MitarbeiterstundenkontoJahr.designer.cs b/ReportImp/SozialeDiensteNiederrhein/MitarbeiterstundenkontoJahr.designer.cs index ddad38dae..2df594b58 100644 --- a/ReportImp/SozialeDiensteNiederrhein/MitarbeiterstundenkontoJahr.designer.cs +++ b/ReportImp/SozialeDiensteNiederrhein/MitarbeiterstundenkontoJahr.designer.cs @@ -35,6 +35,7 @@ namespace BeWo.SozialeDiensteNiederrhein DevExpress.XtraReports.UI.XRSummary xrSummary3 = new DevExpress.XtraReports.UI.XRSummary(); DevExpress.XtraReports.UI.XRSummary xrSummary4 = new DevExpress.XtraReports.UI.XRSummary(); DevExpress.XtraReports.UI.XRSummary xrSummary5 = new DevExpress.XtraReports.UI.XRSummary(); + DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark(); this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.xrTableDetail = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRowDetail = new DevExpress.XtraReports.UI.XRTableRow(); @@ -46,7 +47,6 @@ namespace BeWo.SozialeDiensteNiederrhein 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.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -60,7 +60,6 @@ namespace BeWo.SozialeDiensteNiederrhein 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.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -74,7 +73,6 @@ namespace BeWo.SozialeDiensteNiederrhein 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.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell51 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -97,6 +95,9 @@ namespace BeWo.SozialeDiensteNiederrhein this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.GroupFooter2 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.fieldRelationGesamt = new DevExpress.XtraReports.UI.CalculatedField(); + this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell12 = 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(); @@ -115,7 +116,8 @@ namespace BeWo.SozialeDiensteNiederrhein // this.xrTableDetail.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableDetail.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableDetail.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTableDetail.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrTableDetail.Name = "xrTableDetail"; this.xrTableDetail.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -138,8 +140,8 @@ namespace BeWo.SozialeDiensteNiederrhein this.xrTableCell16, this.xrTableCell27, this.xrTableCell22, + this.xrTableCell6, this.xrTableCell23, - this.xrTableCell21, this.xrTableCell25, this.xrTableCell24, this.xrTableCell26}); @@ -214,14 +216,6 @@ namespace BeWo.SozialeDiensteNiederrhein this.xrTableCell23.Text = "xrTableCell23"; this.xrTableCell23.Weight = 0.063119927862939559D; // - // 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; - // // xrTableCell25 // this.xrTableCell25.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { @@ -251,7 +245,7 @@ namespace BeWo.SozialeDiensteNiederrhein this.xrTableHeader.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableHeader.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold); + this.xrTableHeader.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold); this.xrTableHeader.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrTableHeader.Name = "xrTableHeader"; this.xrTableHeader.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -274,8 +268,8 @@ namespace BeWo.SozialeDiensteNiederrhein this.xrTableCell8, this.xrTableCell10, this.xrTableCell7, + this.xrTableCell1, this.xrTableCell11, - this.xrTableCell12, this.xrTableCell13, this.xrTableCell14, this.xrTableCell15}); @@ -338,12 +332,6 @@ namespace BeWo.SozialeDiensteNiederrhein this.xrTableCell11.Text = "Gesamt-\r\nstunden lfd. Monat"; this.xrTableCell11.Weight = 0.063119927721024011D; // - // xrTableCell12 - // - this.xrTableCell12.Name = "xrTableCell12"; - this.xrTableCell12.Text = "Relation FLS IST zu Mittelbare IST (in %)"; - this.xrTableCell12.Weight = 0.063119929511863376D; - // // xrTableCell13 // this.xrTableCell13.Name = "xrTableCell13"; @@ -367,7 +355,8 @@ namespace BeWo.SozialeDiensteNiederrhein // // xrTable1 // - this.xrTable1.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTable1.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrTable1.Name = "xrTable1"; this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -390,8 +379,8 @@ namespace BeWo.SozialeDiensteNiederrhein this.cellFLSSollGesamt, this.cellFLSIstGesamt, this.cellFLSPlusMinusGesamt, + this.xrTableCell12, this.cellGesamtGesamt, - this.cellRelationGesamt, this.xrTableCell47, this.xrTableCell48, this.xrTableCell51}); @@ -469,14 +458,6 @@ namespace BeWo.SozialeDiensteNiederrhein this.cellGesamtGesamt.Summary = xrSummary5; this.cellGesamtGesamt.Weight = 0.063119927862939573D; // - // 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.0631199278629396D; - // // xrTableCell47 // this.xrTableCell47.Name = "xrTableCell47"; @@ -502,18 +483,18 @@ namespace BeWo.SozialeDiensteNiederrhein // // xrPageInfo2 // - this.xrPageInfo2.Font = new System.Drawing.Font("Arial", 8F); - this.xrPageInfo2.Format = "Seite {0} von {1}"; + this.xrPageInfo2.Font = new DevExpress.Drawing.DXFont("Arial", 8F); this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(864.9999F, 25F); this.xrPageInfo2.Name = "xrPageInfo2"; this.xrPageInfo2.SizeF = new System.Drawing.SizeF(139.9999F, 23F); this.xrPageInfo2.StyleName = "PageInfo"; this.xrPageInfo2.StylePriority.UseFont = false; this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrPageInfo2.TextFormatString = "Seite {0} von {1}"; // // xrPageInfo1 // - this.xrPageInfo1.Font = new System.Drawing.Font("Arial", 8F); + this.xrPageInfo1.Font = new DevExpress.Drawing.DXFont("Arial", 8F); this.xrPageInfo1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25F); this.xrPageInfo1.Name = "xrPageInfo1"; this.xrPageInfo1.PageInfo = DevExpress.XtraPrinting.PageInfo.DateTime; @@ -527,7 +508,7 @@ namespace BeWo.SozialeDiensteNiederrhein this.Title.BorderColor = System.Drawing.SystemColors.ControlText; this.Title.Borders = DevExpress.XtraPrinting.BorderSide.None; this.Title.BorderWidth = 1F; - this.Title.Font = new System.Drawing.Font("Times New Roman", 24F); + this.Title.Font = new DevExpress.Drawing.DXFont("Times New Roman", 24F); this.Title.ForeColor = System.Drawing.Color.Black; this.Title.Name = "Title"; // @@ -537,7 +518,7 @@ namespace BeWo.SozialeDiensteNiederrhein this.FieldCaption.BorderColor = System.Drawing.SystemColors.ControlText; this.FieldCaption.Borders = DevExpress.XtraPrinting.BorderSide.None; this.FieldCaption.BorderWidth = 1F; - this.FieldCaption.Font = new System.Drawing.Font("Times New Roman", 10F, System.Drawing.FontStyle.Bold); + this.FieldCaption.Font = new DevExpress.Drawing.DXFont("Times New Roman", 10F, DevExpress.Drawing.DXFontStyle.Bold); this.FieldCaption.ForeColor = System.Drawing.Color.Black; this.FieldCaption.Name = "FieldCaption"; // @@ -547,7 +528,7 @@ namespace BeWo.SozialeDiensteNiederrhein this.PageInfo.BorderColor = System.Drawing.SystemColors.ControlText; this.PageInfo.Borders = DevExpress.XtraPrinting.BorderSide.None; this.PageInfo.BorderWidth = 1F; - this.PageInfo.Font = new System.Drawing.Font("Times New Roman", 8F); + this.PageInfo.Font = new DevExpress.Drawing.DXFont("Times New Roman", 8F); this.PageInfo.ForeColor = System.Drawing.Color.Black; this.PageInfo.Name = "PageInfo"; // @@ -557,7 +538,7 @@ namespace BeWo.SozialeDiensteNiederrhein this.DataField.BorderColor = System.Drawing.SystemColors.ControlText; this.DataField.Borders = DevExpress.XtraPrinting.BorderSide.None; this.DataField.BorderWidth = 1F; - this.DataField.Font = new System.Drawing.Font("Times New Roman", 8F); + this.DataField.Font = new DevExpress.Drawing.DXFont("Times New Roman", 8F); this.DataField.ForeColor = System.Drawing.SystemColors.ControlText; this.DataField.Name = "DataField"; // @@ -610,7 +591,7 @@ namespace BeWo.SozialeDiensteNiederrhein // this.Detail3.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrTableDetail}); - this.Detail3.Font = new System.Drawing.Font("Arial", 9.75F); + this.Detail3.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F); this.Detail3.HeightF = 25F; this.Detail3.Name = "Detail3"; this.Detail3.StylePriority.UseFont = false; @@ -632,7 +613,7 @@ namespace BeWo.SozialeDiensteNiederrhein // // xrLabel1 // - this.xrLabel1.Font = new System.Drawing.Font("Arial", 14F, System.Drawing.FontStyle.Bold); + this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 14F, DevExpress.Drawing.DXFontStyle.Bold); this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrLabel1.Multiline = true; this.xrLabel1.Name = "xrLabel1"; @@ -656,6 +637,31 @@ namespace BeWo.SozialeDiensteNiederrhein this.fieldRelationGesamt.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; this.fieldRelationGesamt.Name = "fieldRelationGesamt"; // + // xrTableCell1 + // + this.xrTableCell1.Multiline = true; + this.xrTableCell1.Name = "xrTableCell1"; + this.xrTableCell1.Text = "FLS Relation IST zu Soll"; + this.xrTableCell1.Weight = 0.06311992757910842D; + // + // xrTableCell6 + // + this.xrTableCell6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.RelationFlsZuMittelbar")}); + this.xrTableCell6.Multiline = true; + this.xrTableCell6.Name = "xrTableCell6"; + this.xrTableCell6.TextFormatString = "{0:0.00} %"; + this.xrTableCell6.Weight = 0.063119927862939587D; + // + // xrTableCell12 + // + this.xrTableCell12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.Custom1")}); + this.xrTableCell12.Multiline = true; + this.xrTableCell12.Name = "xrTableCell12"; + this.xrTableCell12.TextFormatString = "{0:0.00} %"; + this.xrTableCell12.Weight = 0.063119927862939587D; + // // bindingSource1 // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoMonateRO); @@ -674,7 +680,7 @@ namespace BeWo.SozialeDiensteNiederrhein this.DataSource = this.bindingSource1; this.DisplayName = "Mitarbeiterstundenkonto"; this.Landscape = true; - this.Margins = new System.Drawing.Printing.Margins(75, 75, 50, 30); + this.Margins = new DevExpress.Drawing.DXMargins(75F, 75F, 50F, 30F); this.PageHeight = 827; this.PageWidth = 1169; this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; @@ -683,7 +689,9 @@ namespace BeWo.SozialeDiensteNiederrhein this.FieldCaption, this.PageInfo, this.DataField}); - this.Version = "17.1"; + this.Version = "23.2"; + xrWatermark1.Id = "Watermark1"; + this.Watermarks.Add(xrWatermark1); ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); @@ -719,7 +727,6 @@ namespace BeWo.SozialeDiensteNiederrhein 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; @@ -727,7 +734,6 @@ namespace BeWo.SozialeDiensteNiederrhein 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; @@ -744,7 +750,6 @@ namespace BeWo.SozialeDiensteNiederrhein 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; @@ -757,5 +762,8 @@ namespace BeWo.SozialeDiensteNiederrhein private DevExpress.XtraReports.UI.XRLabel xrLabel1; private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter2; private DevExpress.XtraReports.UI.CalculatedField fieldRelationGesamt; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell6; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell1; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell12; } } diff --git a/ReportImp/SozialeDiensteNiederrhein/MitarbeiterstundenkontoJahr.resx b/ReportImp/SozialeDiensteNiederrhein/MitarbeiterstundenkontoJahr.resx index d25f3eba2..d58980a38 100644 --- a/ReportImp/SozialeDiensteNiederrhein/MitarbeiterstundenkontoJahr.resx +++ b/ReportImp/SozialeDiensteNiederrhein/MitarbeiterstundenkontoJahr.resx @@ -117,7 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 17, 17 - \ No newline at end of file