From 74685af493fbacae210d19829e39dbbc874f79fe Mon Sep 17 00:00:00 2001 From: Alexandra Date: Tue, 2 Apr 2024 17:38:53 +0200 Subject: [PATCH] AWOMuensterlandRecklinghausen/StatusCheckAbrechnung 3 neue Spalten --- .../StatusCheckAbrechnung.designer.cs | 164 +++++++++++++----- .../StatusCheckAbrechnung.resx | 6 +- 2 files changed, 120 insertions(+), 50 deletions(-) diff --git a/ReportImp/AWOMuensterlandRecklinghausen/StatusCheckAbrechnung.designer.cs b/ReportImp/AWOMuensterlandRecklinghausen/StatusCheckAbrechnung.designer.cs index 8a11ecf09..be04706bc 100644 --- a/ReportImp/AWOMuensterlandRecklinghausen/StatusCheckAbrechnung.designer.cs +++ b/ReportImp/AWOMuensterlandRecklinghausen/StatusCheckAbrechnung.designer.cs @@ -30,6 +30,8 @@ namespace AWOMuensterlandRecklinghausen private void InitializeComponent() { this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Statuscheck)); + DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark(); this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); this.xrTable2 = new DevExpress.XtraReports.UI.XRTable(); @@ -51,8 +53,9 @@ namespace AWOMuensterlandRecklinghausen this.cellRateFactorHeader = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); + this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.pageFooterBand1 = new DevExpress.XtraReports.UI.PageFooterBand(); this.xrPageInfo2 = new DevExpress.XtraReports.UI.XRPageInfo(); this.xrPageInfo1 = new DevExpress.XtraReports.UI.XRPageInfo(); @@ -64,8 +67,13 @@ namespace AWOMuensterlandRecklinghausen this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.fieldBillableAmountYear = new DevExpress.XtraReports.UI.CalculatedField(); - this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell10 = 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.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); @@ -83,7 +91,7 @@ namespace AWOMuensterlandRecklinghausen // this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrTable2}); - this.Detail1.Font = new System.Drawing.Font("Arial", 9F); + this.Detail1.Font = new DevExpress.Drawing.DXFont("Arial", 9F); this.Detail1.HeightF = 25F; this.Detail1.KeepTogetherWithDetailReports = true; this.Detail1.Name = "Detail1"; @@ -98,7 +106,7 @@ namespace AWOMuensterlandRecklinghausen this.xrTable2.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F); this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow2}); - this.xrTable2.SizeF = new System.Drawing.SizeF(1084F, 25F); + this.xrTable2.SizeF = new System.Drawing.SizeF(1559F, 25F); this.xrTable2.StylePriority.UseBorders = false; this.xrTable2.StylePriority.UseFont = false; this.xrTable2.StylePriority.UsePadding = false; @@ -109,10 +117,13 @@ namespace AWOMuensterlandRecklinghausen // this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { this.xrTableCell6, + this.xrTableCell5, this.xrTableCell7, this.xrTableCell3, this.xrTableCell29, + this.xrTableCell11, this.xrTableCell26, + this.xrTableCell13, this.xrTableCell9}); this.xrTableRow2.Name = "xrTableRow2"; this.xrTableRow2.Weight = 1D; @@ -171,7 +182,7 @@ namespace AWOMuensterlandRecklinghausen // // lblTitel // - this.lblTitel.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); + this.lblTitel.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold); this.lblTitel.LocationFloat = new DevExpress.Utils.PointFloat(0F, 10.00001F); this.lblTitel.Name = "lblTitel"; this.lblTitel.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -202,13 +213,13 @@ namespace AWOMuensterlandRecklinghausen this.xrTable1.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTable1.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold); + this.xrTable1.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold); this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrTable1.Name = "xrTable1"; this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F); this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow1}); - this.xrTable1.SizeF = new System.Drawing.SizeF(1084F, 50F); + this.xrTable1.SizeF = new System.Drawing.SizeF(1559F, 50F); this.xrTable1.StylePriority.UseBorders = false; this.xrTable1.StylePriority.UseFont = false; this.xrTable1.StylePriority.UsePadding = false; @@ -219,10 +230,13 @@ namespace AWOMuensterlandRecklinghausen // this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { this.xrTableCell1, + this.xrTableCell4, this.xrTableCell2, this.cellGeleistetImZeitraumHeader, this.cellRateFactorHeader, + this.xrTableCell10, this.xrTableCell25, + this.xrTableCell12, this.xrTableCell8}); this.xrTableRow1.Name = "xrTableRow1"; this.xrTableRow1.Weight = 1.3953493323567705D; @@ -269,14 +283,10 @@ namespace AWOMuensterlandRecklinghausen // this.xrTableCell8.Name = "xrTableCell8"; this.xrTableCell8.StylePriority.UseTextAlignment = false; - this.xrTableCell8.Text = "Bemerkung"; + this.xrTableCell8.Text = "Bemerkung ZAS"; this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; this.xrTableCell8.Weight = 1.2584944495007986D; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.FinanceRO); - // // ReportHeader // this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -286,6 +296,30 @@ namespace AWOMuensterlandRecklinghausen this.ReportHeader.HeightF = 52.08333F; this.ReportHeader.Name = "ReportHeader"; // + // xrLabel2 + // + this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(400F, 10.00001F); + this.xrLabel2.Name = "xrLabel2"; + this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel2.SizeF = new System.Drawing.SizeF(200F, 23F); + this.xrLabel2.StylePriority.UseFont = false; + this.xrLabel2.StylePriority.UseTextAlignment = false; + this.xrLabel2.Text = "[ReportStartDate!dd.MM.yyyy] - [ReportEndDate!dd.MM.yyyy]"; + this.xrLabel2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + // + // xrLabel1 + // + this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(200F, 10.00001F); + this.xrLabel1.Name = "xrLabel1"; + this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel1.SizeF = new System.Drawing.SizeF(200F, 23F); + this.xrLabel1.StylePriority.UseFont = false; + this.xrLabel1.StylePriority.UseTextAlignment = false; + this.xrLabel1.Text = "Abrechnungszeitraum:"; + this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + // // pageFooterBand1 // this.pageFooterBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -296,18 +330,18 @@ namespace AWOMuensterlandRecklinghausen // // xrPageInfo2 // - this.xrPageInfo2.Font = new System.Drawing.Font("Arial", 8F); - this.xrPageInfo2.Format = "Seite {0} von {1}"; - this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(799.9999F, 25F); + this.xrPageInfo2.Font = new DevExpress.Drawing.DXFont("Arial", 8F); + this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(1277.689F, 25F); this.xrPageInfo2.Name = "xrPageInfo2"; - this.xrPageInfo2.SizeF = new System.Drawing.SizeF(284.0002F, 23F); + this.xrPageInfo2.SizeF = new System.Drawing.SizeF(281.3108F, 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; @@ -321,7 +355,7 @@ namespace AWOMuensterlandRecklinghausen 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"; // @@ -331,7 +365,7 @@ namespace AWOMuensterlandRecklinghausen 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"; // @@ -341,7 +375,7 @@ namespace AWOMuensterlandRecklinghausen 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"; // @@ -351,7 +385,7 @@ namespace AWOMuensterlandRecklinghausen 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"; // @@ -379,29 +413,57 @@ namespace AWOMuensterlandRecklinghausen this.fieldBillableAmountYear.Expression = "[BillableAmountInReportTimeSpan]*12"; this.fieldBillableAmountYear.Name = "fieldBillableAmountYear"; // - // xrLabel1 + // xrTableCell4 // - this.xrLabel1.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold); - this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(200F, 10.00001F); - this.xrLabel1.Name = "xrLabel1"; - this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel1.SizeF = new System.Drawing.SizeF(200F, 23F); - this.xrLabel1.StylePriority.UseFont = false; - this.xrLabel1.StylePriority.UseTextAlignment = false; - this.xrLabel1.Text = "Abrechnungszeitraum:"; - this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell4.Multiline = true; + this.xrTableCell4.Name = "xrTableCell4"; + this.xrTableCell4.Text = "Mitarbeiter*in"; + this.xrTableCell4.Weight = 0.8862628989566943D; // - // xrLabel2 + // xrTableCell5 // - this.xrLabel2.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold); - this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(400F, 10.00001F); - this.xrLabel2.Name = "xrLabel2"; - this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel2.SizeF = new System.Drawing.SizeF(200F, 23F); - this.xrLabel2.StylePriority.UseFont = false; - this.xrLabel2.StylePriority.UseTextAlignment = false; - this.xrLabel2.Text = "[ReportStartDate!dd.MM.yyyy] - [ReportEndDate!dd.MM.yyyy]"; - this.xrLabel2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell5.Multiline = true; + this.xrTableCell5.Name = "xrTableCell5"; + this.xrTableCell5.Text = resources.GetString("xrTableCell5.Text"); + this.xrTableCell5.Weight = 0.88626284710752745D; + // + // xrTableCell10 + // + this.xrTableCell10.Multiline = true; + this.xrTableCell10.Name = "xrTableCell10"; + this.xrTableCell10.StylePriority.UseTextAlignment = false; + this.xrTableCell10.Text = "Check Koord. \r\n-Bemerkung / Freigabe"; + this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell10.Weight = 0.84152605693883253D; + // + // xrTableCell11 + // + this.xrTableCell11.Multiline = true; + this.xrTableCell11.Name = "xrTableCell11"; + this.xrTableCell11.StylePriority.UseTextAlignment = false; + this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell11.Weight = 0.84152611713169212D; + // + // xrTableCell12 + // + this.xrTableCell12.Multiline = true; + this.xrTableCell12.Name = "xrTableCell12"; + this.xrTableCell12.StylePriority.UseTextAlignment = false; + this.xrTableCell12.Text = "Versendet"; + this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell12.Weight = 0.44313145010736071D; + // + // xrTableCell13 + // + this.xrTableCell13.Multiline = true; + this.xrTableCell13.Name = "xrTableCell13"; + this.xrTableCell13.StylePriority.UseTextAlignment = false; + this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell13.Weight = 0.44313115228486588D; + // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.FinanceRO); // // Statuscheck // @@ -416,16 +478,18 @@ namespace AWOMuensterlandRecklinghausen this.fieldBillableAmountYear}); this.DataSource = this.bindingSource1; this.Landscape = true; - this.Margins = new System.Drawing.Printing.Margins(45, 40, 50, 30); - this.PageHeight = 827; - this.PageWidth = 1169; - this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; + this.Margins = new DevExpress.Drawing.DXMargins(45F, 40F, 50F, 30F); + this.PageHeight = 1169; + this.PageWidth = 1654; + this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A3; this.StyleSheet.AddRange(new DevExpress.XtraReports.UI.XRControlStyle[] { this.Title, 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.xrTable2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); @@ -471,5 +535,11 @@ namespace AWOMuensterlandRecklinghausen private DevExpress.XtraReports.UI.CalculatedField fieldBillableAmountYear; private DevExpress.XtraReports.UI.XRLabel xrLabel2; private DevExpress.XtraReports.UI.XRLabel xrLabel1; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell5; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell11; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell13; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell4; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell10; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell12; } } diff --git a/ReportImp/AWOMuensterlandRecklinghausen/StatusCheckAbrechnung.resx b/ReportImp/AWOMuensterlandRecklinghausen/StatusCheckAbrechnung.resx index d25f3eba2..6b0afa56a 100644 --- a/ReportImp/AWOMuensterlandRecklinghausen/StatusCheckAbrechnung.resx +++ b/ReportImp/AWOMuensterlandRecklinghausen/StatusCheckAbrechnung.resx @@ -117,7 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 17, 17 - + + [Costbearer2Supportconcept.ApprovalPeriodList.SupportConceptApprovalPeriodEmployeeRelations.Employee.LastName], [Costbearer2Supportconcept.ApprovalPeriodList.SupportConceptApprovalPeriodEmployeeRelations.Employee.FirstName] + \ No newline at end of file