cleanup

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/reports@6239 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/LayoutPanel.cs

@@ -7,18 +7,9 @@
  * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern.
  */
 using System;
-using System.Data;
-using System.Data.Common;
 using System.Drawing;
-using System.Globalization;
-using System.Windows.Forms;
-using System.Xml;
-
 using ICSharpCode.Core;
 using ICSharpCode.Reports.Core;
-using ICSharpCode.SharpDevelop;
-using ICSharpCode.SharpDevelop.Gui;
-
 
 
 namespace ICSharpCode.Reports.Addin.ReportWizard
@@ -28,34 +19,49 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
 	/// </summary>
 	public class LayoutPanel: AbstractWizardPanel
 	{
-		private LayoutPanelControl lpc;
+		private LayoutPanelControl layoutControl;
 		private Properties customizer;
+		private ReportStructure reportStructure;
 		
 		public LayoutPanel()
 		{
-			base.EnableFinish = true;
+		base.EnableFinish = true;
 			base.EnableCancel = true;
 			base.EnableNext = true;
 			base.Refresh();
-			lpc = new LayoutPanelControl();
-			lpc.Location = new Point (20,20);
-			this.Controls.Add(lpc);
+			layoutControl = new LayoutPanelControl();
+			layoutControl.Location = new Point (20,20);
+			this.Controls.Add(layoutControl);
+		
 		}
 		
 		
 		public override bool ReceiveDialogMessage(DialogMessage message)
 		{
+			base.EnableFinish = true;
+			base.IsLastPanel = true;
+			base.EnablePrevious = true;
+			
 			if (customizer == null) {
 				customizer = (Properties)base.CustomizationObject;
 			}
 			
 			if (message == DialogMessage.Activated) {
-				base.EnableFinish = true;
-				this.lpc.ReportLayout = (GlobalEnums.ReportLayout)customizer.Get("ReportLayout");
+				
+				this.layoutControl.ReportLayout = (GlobalEnums.ReportLayout)customizer.Get("ReportLayout");
+				reportStructure = (ReportStructure)customizer.Get("Generator");
+				layoutControl.AvailableFieldsCollection = reportStructure.AvailableFieldsCollection;
+				
 			}
-			
-			else if (message == DialogMessage.Finish) {
-				customizer.Set ("ReportLayout",this.lpc.ReportLayout);
+			else if (message == DialogMessage.Next)
+			{
+				Console.WriteLine("aa");
+			}
+			else if (message == DialogMessage.Finish)
+			{
+				customizer.Set ("ReportLayout",this.layoutControl.ReportLayout);
+				var reportStructure = (ReportStructure)customizer.Get("Generator");
+				reportStructure.Grouping = layoutControl.GroupName;
 			}
 			return true;
 		}

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/PullModelPanel.cs

@@ -70,13 +70,6 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
 			base.IsLastPanel = false;
 			commandType = CommandType.Text;
 			this.txtSqlString.Enabled = false;
-
-            this.databasesTreeHost = new ElementHost() { Dock = DockStyle.Fill };
-            this.databasesTree = new DatabasesTreeView();
-            this.databasesTree.SelectedItemChanged += new System.Windows.RoutedPropertyChangedEventHandler<object>(databasesTree_SelectedItemChanged);
-            this.databasesTreeHost.Child = this.databasesTree;
-            this.label2.Controls.Add(databasesTreeHost);
-
 			Localize();
 		}	
 	
@@ -107,10 +100,29 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
 				reportStructure.SqlString = this.txtSqlString.Text.Trim();
 				reportStructure.ConnectionString = connectionString;
 				base.EnableFinish = true;
+				WriteResult();
+			}
+			else if (message == DialogMessage.Next) {
+				WriteResult();
+				base.EnableNext = true;
+				base.EnableFinish = true;
 			}
 			return true;
 		}
 		
+		private void WriteResult ()
+		{
+			if (currentNode is SharpQueryNodeProcedure) {
+				commandType = CommandType.StoredProcedure;
+			} else {
+				commandType = CommandType.Text;
+			}
+			customizer.Set("SqlString", this.txtSqlString.Text.Trim());
+			reportStructure.CommandType = commandType;
+			reportStructure.SqlString = this.txtSqlString.Text.Trim();
+			reportStructure.ConnectionString = connectionString;
+		}
+			
 		#endregion
 		
 		#region events
@@ -293,7 +305,7 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
 		
 		
 		// check witch type of node we dragg
-		private static NodeType CheckCurrentNode (IDatabaseObjectBase node) {
+		private static NodeType CheckCurrentNode (ISharpQueryNode node) {
 			NodeType enm;
 			if (node is IColumn) {
 				enm = NodeType.ColumnImage;

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/ResultPanel.cs

@@ -5,7 +5,6 @@
 //     <version>$Revision$</version>
 // </file>
 
-using ICSharpCode.Core.WinForms;
 using System;
 using System.Data;
 using System.Data.Common;
@@ -13,10 +12,11 @@ using System.Drawing;
 using System.Globalization;
 using System.Windows.Forms;
 using System.Xml;
+
 using ICSharpCode.Core;
+using ICSharpCode.Core.WinForms;
 using ICSharpCode.Reports.Core;
 using ICSharpCode.SharpDevelop;
-using ICSharpCode.SharpDevelop.Gui;
 
 
 namespace ICSharpCode.Reports.Addin.ReportWizard
@@ -38,7 +38,6 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
 		private ReportModel model;
 		private ConnectionObject connectionObject;
 		private DataSet resultDataSet;
-		//private ParameterCollection sqlParamsCollection;
 		
 		
 		#region Constructor
@@ -260,7 +259,8 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
 				customizer = (Properties)base.CustomizationObject;
 				reportStructure = (ReportStructure)customizer.Get("Generator");
 			}
-			if (message == DialogMessage.Activated) {
+			if (message == DialogMessage.Activated) 
+			{
 				this.model = reportStructure.CreateAndFillReportModel();
 				this.resultDataSet =  FillGrid();
 				
@@ -277,11 +277,31 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
 				}
 				base.EnableNext = true;
 				base.EnableFinish = true;
-			} else if (message == DialogMessage.Finish) {
+				
+			} 
+			else if (message == DialogMessage.Next)
+			{
+				base.EnableNext = true;
+				base.EnableFinish = true;
+				WriteResult();
+			}
+			else if (message == DialogMessage.Finish)
+			{
+				WriteResult();
+				
+				base.EnableNext = true;
+				base.EnableFinish = true;
+			}
+			return true;
+		}
+		
+		private void WriteResult ()
+		{
 				if (this.resultDataSet != null) {
 					// check reordering of columns
 					DataGridViewColumn[] displayCols;
 					DataGridViewColumnCollection dc = this.grdQuery.Columns;
+					
 					displayCols = new DataGridViewColumn[dc.Count];
 					for (int i = 0; i < dc.Count; i++){
 						if (dc[i].Visible) {
@@ -289,11 +309,14 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
 						}
 					}
 					
-					// only checked columns are used in the report
-					ReportItemCollection sourceItems = WizardHelper.DataItemsFromDataSet(this.resultDataSet);
-					AvailableFieldsCollection abstractColumns = WizardHelper.AbstractColumnsFromDataSet(this.resultDataSet);
+					
+					ReportItemCollection sourceItems = WizardHelper.ReportItemCollection(this.resultDataSet);
+					
+					AvailableFieldsCollection abstractColumns = WizardHelper.AvailableFieldsCollection(this.resultDataSet);
+					
 					ReportItemCollection destItems = new ReportItemCollection();
 					
+					// only checked columns are used in the report
 					foreach (DataGridViewColumn cc in displayCols) {
 						DataGridViewColumnHeaderCheckBoxCell hc= (DataGridViewColumnHeaderCheckBoxCell)cc.HeaderCell;
 						if (hc.Checked) {
@@ -301,6 +324,8 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
 							destItems.Add(br);
 						}
 					}
+					
+					reportStructure.ReportItemCollection.Clear();
 					reportStructure.ReportItemCollection.AddRange(destItems);
 					/*
 					if ((this.sqlParamsCollection != null) && (this.sqlParamsCollection.Count > 0)) {
@@ -308,15 +333,18 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
 					}
 					*/
 					if (abstractColumns != null) {
+						reportStructure.AvailableFieldsCollection.Clear();
 						reportStructure.AvailableFieldsCollection.AddRange(abstractColumns);
 					}
+					
+					if ((this.sqlParamsCollection != null) && (this.sqlParamsCollection.Count > 0)) {
+						reportStructure.SqlQueryParameters.Clear();
+						reportStructure.SqlQueryParameters.AddRange(sqlParamsCollection);
+					}
 				}
 				base.EnableNext = true;
 				base.EnableFinish = true;
-			}
-			return true;
 		}
-		
 		#endregion
 		
 		protected override void Dispose(bool disposing)