diff --git a/ReportImp/TagwerkReports/ServicesOverviewReport.Designer.cs b/ReportImp/TagwerkReports/ServicesOverviewReport.Designer.cs index b8abb1289..42883b865 100644 --- a/ReportImp/TagwerkReports/ServicesOverviewReport.Designer.cs +++ b/ReportImp/TagwerkReports/ServicesOverviewReport.Designer.cs @@ -36,6 +36,7 @@ namespace BeWo.TagwerkReports this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell(); this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); @@ -46,10 +47,12 @@ namespace BeWo.TagwerkReports this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); this.picSignature = new DevExpress.XtraReports.UI.XRPictureBox(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); @@ -92,21 +95,18 @@ namespace BeWo.TagwerkReports this.customerCountField = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldBillableFLS = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldAbrechenbareFLS = new DevExpress.XtraReports.UI.CalculatedField(); - this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail // this.Detail.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrTableServiceRecords1}); - this.Detail.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); + this.Detail.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); this.Detail.HeightF = 20F; this.Detail.Name = "Detail"; this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); @@ -181,6 +181,12 @@ namespace BeWo.TagwerkReports this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; this.xrTableCell12.Weight = 0.34140285399571768D; // + // xrTableCell26 + // + this.xrTableCell26.Name = "xrTableCell26"; + this.xrTableCell26.Text = "Leistung"; + this.xrTableCell26.Weight = 0.29263101756214804D; + // // xrTableCell1 // this.xrTableCell1.Name = "xrTableCell1"; @@ -218,7 +224,8 @@ namespace BeWo.TagwerkReports this.xrTable3.BorderColor = System.Drawing.Color.Black; this.xrTable3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTable3.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTable3.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrTable3.Name = "xrTable3"; this.xrTable3.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); @@ -291,6 +298,16 @@ namespace BeWo.TagwerkReports this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; this.xrTableCell17.Weight = 0.17676763556587519D; // + // xrTableCell28 + // + this.xrTableCell28.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.ServiceDescription")}); + this.xrTableCell28.Name = "xrTableCell28"; + this.xrTableCell28.StylePriority.UseTextAlignment = false; + this.xrTableCell28.Text = "xrTableCell28"; + this.xrTableCell28.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell28.Weight = 0.1515151163820769D; + // // xrTableCell2 // this.xrTableCell2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { @@ -316,7 +333,7 @@ namespace BeWo.TagwerkReports this.xrLabel2.Borders = DevExpress.XtraPrinting.BorderSide.None; this.xrLabel2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.SignatureDate", "{0:dd.MM.yyyy}")}); - this.xrLabel2.Font = new System.Drawing.Font("Arial", 9F); + this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 9F); this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrLabel2.Name = "xrLabel2"; this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -338,6 +355,10 @@ namespace BeWo.TagwerkReports this.picSignature.StylePriority.UseBorders = false; this.picSignature.BeforePrint += new DevExpress.XtraReports.UI.BeforePrintEventHandler(this.picSignature_BeforePrint); // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); + // // formattingRuleStartDate // this.formattingRuleStartDate.Condition = "[StartDate2] < [StartDate]"; @@ -352,7 +373,7 @@ namespace BeWo.TagwerkReports this.xrLabel13, this.xrLabel1, this.xrLabel23}); - this.ReportHeader.Font = new System.Drawing.Font("Arial", 10F); + this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.ReportHeader.HeightF = 260F; this.ReportHeader.Name = "ReportHeader"; this.ReportHeader.StylePriority.UseFont = false; @@ -508,14 +529,14 @@ namespace BeWo.TagwerkReports // // xrLabel13 // - this.xrLabel13.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); + this.xrLabel13.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0F, 40F); this.xrLabel13.Name = "xrLabel13"; this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel13.SizeF = new System.Drawing.SizeF(725F, 18F); this.xrLabel13.StylePriority.UseFont = false; this.xrLabel13.StylePriority.UseTextAlignment = false; - this.xrLabel13.Text = "Leistungsanbieter: tagwerk betreutes wohnen. GmbH "; + this.xrLabel13.Text = "Leistungsanbieter: Tagwerk Impact Solutions GmbH"; this.xrLabel13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; // // xrLabel1 @@ -523,7 +544,7 @@ namespace BeWo.TagwerkReports this.xrLabel1.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrLabel1.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); + this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold); this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrLabel1.Multiline = true; this.xrLabel1.Name = "xrLabel1"; @@ -537,7 +558,7 @@ namespace BeWo.TagwerkReports // // xrLabel23 // - this.xrLabel23.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); + this.xrLabel23.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold); this.xrLabel23.LocationFloat = new DevExpress.Utils.PointFloat(0F, 220F); this.xrLabel23.Name = "xrLabel23"; this.xrLabel23.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -570,7 +591,7 @@ namespace BeWo.TagwerkReports // // topMarginBand1 // - this.topMarginBand1.Font = new System.Drawing.Font("Times New Roman", 9.75F); + this.topMarginBand1.Font = new DevExpress.Drawing.DXFont("Times New Roman", 9.75F); this.topMarginBand1.HeightF = 80F; this.topMarginBand1.Name = "topMarginBand1"; this.topMarginBand1.StylePriority.UseFont = false; @@ -586,7 +607,7 @@ namespace BeWo.TagwerkReports this.lblDatum, this.xrTable2, this.xrLabel6}); - this.ReportFooter.Font = new System.Drawing.Font("Arial", 10F); + this.ReportFooter.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.ReportFooter.HeightF = 107.0417F; this.ReportFooter.Name = "ReportFooter"; this.ReportFooter.StylePriority.UseFont = false; @@ -629,7 +650,7 @@ namespace BeWo.TagwerkReports // // xrTableCell23 // - this.xrTableCell23.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); + this.xrTableCell23.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); this.xrTableCell23.Name = "xrTableCell23"; this.xrTableCell23.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F); this.xrTableCell23.StylePriority.UseFont = false; @@ -642,7 +663,7 @@ namespace BeWo.TagwerkReports // this.xrTableCell27.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLMBillable")}); - this.xrTableCell27.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); + this.xrTableCell27.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); this.xrTableCell27.Name = "xrTableCell27"; this.xrTableCell27.StylePriority.UseFont = false; this.xrTableCell27.Text = "Minuten"; @@ -697,26 +718,6 @@ namespace BeWo.TagwerkReports this.fieldAbrechenbareFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; this.fieldAbrechenbareFLS.Name = "fieldAbrechenbareFLS"; // - // xrTableCell26 - // - this.xrTableCell26.Name = "xrTableCell26"; - this.xrTableCell26.Text = "Leistung"; - this.xrTableCell26.Weight = 0.29263101756214804D; - // - // xrTableCell28 - // - this.xrTableCell28.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.ServiceDescription")}); - this.xrTableCell28.Name = "xrTableCell28"; - this.xrTableCell28.StylePriority.UseTextAlignment = false; - this.xrTableCell28.Text = "xrTableCell28"; - this.xrTableCell28.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell28.Weight = 0.1515151163820769D; - // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); - // // Stundenzettel // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -739,17 +740,17 @@ namespace BeWo.TagwerkReports this.formattingRuleServiceDesc, this.formattingRuleCostBearer, this.formattingRuleEmployeeName}); - this.Margins = new System.Drawing.Printing.Margins(50, 50, 80, 36); + this.Margins = new DevExpress.Drawing.DXMargins(50F, 50F, 80F, 36F); this.PageHeight = 1169; this.PageWidth = 827; this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; this.SnapGridSize = 9F; - this.Version = "17.1"; + this.Version = "23.2"; ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } diff --git a/ReportImp/TagwerkReports/ServicesOverviewReport.resx b/ReportImp/TagwerkReports/ServicesOverviewReport.resx index 0f60e7858..c7e0d4bdf 100644 --- a/ReportImp/TagwerkReports/ServicesOverviewReport.resx +++ b/ReportImp/TagwerkReports/ServicesOverviewReport.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