From 9d8e799bafc28425272f45c882394f2b6fc6b49a Mon Sep 17 00:00:00 2001 From: Marcel Hirschle Date: Wed, 10 Nov 2021 14:28:00 +0100 Subject: [PATCH] mh --- BeWo/View/Detail/Report/IcfImportControl.xaml.cs | 4 +++- .../PZDDuesseldorf/SettlementReport.Designer.cs | 14 +++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/BeWo/View/Detail/Report/IcfImportControl.xaml.cs b/BeWo/View/Detail/Report/IcfImportControl.xaml.cs index 3807b3d91..168646e31 100644 --- a/BeWo/View/Detail/Report/IcfImportControl.xaml.cs +++ b/BeWo/View/Detail/Report/IcfImportControl.xaml.cs @@ -73,7 +73,9 @@ namespace BeWo.View.Detail.Report private static SupportConceptGoalDC GetSupportConceptGoal(SupportConceptGoalDC parent, ValueListEntryDC actual, List allIcfs) { - // Erzeugt das O + // Hier muss eine zusätzliche Verschachtelungsstufe erstellt werden, also ICF -> Kategorie -> Einschränkungsarten/Ziele + + // Erzeugt das Objekt var goalItem = new SupportConceptGoalDC { GoalEntryDC = actual, diff --git a/ReportImp/PZDDuesseldorf/SettlementReport.Designer.cs b/ReportImp/PZDDuesseldorf/SettlementReport.Designer.cs index 735a74e20..e84375154 100644 --- a/ReportImp/PZDDuesseldorf/SettlementReport.Designer.cs +++ b/ReportImp/PZDDuesseldorf/SettlementReport.Designer.cs @@ -93,6 +93,7 @@ namespace PZDDuesseldorf this.xrTableRow15 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrTable4 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow30 = new DevExpress.XtraReports.UI.XRTableRow(); @@ -118,13 +119,12 @@ namespace PZDDuesseldorf this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -780,6 +780,10 @@ namespace PZDDuesseldorf this.xrTableCell23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; this.xrTableCell23.Weight = 0.21685899000901443D; // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO); + // // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -1049,10 +1053,6 @@ namespace PZDDuesseldorf this.xrLabel14.StylePriority.UseFont = false; this.xrLabel14.Text = "Deutsche Bank\r\nDEUTDEDBDUE\r\nDE50 3007 0024 0811 0470 00"; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO); - // // Spitzabrechnung // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -1078,8 +1078,8 @@ namespace PZDDuesseldorf ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); }