diff --git a/ReportImp/DerKarren/DerKarren.csproj b/ReportImp/DerKarren/DerKarren.csproj index 6eae07016..7e267c30c 100644 --- a/ReportImp/DerKarren/DerKarren.csproj +++ b/ReportImp/DerKarren/DerKarren.csproj @@ -76,18 +76,18 @@ - - Component - - - Quittierungsbeleg.cs - Component ServiceRecordListReport.cs + + Component + + + ServicesOverviewReport.cs + Component @@ -104,14 +104,13 @@ Mitarbeiterstundenkonto.cs - - Quittierungsbeleg.cs - Designer - ServiceRecordListReport.cs Designer + + ServicesOverviewReport.cs + Teamstundenkonto.cs diff --git a/ReportImp/DerKarren/ServicesOverviewReport.Designer.cs b/ReportImp/DerKarren/ServicesOverviewReport.Designer.cs index 61cb2496c..974491491 100644 --- a/ReportImp/DerKarren/ServicesOverviewReport.Designer.cs +++ b/ReportImp/DerKarren/ServicesOverviewReport.Designer.cs @@ -86,7 +86,6 @@ namespace BeWo.DerKarren this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); @@ -120,6 +119,11 @@ namespace BeWo.DerKarren this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel19 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell14 = 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.xrTable1)).BeginInit(); @@ -149,7 +153,7 @@ namespace BeWo.DerKarren this.xrTableServiceRecords1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); this.xrTableServiceRecords1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow2}); - this.xrTableServiceRecords1.SizeF = new System.Drawing.SizeF(488F, 18F); + this.xrTableServiceRecords1.SizeF = new System.Drawing.SizeF(705.5831F, 18F); this.xrTableServiceRecords1.StylePriority.UseBackColor = false; this.xrTableServiceRecords1.StylePriority.UseBorders = false; this.xrTableServiceRecords1.StylePriority.UseBorderWidth = false; @@ -163,7 +167,9 @@ namespace BeWo.DerKarren this.xrTableCell3, this.xrTableCell1, this.xrTableCell4, - this.xrTableCell11}); + this.xrTableCell11, + this.xrTableCell9, + this.xrTableCell10}); this.xrTableRow2.Name = "xrTableRow2"; this.xrTableRow2.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); this.xrTableRow2.StylePriority.UseTextAlignment = false; @@ -237,7 +243,7 @@ namespace BeWo.DerKarren this.xrTable3.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow6}); - this.xrTable3.SizeF = new System.Drawing.SizeF(488F, 18F); + this.xrTable3.SizeF = new System.Drawing.SizeF(705.5831F, 18F); this.xrTable3.StylePriority.UseFont = false; this.xrTable3.StylePriority.UseTextAlignment = false; this.xrTable3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; @@ -248,7 +254,9 @@ namespace BeWo.DerKarren this.xrTableCell13, this.xrTableCell2, this.xrTableCell5, - this.xrTableCell15}); + this.xrTableCell15, + this.xrTableCell12, + this.xrTableCell14}); this.xrTableRow6.Name = "xrTableRow6"; this.xrTableRow6.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); this.xrTableRow6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; @@ -325,7 +333,7 @@ namespace BeWo.DerKarren this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow1, this.xrTableRow3}); - this.xrTable1.SizeF = new System.Drawing.SizeF(643.0001F, 120F); + this.xrTable1.SizeF = new System.Drawing.SizeF(712.0002F, 120F); this.xrTable1.StylePriority.UseBackColor = false; this.xrTable1.StylePriority.UseBorders = false; this.xrTable1.StylePriority.UseBorderWidth = false; @@ -388,7 +396,7 @@ namespace BeWo.DerKarren this.cellFactorBorder.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); this.cellFactorBorder.Name = "cellFactorBorder"; this.cellFactorBorder.StylePriority.UseBorders = false; - this.cellFactorBorder.Weight = 0.27742331537690035D; + this.cellFactorBorder.Weight = 0.40092151078323141D; // // xrTableRow3 // @@ -440,7 +448,7 @@ namespace BeWo.DerKarren this.cellHoursFactor.StylePriority.UseTextAlignment = false; this.cellHoursFactor.Text = "0,00"; this.cellHoursFactor.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomRight; - this.cellHoursFactor.Weight = 0.27742342461929664D; + this.cellHoursFactor.Weight = 0.4009216200256277D; // // GroupHeader2 // @@ -746,10 +754,6 @@ namespace BeWo.DerKarren this.xrTableCell31.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; this.xrTableCell31.Weight = 0.075757568269402914D; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); - // // formattingRuleStartDate // this.formattingRuleStartDate.Condition = "[StartDate2] < [StartDate]"; @@ -1086,6 +1090,52 @@ namespace BeWo.DerKarren this.xrLabel17.StylePriority.UseFont = false; this.xrLabel17.Text = "xrLabel17"; // + // xrTableCell9 + // + this.xrTableCell9.Name = "xrTableCell9"; + this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F); + this.xrTableCell9.StylePriority.UsePadding = false; + this.xrTableCell9.Text = "Kontaktart"; + this.xrTableCell9.Weight = 0.19471812549825551D; + // + // xrTableCell10 + // + this.xrTableCell10.Name = "xrTableCell10"; + this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F); + this.xrTableCell10.StylePriority.UsePadding = false; + this.xrTableCell10.Text = "Gruppengröße"; + this.xrTableCell10.Weight = 0.19471812549825551D; + // + // xrTableCell12 + // + this.xrTableCell12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice5")}); + this.xrTableCell12.Multiline = true; + this.xrTableCell12.Name = "xrTableCell12"; + this.xrTableCell12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell12.StylePriority.UsePadding = false; + this.xrTableCell12.StylePriority.UseTextAlignment = false; + this.xrTableCell12.Text = "\r\n"; + this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell12.Weight = 0.10081892538249397D; + // + // xrTableCell14 + // + this.xrTableCell14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.CustomerCount")}); + this.xrTableCell14.Multiline = true; + this.xrTableCell14.Name = "xrTableCell14"; + this.xrTableCell14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell14.StylePriority.UsePadding = false; + this.xrTableCell14.StylePriority.UseTextAlignment = false; + this.xrTableCell14.Text = "\r\n"; + this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell14.Weight = 0.10081889710135501D; + // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); + // // Stundenzettel // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -1215,5 +1265,9 @@ namespace BeWo.DerKarren private DevExpress.XtraReports.UI.XRTableCell xrTableCell29; private DevExpress.XtraReports.UI.XRTableCell xrTableCell30; private DevExpress.XtraReports.UI.XRTableCell xrTableCell31; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell9; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell10; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell12; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell14; } } diff --git a/ReportImp/DerKarren/ServicesOverviewReport.cs b/ReportImp/DerKarren/ServicesOverviewReport.cs index 14bc965ff..5e7042cc8 100644 --- a/ReportImp/DerKarren/ServicesOverviewReport.cs +++ b/ReportImp/DerKarren/ServicesOverviewReport.cs @@ -27,8 +27,15 @@ namespace BeWo.DerKarren foreach (ServicesOverviewRO.ServiceDetail s in pRO.Services) { - if (s.IsBillable) + if (s.IsBillable || s.ServiceDescription.ToLower().Contains("fehlkontakt")) { + if (s.ServiceDescription.ToLower().Contains("fehlkontakt")) + s.Notice5 = "Fehlkontakt"; + else if (s.IsGroup) + s.Notice5 = "Gruppe"; + else if (!s.IsGroup) + s.Notice5 = "Einzeln"; + if (s.IsGroup) {