diff --git a/ReportImp/AWOMuensterlandRecklinghausen/Reporting/KannAllesWeissAllesRO.cs b/ReportImp/AWOMuensterlandRecklinghausen/Reporting/KannAllesWeissAllesRO.cs index 26ffecf9f..c3dc59484 100644 --- a/ReportImp/AWOMuensterlandRecklinghausen/Reporting/KannAllesWeissAllesRO.cs +++ b/ReportImp/AWOMuensterlandRecklinghausen/Reporting/KannAllesWeissAllesRO.cs @@ -141,6 +141,8 @@ namespace AWOMuensterlandRecklinghausen.Reporting cr.Klienteninformationen.Ab = VarfieldHelper.GetKlientenVarfields(customer, 26); if (customer.CustomerVarFields.Count >= 14) cr.Klienteninformationen.LeitungInfo = VarfieldHelper.GetKlientenVarfields(customer, 27); + if (customer.CustomerVarFields.Count >= 15) + cr.Klienteninformationen.BetreuungsVertrag = VarfieldHelper.GetKlientenVarfields(customer, 28); } //if (customer.LastName == "Coerdt") //Console.WriteLine("Test"); diff --git a/ReportImp/AWOMuensterlandRecklinghausen/Reporting/Klienteninformationen.cs b/ReportImp/AWOMuensterlandRecklinghausen/Reporting/Klienteninformationen.cs index b9b5ff69e..506ed0085 100644 --- a/ReportImp/AWOMuensterlandRecklinghausen/Reporting/Klienteninformationen.cs +++ b/ReportImp/AWOMuensterlandRecklinghausen/Reporting/Klienteninformationen.cs @@ -31,6 +31,7 @@ namespace AWOMuensterlandRecklinghausen.Reporting public string GeplanteStunden { get; set; } public string Ab { get; set; } public string LeitungInfo { get; set; } + public string BetreuungsVertrag { get; set; } } } \ No newline at end of file diff --git a/ReportImp/AWOMuensterlandRecklinghausen/Reporting/VarfieldHelper.cs b/ReportImp/AWOMuensterlandRecklinghausen/Reporting/VarfieldHelper.cs index d0e9f21ec..37afa8df1 100644 --- a/ReportImp/AWOMuensterlandRecklinghausen/Reporting/VarfieldHelper.cs +++ b/ReportImp/AWOMuensterlandRecklinghausen/Reporting/VarfieldHelper.cs @@ -68,6 +68,9 @@ namespace AWOMuensterlandRecklinghausen.Reporting case 27: // Leitung/Info valueAsString = vv.VarFieldValue.ToString(); break; + case 28: // Betreuungsvertrag + valueAsString = vv.VarFieldValue as bool? == true ? "Ja" : "Nein"; + break; } } diff --git a/ReportImp/AWOMuensterlandRecklinghausen/SBListe.Designer.cs b/ReportImp/AWOMuensterlandRecklinghausen/SBListe.Designer.cs index a78adc349..4aa875b7c 100644 --- a/ReportImp/AWOMuensterlandRecklinghausen/SBListe.Designer.cs +++ b/ReportImp/AWOMuensterlandRecklinghausen/SBListe.Designer.cs @@ -88,7 +88,7 @@ namespace AWOMuensterlandRecklinghausen this.xrTableCell66 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell67 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell68 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell75 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell140 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell76 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell77 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell78 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -116,7 +116,6 @@ namespace AWOMuensterlandRecklinghausen this.xrTableCell120 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell121 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell122 = new DevExpress.XtraReports.UI.XRTableCell(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.PageHeader = new DevExpress.XtraReports.UI.PageHeaderBand(); this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); @@ -161,7 +160,7 @@ namespace AWOMuensterlandRecklinghausen this.xrTableCell34 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell36 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell69 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell139 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell70 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell71 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell72 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -191,9 +190,12 @@ namespace AWOMuensterlandRecklinghausen this.xrTableCell105 = new DevExpress.XtraReports.UI.XRTableCell(); this.calculatedField1 = new DevExpress.XtraReports.UI.CalculatedField(); this.CheckKostenstelle = new DevExpress.XtraReports.UI.FormattingRule(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.xrTableCell69 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell75 = new DevExpress.XtraReports.UI.XRTableCell(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -314,7 +316,7 @@ namespace AWOMuensterlandRecklinghausen this.xrTable2.Name = "xrTable2"; this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow2}); - this.xrTable2.SizeF = new System.Drawing.SizeF(6886F, 25F); + this.xrTable2.SizeF = new System.Drawing.SizeF(6944.096F, 25F); this.xrTable2.StylePriority.UseFont = false; // // xrTableRow2 @@ -362,6 +364,7 @@ namespace AWOMuensterlandRecklinghausen this.xrTableCell67, this.xrTableCell68, this.xrTableCell75, + this.xrTableCell140, this.xrTableCell76, this.xrTableCell77, this.xrTableCell78, @@ -1133,23 +1136,25 @@ namespace AWOMuensterlandRecklinghausen this.xrTableCell68.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; this.xrTableCell68.Weight = 0.942476703993125D; // - // xrTableCell75 + // xrTableCell140 // - this.xrTableCell75.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + this.xrTableCell140.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell75.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "AllCustomerRelations.ApprovedTotal", "{0:0.00}")}); - this.xrTableCell75.Font = new DevExpress.Drawing.DXFont("Calibri", 11.25F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + this.xrTableCell140.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "AllCustomerRelations.ApprovedTotal")}); + this.xrTableCell140.Font = new DevExpress.Drawing.DXFont("Calibri", 11.25F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); - this.xrTableCell75.Name = "xrTableCell75"; - this.xrTableCell75.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 0, 2, 0, 100F); - this.xrTableCell75.StylePriority.UseBorders = false; - this.xrTableCell75.StylePriority.UseFont = false; - this.xrTableCell75.StylePriority.UsePadding = false; - this.xrTableCell75.StylePriority.UseTextAlignment = false; - this.xrTableCell75.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - this.xrTableCell75.Weight = 0.31409280797531486D; + this.xrTableCell140.Multiline = true; + this.xrTableCell140.Name = "xrTableCell140"; + this.xrTableCell140.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 0, 2, 0, 100F); + this.xrTableCell140.StylePriority.UseBorders = false; + this.xrTableCell140.StylePriority.UseFont = false; + this.xrTableCell140.StylePriority.UsePadding = false; + this.xrTableCell140.StylePriority.UseTextAlignment = false; + this.xrTableCell140.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.xrTableCell140.TextFormatString = "{0:0.00}"; + this.xrTableCell140.Weight = 0.31410732846637196D; // // xrTableCell76 // @@ -1637,10 +1642,6 @@ namespace AWOMuensterlandRecklinghausen this.xrTableCell122.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; this.xrTableCell122.Weight = 0.38725018572163306D; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(AWOMuensterlandRecklinghausen.Reporting.KannAllesWeissAllesRO); - // // PageHeader // this.PageHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -1654,7 +1655,7 @@ namespace AWOMuensterlandRecklinghausen this.xrTable1.Name = "xrTable1"; this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow1}); - this.xrTable1.SizeF = new System.Drawing.SizeF(6886F, 25F); + this.xrTable1.SizeF = new System.Drawing.SizeF(6944.096F, 25F); // // xrTableRow1 // @@ -1701,6 +1702,7 @@ namespace AWOMuensterlandRecklinghausen this.xrTableCell35, this.xrTableCell36, this.xrTableCell69, + this.xrTableCell139, this.xrTableCell70, this.xrTableCell71, this.xrTableCell72, @@ -2429,22 +2431,23 @@ namespace AWOMuensterlandRecklinghausen this.xrTableCell36.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; this.xrTableCell36.Weight = 0.942472252666353D; // - // xrTableCell69 + // xrTableCell139 // - this.xrTableCell69.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + this.xrTableCell139.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell69.Font = new DevExpress.Drawing.DXFont("Calibri", 11.25F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + this.xrTableCell139.Font = new DevExpress.Drawing.DXFont("Calibri", 11.25F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); - this.xrTableCell69.Name = "xrTableCell69"; - this.xrTableCell69.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 0, 2, 0, 100F); - this.xrTableCell69.StylePriority.UseBorders = false; - this.xrTableCell69.StylePriority.UseFont = false; - this.xrTableCell69.StylePriority.UsePadding = false; - this.xrTableCell69.StylePriority.UseTextAlignment = false; - this.xrTableCell69.Text = "Bew Std"; - this.xrTableCell69.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - this.xrTableCell69.Weight = 0.314091725538572D; + this.xrTableCell139.Multiline = true; + this.xrTableCell139.Name = "xrTableCell139"; + this.xrTableCell139.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 0, 2, 0, 100F); + this.xrTableCell139.StylePriority.UseBorders = false; + this.xrTableCell139.StylePriority.UseFont = false; + this.xrTableCell139.StylePriority.UsePadding = false; + this.xrTableCell139.StylePriority.UseTextAlignment = false; + this.xrTableCell139.Text = "Bew Std"; + this.xrTableCell139.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.xrTableCell139.Weight = 0.31410629795308731D; // // xrTableCell70 // @@ -2917,6 +2920,47 @@ namespace AWOMuensterlandRecklinghausen this.CheckKostenstelle.Formatting.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128))))); this.CheckKostenstelle.Name = "CheckKostenstelle"; // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(AWOMuensterlandRecklinghausen.Reporting.KannAllesWeissAllesRO); + // + // xrTableCell69 + // + this.xrTableCell69.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell69.Font = new DevExpress.Drawing.DXFont("Calibri", 11.25F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); + this.xrTableCell69.Multiline = true; + this.xrTableCell69.Name = "xrTableCell69"; + this.xrTableCell69.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 0, 2, 0, 100F); + this.xrTableCell69.StylePriority.UseBorders = false; + this.xrTableCell69.StylePriority.UseFont = false; + this.xrTableCell69.StylePriority.UsePadding = false; + this.xrTableCell69.StylePriority.UseTextAlignment = false; + this.xrTableCell69.Text = "BV"; + this.xrTableCell69.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.xrTableCell69.Weight = 0.31410629795308731D; + // + // xrTableCell75 + // + this.xrTableCell75.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell75.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "AllCustomerRelations.Klienteninformationen.BetreuungsVertrag")}); + this.xrTableCell75.Font = new DevExpress.Drawing.DXFont("Calibri", 11.25F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); + this.xrTableCell75.Multiline = true; + this.xrTableCell75.Name = "xrTableCell75"; + this.xrTableCell75.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 0, 2, 0, 100F); + this.xrTableCell75.StylePriority.UseBorders = false; + this.xrTableCell75.StylePriority.UseFont = false; + this.xrTableCell75.StylePriority.UsePadding = false; + this.xrTableCell75.StylePriority.UseTextAlignment = false; + this.xrTableCell75.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.xrTableCell75.Weight = 0.31410732846637196D; + // // SBListe // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -2933,9 +2977,9 @@ namespace AWOMuensterlandRecklinghausen this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] { this.CheckKostenstelle}); this.Landscape = true; - this.Margins = new DevExpress.Drawing.DXMargins(4F, 10F, 50F, 34F); + this.Margins = new DevExpress.Drawing.DXMargins(4F, 15F, 50F, 34F); this.PageHeight = 1654; - this.PageWidth = 6900; + this.PageWidth = 6980; this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.Custom; this.StyleSheet.AddRange(new DevExpress.XtraReports.UI.XRControlStyle[] { this.Title, @@ -2946,8 +2990,8 @@ namespace AWOMuensterlandRecklinghausen xrWatermark1.Id = "Watermark1"; this.Watermarks.Add(xrWatermark1); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -3040,13 +3084,11 @@ namespace AWOMuensterlandRecklinghausen private DevExpress.XtraReports.UI.XRTableCell xrTableCell66; private DevExpress.XtraReports.UI.XRTableCell xrTableCell67; private DevExpress.XtraReports.UI.XRTableCell xrTableCell68; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell75; private DevExpress.XtraReports.UI.XRTableCell xrTableCell76; private DevExpress.XtraReports.UI.XRTableCell xrTableCell77; private DevExpress.XtraReports.UI.XRTableCell xrTableCell78; private DevExpress.XtraReports.UI.XRTableCell xrTableCell79; private DevExpress.XtraReports.UI.XRTableCell xrTableCell80; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell69; private DevExpress.XtraReports.UI.XRTableCell xrTableCell70; private DevExpress.XtraReports.UI.XRTableCell xrTableCell71; private DevExpress.XtraReports.UI.XRTableCell xrTableCell72; @@ -3113,5 +3155,9 @@ namespace AWOMuensterlandRecklinghausen private DevExpress.XtraReports.UI.XRTableCell xrTableCell128; private DevExpress.XtraReports.UI.XRTableCell xrTableCell138; private DevExpress.XtraReports.UI.XRTableCell xrTableCell137; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell140; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell139; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell75; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell69; } }