diff --git a/ReportImp/TrialogReports/ServicesOverviewReport.Designer.cs b/ReportImp/TrialogReports/ServicesOverviewReport.Designer.cs index 8c427736e..d153ff4d6 100644 --- a/ReportImp/TrialogReports/ServicesOverviewReport.Designer.cs +++ b/ReportImp/TrialogReports/ServicesOverviewReport.Designer.cs @@ -49,7 +49,6 @@ namespace BeWo.TrialogReports this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell(); this.cellGoal = 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.lblBewilligt = new DevExpress.XtraReports.UI.XRLabel(); @@ -78,6 +77,7 @@ namespace BeWo.TrialogReports this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); this.fieldAbrechenbareMinuten = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldFLSBillable = new DevExpress.XtraReports.UI.CalculatedField(); + 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(); @@ -95,12 +95,12 @@ namespace BeWo.TrialogReports // xrTableServiceRecords1 // this.xrTableServiceRecords1.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); - this.xrTableServiceRecords1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrTableServiceRecords1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 18F); this.xrTableServiceRecords1.Name = "xrTableServiceRecords1"; 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(700F, 21F); + this.xrTableServiceRecords1.SizeF = new System.Drawing.SizeF(720F, 21F); this.xrTableServiceRecords1.StylePriority.UseBackColor = false; this.xrTableServiceRecords1.StylePriority.UseBorders = false; this.xrTableServiceRecords1.StylePriority.UseFont = false; @@ -138,7 +138,7 @@ namespace BeWo.TrialogReports this.xrTableCell4.StylePriority.UseFont = false; this.xrTableCell4.StylePriority.UseTextAlignment = false; this.xrTableCell4.Text = "Beginn"; - this.xrTableCell4.Weight = 0.29263101620867049D; + this.xrTableCell4.Weight = 0.26092932255397205D; // // xrTableCell11 // @@ -147,7 +147,7 @@ namespace BeWo.TrialogReports this.xrTableCell11.StylePriority.UseFont = false; this.xrTableCell11.StylePriority.UseTextAlignment = false; this.xrTableCell11.Text = "Ende"; - this.xrTableCell11.Weight = 0.29263101463006624D; + this.xrTableCell11.Weight = 0.28531520196133153D; // // xrTableCell9 // @@ -156,7 +156,7 @@ namespace BeWo.TrialogReports this.xrTableCell9.StylePriority.UseFont = false; this.xrTableCell9.StylePriority.UseTextAlignment = false; this.xrTableCell9.Text = "Minuten"; - this.xrTableCell9.Weight = 0.24385918455264008D; + this.xrTableCell9.Weight = 0.24142070436292246D; // // xrTableCell1 // @@ -164,9 +164,9 @@ namespace BeWo.TrialogReports this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F); this.xrTableCell1.StylePriority.UsePadding = false; this.xrTableCell1.StylePriority.UseTextAlignment = false; - this.xrTableCell1.Text = "Gruppe"; + this.xrTableCell1.Text = "Kontaktart"; this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell1.Weight = 0.24385918455264005D; + this.xrTableCell1.Weight = 0.30726249744212053D; // // cellDokHeader // @@ -176,7 +176,7 @@ namespace BeWo.TrialogReports this.cellDokHeader.StylePriority.UseTextAlignment = false; this.cellDokHeader.Text = "Dokumentation"; this.cellDokHeader.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.cellDokHeader.Weight = 0.39017469372817121D; + this.cellDokHeader.Weight = 0.41699920374368521D; // // DetailReport // @@ -210,7 +210,7 @@ namespace BeWo.TrialogReports 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(700F, 21F); + this.xrTable3.SizeF = new System.Drawing.SizeF(720F, 21F); this.xrTable3.StylePriority.UseFont = false; this.xrTable3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; // @@ -256,7 +256,7 @@ namespace BeWo.TrialogReports this.xrTableCell14.StylePriority.UseTextAlignment = false; this.xrTableCell14.Text = "xrTableCell14"; this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; - this.xrTableCell14.Weight = 0.15151513706129416D; + this.xrTableCell14.Weight = 0.13510100596212857D; // // xrTableCell15 // @@ -271,7 +271,7 @@ namespace BeWo.TrialogReports this.xrTableCell15.StylePriority.UseTextAlignment = false; this.xrTableCell15.Text = "xrTableCell15"; this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; - this.xrTableCell15.Weight = 0.15151514432005014D; + this.xrTableCell15.Weight = 0.14772727532260693D; // // xrTableCell16 // @@ -285,7 +285,7 @@ namespace BeWo.TrialogReports this.xrTableCell16.StylePriority.UseTextAlignment = false; this.xrTableCell16.Text = "xrTableCell16"; this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; - this.xrTableCell16.Weight = 0.12626262011660533D; + this.xrTableCell16.Weight = 0.12500003243872709D; // // xrTableCell17 // @@ -300,7 +300,7 @@ namespace BeWo.TrialogReports this.xrTableCell17.StylePriority.UseTextAlignment = false; this.xrTableCell17.Text = "xrTableCell17"; this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - this.xrTableCell17.Weight = 0.1262626251987318D; + this.xrTableCell17.Weight = 0.159090945195504D; // // cellGoal // @@ -315,11 +315,7 @@ namespace BeWo.TrialogReports this.cellGoal.StylePriority.UseTextAlignment = false; this.cellGoal.Text = "cellGoal"; this.cellGoal.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - this.cellGoal.Weight = 0.2020201978090661D; - // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); + this.cellGoal.Weight = 0.21590898979022569D; // // formattingRuleStartDate // @@ -604,6 +600,10 @@ namespace BeWo.TrialogReports this.fieldFLSBillable.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; this.fieldFLSBillable.Name = "fieldFLSBillable"; // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); + // // Stundenzettel // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -622,7 +622,7 @@ namespace BeWo.TrialogReports this.formattingRuleServiceDesc, this.formattingRuleCostBearer, this.formattingRuleEmployeeName}); - this.Margins = new System.Drawing.Printing.Margins(75, 50, 50, 30); + this.Margins = new System.Drawing.Printing.Margins(75, 30, 50, 30); this.PageHeight = 1169; this.PageWidth = 827; this.PaperKind = System.Drawing.Printing.PaperKind.A4; diff --git a/ReportImp/TrialogReports/ServicesOverviewReport.cs b/ReportImp/TrialogReports/ServicesOverviewReport.cs index b6111b9e1..a07f7011c 100644 --- a/ReportImp/TrialogReports/ServicesOverviewReport.cs +++ b/ReportImp/TrialogReports/ServicesOverviewReport.cs @@ -35,7 +35,7 @@ namespace BeWo.TrialogReports foreach (ServicesOverviewRO.ServiceDetail s in pRO.Services) { - if (s.IsBillable) + if (s.IsBillable || s.ServiceDescription.ToLower().Contains("fehlkontakt")) { if (isJugendamt) { @@ -43,8 +43,12 @@ namespace BeWo.TrialogReports } s.Notice = ""; - if (s.IsGroup) - s.Notice = String.Format("Gruppe {0:0}", s.CustomerCount); + if (s.ServiceDescription.ToLower().Contains("fehlkontakt")) + s.Notice = "Fehlkontakt"; + else if (s.IsGroup) + s.Notice = String.Format("Gruppe {0:0}", s.CustomerCount); + else if (!s.IsGroup) + s.Notice = "Einzelkontakt"; servicesBillable.Add(s); } } diff --git a/ReportImp/TrialogReports/SettlementReport.Designer.cs b/ReportImp/TrialogReports/SettlementReport.Designer.cs index 3e4772d86..948963482 100644 --- a/ReportImp/TrialogReports/SettlementReport.Designer.cs +++ b/ReportImp/TrialogReports/SettlementReport.Designer.cs @@ -79,6 +79,7 @@ namespace BeWo.TrialogReports this.xrTableCell50 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell51 = new DevExpress.XtraReports.UI.XRTableCell(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); @@ -380,6 +381,7 @@ namespace BeWo.TrialogReports // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel7, this.xrLabel1, this.xrLabel16, this.xrTable3}); @@ -633,6 +635,17 @@ namespace BeWo.TrialogReports // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO); // + // xrLabel7 + // + this.xrLabel7.CanShrink = true; + this.xrLabel7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "FehlkontakteString")}); + this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0.001653036F, 156.625F); + this.xrLabel7.Name = "xrLabel7"; + this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel7.SizeF = new System.Drawing.SizeF(704.5833F, 23F); + this.xrLabel7.Text = "xrLabel9"; + // // Spitzabrechnung // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -713,5 +726,6 @@ namespace BeWo.TrialogReports private DevExpress.XtraReports.UI.XRRichText xrRichText2; private DevExpress.XtraReports.UI.XRLabel xrLabel1; private DevExpress.XtraReports.UI.XRLabel xrLabel16; + private DevExpress.XtraReports.UI.XRLabel xrLabel7; } } diff --git a/ReportImp/TrialogReports/SettlementReport2.Designer.cs b/ReportImp/TrialogReports/SettlementReport2.Designer.cs index a51f09570..375501151 100644 --- a/ReportImp/TrialogReports/SettlementReport2.Designer.cs +++ b/ReportImp/TrialogReports/SettlementReport2.Designer.cs @@ -87,6 +87,7 @@ namespace BeWo.TrialogReports.Alt this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.xrCrossBandBox1 = new DevExpress.XtraReports.UI.XRCrossBandBox(); this.xrCrossBandBox2 = new DevExpress.XtraReports.UI.XRCrossBandBox(); + this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); @@ -592,6 +593,7 @@ namespace BeWo.TrialogReports.Alt // GroupHeader1 // this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel9, this.xrRichText3, this.xrLabel11, this.xrLabel6, @@ -741,6 +743,17 @@ namespace BeWo.TrialogReports.Alt this.xrCrossBandBox2.StartPointFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrCrossBandBox2.WidthF = 45.83333F; // + // xrLabel9 + // + this.xrLabel9.CanShrink = true; + this.xrLabel9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "FehlkontakteString")}); + this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(0.003608068F, 401F); + this.xrLabel9.Name = "xrLabel9"; + this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 96F); + this.xrLabel9.SizeF = new System.Drawing.SizeF(527.0834F, 23F); + this.xrLabel9.Text = "xrLabel9"; + // // Spitzabrechnung // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -832,5 +845,6 @@ namespace BeWo.TrialogReports.Alt private DevExpress.XtraReports.UI.XRCrossBandBox xrCrossBandBox2; private DevExpress.XtraReports.UI.XRRichText xrRichText4; private DevExpress.XtraReports.UI.XRRichText xrRichText3; + private DevExpress.XtraReports.UI.XRLabel xrLabel9; } } diff --git a/ReportImp/TrialogReports/SettlementReportAlt.Designer.cs b/ReportImp/TrialogReports/SettlementReportAlt.Designer.cs index 3fc21bd15..f442f1ef9 100644 --- a/ReportImp/TrialogReports/SettlementReportAlt.Designer.cs +++ b/ReportImp/TrialogReports/SettlementReportAlt.Designer.cs @@ -85,6 +85,7 @@ namespace BeWo.TrialogReports.Alt this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); @@ -590,6 +591,7 @@ namespace BeWo.TrialogReports.Alt // GroupHeader1 // this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel1, this.xrPictureBox1, this.xrRichText3, this.xrLabel10, @@ -717,6 +719,17 @@ namespace BeWo.TrialogReports.Alt // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO); // + // xrLabel1 + // + this.xrLabel1.CanShrink = true; + this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "FehlkontakteString")}); + this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 393.1875F); + this.xrLabel1.Name = "xrLabel1"; + this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel1.SizeF = new System.Drawing.SizeF(539.9999F, 23F); + this.xrLabel1.Text = "xrLabel9"; + // // SpitzabrechnungAlt // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -803,5 +816,6 @@ namespace BeWo.TrialogReports.Alt private DevExpress.XtraReports.UI.XRRichText xrRichText3; private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1; private DevExpress.XtraReports.UI.XRRichText xrRichText4; + private DevExpress.XtraReports.UI.XRLabel xrLabel1; } }