FormSheet-Report Wizard

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Commands/ViewCommands.cs

@@ -24,33 +24,30 @@ namespace ICSharpCode.Reports.Addin.Commands
 		
 		public override void Run()
 		{
-//			WorkbenchSingleton.Workbench.ShowView(SetupDesigner());
-			throw new NotImplementedException("Run");
+			WorkbenchSingleton.Workbench.ShowView(SetupDesigner());
 		}
 		
-		/*
-		private static ReportDesignerView SetupDesigner ()
+		public static ReportDesignerView SetupDesigner ()
 		{
 			
 			ReportModel model = ReportModel.Create();
-			Properties properties = new Properties();
-			properties.Set("ReportLayout",GlobalEnums.ReportLayout.ListLayout);
-			IReportGenerator generator = new GeneratePlainReport(model,properties);
+			Properties customizer = new Properties();
+			customizer.Set("ReportLayout",GlobalEnums.ReportLayout.ListLayout);
+			IReportGenerator generator = new GeneratePlainReport(model);
 			generator.GenerateReport();
-			Console.WriteLine("--Rework-----StartViewCommand----------");
+			
 //			OpenedFile file = FileService.CreateUntitledOpenedFile(GlobalValues.PlainFileName,new byte[0]);
 //			file.SetData(generator.Generated.ToArray());
 //			return SetupDesigner(file);
 			return SetupDesigner(null);
 		}
-		*/
+		
 		
 		public static ReportDesignerView SetupDesigner (OpenedFile file)
 		{
 			if (file == null) {
 				throw new ArgumentNullException("file");
 			}
-			Console.WriteLine("StartViewCommand.SetupDesigner");
 			IDesignerGenerator generator = new ReportDesignerGenerator();
 			return new ReportDesignerView(file, generator);
 		}

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/Generators/AbstractReportGenerator.cs

@@ -43,21 +43,15 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
 		
 		private ColumnCollection groupColumnCollection;
 		
-		protected AbstractReportGenerator(ReportModel reportModel,ReportStructure properties)
+		protected AbstractReportGenerator(ReportModel reportModel)
 		{
 			if (reportModel == null) {
 				throw new ArgumentNullException("reportModel");
 			}
 
-			if (properties == null) {
-				throw new ArgumentNullException("customizer");
-			}
-
 			this.ReportModel = reportModel;
 //			this.Properties = properties;
-//			ReportStructure = (ReportStructure)properties.Get("Generator");
-//			ReportStructure = (ReportStructure)base.CustomizationObject;
-			ReportStructure = properties;
+			
 			this.AvailableFieldsCollection.Clear();
 			this.ReportItemCollection.Clear();
 			this.GroupColumnCollection.Clear();

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/Generators/GenerateFormSheetReport.cs

@@ -15,8 +15,8 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
 	/// </summary>
 	public class GenerateFormSheetReport:GeneratePlainReport
 	{
-		public GenerateFormSheetReport(ReportModel reportModel,                              
-		                               ReportStructure customizer):base(reportModel,customizer)
+		public GenerateFormSheetReport(ReportModel reportModel ):base(reportModel)                             
+		                           
 		{
 		                             	
 			if (reportModel == null) {

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/Generators/GeneratePlainReport.cs

@@ -15,16 +15,8 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
 	public class GeneratePlainReport:AbstractReportGenerator
 	{
 		
-		public GeneratePlainReport(ReportModel reportModel,ReportStructure customizer):base(reportModel,customizer)
-		{
-			if (reportModel == null) {
-				throw new ArgumentNullException("reportModel");
-			}
-			
-			if (base.ReportModel.ReportSettings.DataModel != GlobalEnums.PushPullModel.FormSheet) {
-				throw new InvalidReportModelException();
-			}
-		}
+		public GeneratePlainReport(ReportModel reportModel):base(reportModel)
+		{}
 		
 		
 		public override void GenerateReport()

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/Generators/GeneratePullDataReport.cs

@@ -16,9 +16,7 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
 	{
 		
 		
-		public GeneratePullDataReport(ReportModel reportModel,	                             
-		                              ReportStructure properties):base(reportModel,properties)
-		                              	
+		public GeneratePullDataReport(ReportModel reportModel):base(reportModel)		                              		                             	                         
 		{
 			if (reportModel == null) {
 				throw new ArgumentNullException("reportModel");

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/Generators/GeneratePushDataReport.cs

@@ -24,10 +24,7 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
 		/// <summary>
 		/// Default constructor - initializes all fields to default values
 		/// </summary>
-		public GeneratePushDataReport(ReportModel reportModel,		                              
-		                              ReportStructure properties):base(reportModel,properties)
-		{
-			
+		public GeneratePushDataReport(ReportModel reportModel):base(reportModel){		                              		                      
 			base.UpdateGenerator();
 			base.UpdateModel();
 		}

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/Generators/GeneratorFactory.cs

@@ -35,20 +35,20 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
 	public static class GeneratorFactory
 	{
 
-		public static IReportGenerator Create (ReportModel model,ReportStructure customizer)
-		                                      
+		public static IReportGenerator Create (ReportModel model,		                                     
+		                                       Properties customizer)
 		{	
 			IReportGenerator reportGenerator = null;
 				switch (model.DataModel) {
-//				case GlobalEnums.PushPullModel.PullData:
-//					reportGenerator = new GeneratePullDataReport(model,customizer);
-//					
-//					break;
-//				case GlobalEnums.PushPullModel.PushData:
-//					reportGenerator = new GeneratePushDataReport(model,customizer);
-//					break;
+				case GlobalEnums.PushPullModel.PullData:
+					reportGenerator = new GeneratePullDataReport(model);
+					
+					break;
+				case GlobalEnums.PushPullModel.PushData:
+					reportGenerator = new GeneratePushDataReport(model);
+					break;
 				case GlobalEnums.PushPullModel.FormSheet:
-					reportGenerator = new GenerateFormSheetReport (model,customizer);
+					reportGenerator = new GenerateFormSheetReport (model);
 					break;
 			}
 			return reportGenerator;

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/ReportWizardCommand.cs

@@ -23,6 +23,7 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
 		private OpenedFile file;
 		private ReportModel reportModel;
 		private IReportGenerator reportGenerator;
+		private Properties customizer = new Properties();
 		private ReportStructure reportStructure;
 		private bool canceled;
 		
@@ -36,12 +37,15 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
 		public override void Run()
 		{
 			reportStructure = new ReportStructure();
+//			customizer.Set("Generator", reportStructure);
+//			customizer.Set("ReportLayout",GlobalEnums.ReportLayout.ListLayout);
+			
 			if (GlobalValues.IsValidPrinter() == true) {
 				
 				using (WizardDialog wizard = new WizardDialog("Report Wizard", reportStructure, WizardPath)) {
 					if (wizard.ShowDialog() == DialogResult.OK) {
 						reportModel = reportStructure.CreateAndFillReportModel ();
-						CreateReportFromModel(reportModel,reportStructure);
+						CreateReportFromModel(reportModel);
 					}
 					else{
 						this.canceled = true;
@@ -53,7 +57,7 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
 		}
 		
 		
-		private void CreateReportFromModel (ReportModel model,ReportStructure customizer)
+		private void CreateReportFromModel (ReportModel model)
 		{
 			reportGenerator = GeneratorFactory.Create (model,customizer);
 			file.MakeDirty();

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

@@ -42,8 +42,10 @@ namespace ICSharpCode.Reports.Addin.ReportWizard{
 		private RadioButton radioStandardLayout;
 		private RadioButton radioLandscape;
 		
-		ReportStructure reportStructure;
-
+		ReportStructure generator;
+//		Properties customizer;
+//ReportStructure	ReportStructure customizer;
+	
 		bool initDone;
 	
 		public BaseSettingsPanel(){
@@ -156,35 +158,37 @@ namespace ICSharpCode.Reports.Addin.ReportWizard{
 		
 		private void UpdateGenerator ()
 		{
-			if (reportStructure == null) {
-				reportStructure = (ReportStructure)base.CustomizationObject;
-			}
+//			if (customizer == null) {
+//				customizer = (ReportStructure)base.CustomizationObject;
+//				generator = (ReportStructure)customizer.Get("Generator");
+				generator = (ReportStructure)base.CustomizationObject;
+//			}
 
-			reportStructure.ReportName = txtReportName.Text;
+			generator.ReportName = txtReportName.Text;
 			if (!this.txtFileName.Text.EndsWith(GlobalValues.ReportExtension,StringComparison.OrdinalIgnoreCase)){
-				reportStructure.FileName = txtFileName.Text + GlobalValues.ReportExtension;
+				generator.FileName = txtFileName.Text + GlobalValues.ReportExtension;
 			} else {
-				reportStructure.FileName = txtFileName.Text;
+				generator.FileName = txtFileName.Text;
 			}
-			reportStructure.Path = this.txtPath.Text;
-			reportStructure.GraphicsUnit = (GraphicsUnit)Enum.Parse(typeof(GraphicsUnit),
+			generator.Path = this.txtPath.Text;
+			generator.GraphicsUnit = (GraphicsUnit)Enum.Parse(typeof(GraphicsUnit),
 			                                                  this.cboGraphicsUnit.Text);
 
 			if (this.radioPullModell.Checked == true) {
 				base.NextWizardPanelID = "PullModel";
-				reportStructure.DataModel = GlobalEnums.PushPullModel.PullData;
+				generator.DataModel = GlobalEnums.PushPullModel.PullData;
 				GoOn();
 			} else if (this.radioPushModell.Checked == true){
 				base.NextWizardPanelID = "PushModel";
-				reportStructure.DataModel = GlobalEnums.PushPullModel.PushData;
+				generator.DataModel = GlobalEnums.PushPullModel.PushData;
 				GoOn();
 			} else if (this.radioFormSheet.Checked == true){
-				reportStructure.DataModel = GlobalEnums.PushPullModel.FormSheet;
+				generator.DataModel = GlobalEnums.PushPullModel.FormSheet;
 				base.EnableNext = false;
 				base.IsLastPanel = true;
 			}
 			
-			reportStructure.Landscape = this.radioLandscape.Checked;
+			generator.Landscape = this.radioLandscape.Checked;
 		}
 		
 		
@@ -194,19 +198,22 @@ namespace ICSharpCode.Reports.Addin.ReportWizard{
 				
 				if (this.radioPullModell.Checked == true) {
 					base.NextWizardPanelID = "PullModel";	
-					reportStructure.DataModel = GlobalEnums.PushPullModel.PullData;
+					generator.DataModel = GlobalEnums.PushPullModel.PullData;
 					GoOn();
 				} else if (this.radioPushModell.Checked == true){
 					base.NextWizardPanelID = "PushModel";
-					reportStructure.DataModel = GlobalEnums.PushPullModel.PushData;
+					generator.DataModel = GlobalEnums.PushPullModel.PushData;
 					GoOn();
 				} else if (this.radioFormSheet.Checked == true){
+//					generator.DataModel = GlobalEnums.PushPullModel.FormSheet;
 					base.EnableNext = false;
 					base.IsLastPanel = true;
 				} else if(this.radioStandardLayout.Checked == true) {
-					reportStructure.Landscape = false;
+					
+					generator.Landscape = false;
+					
 				} else if(this.radioLandscape.Checked == true) {
-					reportStructure.Landscape = true;
+					generator.Landscape = true;
 				}
 					
 				base.EnableFinish = true;

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

@@ -15,6 +15,7 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
 	public class LayoutPanel: AbstractWizardPanel
 	{
 		private LayoutPanelControl layoutControl;
+//		private Properties customizer;
 		private ReportStructure reportStructure;
 		
 		public LayoutPanel()
@@ -35,10 +36,7 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
 			base.EnableFinish = true;
 			base.IsLastPanel = true;
 			base.EnablePrevious = true;
-			
-			if (reportStructure == null) {
-				reportStructure = (ReportStructure)base.CustomizationObject;
-			}
+			reportStructure = (ReportStructure)base.CustomizationObject;
 			if (message == DialogMessage.Activated) {
 				layoutControl.AvailableFieldsCollection = reportStructure.AvailableFieldsCollection;
 			}

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

@@ -28,9 +28,7 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
 		private System.Windows.Forms.Label label3;
 		private bool firstDrag;
 		private string connectionString;
-		
 		private ReportStructure reportStructure;
-		
 		private IDatabaseObjectBase currentNode;
         private ElementHost databasesTreeHost;
         private DatabasesTreeView databasesTree;
@@ -77,13 +75,12 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
 		
 		public override bool ReceiveDialogMessage(DialogMessage message)
 		{
-			if (reportStructure == null) {
-				reportStructure = (ReportStructure)base.CustomizationObject;
-			}
 			
+			this.reportStructure = (ReportStructure)base.CustomizationObject;
+
 			if (message == DialogMessage.Next) {
-				reportStructure.ConnectionString = connectionString;
 				reportStructure.SqlString = this.txtSqlString.Text.Trim();
+				reportStructure.ConnectionString = connectionString;
 				base.EnableFinish = true;
 			}
 			return true;
@@ -164,8 +161,6 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
 					this.txtSqlString.Clear();
 					ITable table = draggedObject as ITable;
 					this.txtSqlString.Text = "SELECT * FROM " + table.Name;
-//					reportStructure.CommandType = CommandType.Text;
-//					reportStructure.IDatabaseObjectBase = table;
 					reportStructure.CommandType = CommandType.Text;
 					reportStructure.IDatabaseObjectBase = table;
 					break;

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

@@ -23,8 +23,10 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
 		private System.Windows.Forms.Button btnPath;
 		private System.Windows.Forms.CheckedListBox checkedListBox;
 		private System.Windows.Forms.TextBox txtPath;
-		private DataSet resultDataSet;
+		
 		private ReportStructure reportStructure;
+//		private Properties customizer;
+		private DataSet resultDataSet;
 		
 		public PushModelPanel()
 		{
@@ -82,11 +84,12 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
 		
 		public override bool ReceiveDialogMessage(DialogMessage message)
 		{
-//			if (customizer == null) {
-//				base.NextWizardPanelID = "Layout";
-//			}
+			
+			reportStructure = (ReportStructure)base.CustomizationObject;
 			base.NextWizardPanelID = "Layout";
-		 	if (message == DialogMessage.Activated) {
+			
+			
+			if (message == DialogMessage.Activated) {
 				WriteResult();
 				base.EnableNext = true;
 			}

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

@@ -34,9 +34,7 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
 		
 		private System.Windows.Forms.Label label1;
 		private System.Windows.Forms.TextBox txtSqlString;
-		
 		private ReportStructure reportStructure;
-//		private Properties customizer;
 		private ReportModel model;
 		private ConnectionObject connectionObject;
 		private DataSet resultDataSet;
@@ -232,12 +230,7 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
 		
 		public override bool ReceiveDialogMessage(DialogMessage message)
 		{
-//			if (customizer == null) {
-//				customizer = (Properties)base.CustomizationObject;
-////				reportStructure = (ReportStructure)customizer.Get("Generator");
-//			}
-			reportStructure = (ReportStructure)base.CustomizationObject;
-			
+		
 			if (message == DialogMessage.Activated) 
 			{
 				ShowData();

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Designer/ReportDesignerDisplayBindingTestFixture.cs

@@ -57,7 +57,7 @@ namespace ICSharpCode.Reports.Addin.Test.Designer
 			ReportModel model = ReportModel.Create();
 			Properties customizer = new Properties();
 			customizer.Set("ReportLayout",GlobalEnums.ReportLayout.ListLayout);
-			IReportGenerator generator = new GeneratePlainReport(model,customizer);
+			IReportGenerator generator = new GeneratePlainReport(model);
 			generator.GenerateReport();
 			MockOpenedFile mof = new MockOpenedFile(GlobalValues.PlainFileName);
 			OpenedFile file = new MockOpenedFile(GlobalValues.PlainFileName);

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/GeneratePlainReportFixture_1.cs

@@ -27,7 +27,7 @@ namespace ICSharpCode.Reports.Addin.Test.Wizard
 			Properties customizer = new Properties();
 			
 			customizer.Set("ReportLayout",GlobalEnums.ReportLayout.ListLayout);
-			IReportGenerator generator = new GeneratePlainReport(model,customizer);
+			IReportGenerator generator = new GeneratePlainReport(model);
 			generator.GenerateReport();
 			
 			XDocument doc1 = XDocument.Load(new XmlNodeReader (generator.XmlReport));
@@ -93,7 +93,7 @@ namespace ICSharpCode.Reports.Addin.Test.Wizard
 			Properties customizer = new Properties();
 			
 			customizer.Set("ReportLayout",GlobalEnums.ReportLayout.ListLayout);
-			IReportGenerator generator = new GeneratePlainReport(model,customizer);
+			IReportGenerator generator = new GeneratePlainReport(model);
 			generator.GenerateReport();
 			return generator.XmlReport;
 		}

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/Generators/GenerateFormsSheetReport.cs

@@ -12,7 +12,6 @@ namespace ICSharpCode.Reports.Addin.Test.Wizard
 {
 	/*
 	[TestFixture]
-	[Ignore]
 	public class GenerateFormsSheetReportFixture
 	{
 		
@@ -71,7 +70,7 @@ namespace ICSharpCode.Reports.Addin.Test.Wizard
 			Properties customizer = new Properties();
 			
 			customizer.Set("ReportLayout",GlobalEnums.ReportLayout.ListLayout);
-			IReportGenerator generator = new GenerateFormSheetReport(m,customizer);
+			IReportGenerator generator = new GenerateFormSheetReport(m);
 			generator.GenerateReport();
 			
 			ReportLoader rl = new ReportLoader();

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/Generators/GeneratePlainReportFixture_2.cs

@@ -78,7 +78,7 @@ namespace ICSharpCode.Reports.Addin.Test.Wizard
 			Properties customizer = new Properties();
 			
 			customizer.Set("ReportLayout",GlobalEnums.ReportLayout.ListLayout);
-			IReportGenerator generator = new GeneratePlainReport(m,customizer);
+			IReportGenerator generator = new GeneratePlainReport(m);
 			generator.GenerateReport();
 			
 			ReportLoader rl = new ReportLoader();

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/Generators/GenerateTableWithGrouping.cs

@@ -109,7 +109,7 @@ namespace ICSharpCode.Reports.Addin.Test.Wizard.Generators
 			customizer.Set("Generator", structure);
 			customizer.Set("ReportLayout",GlobalEnums.ReportLayout.TableLayout);
 			
-			IReportGenerator generator = new GeneratePushDataReport(m,customizer);
+			IReportGenerator generator = new GeneratePushDataReport(m);
 		
 			generator.GenerateReport();
 			

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/Generators/ReportGenerationHelper.cs

@@ -64,7 +64,7 @@ namespace ICSharpCode.Reports.Addin.Test.Wizard
 			
 			customizer.Set("Generator", structure);
 			customizer.Set("ReportLayout",GlobalEnums.ReportLayout.ListLayout);
-			IReportGenerator generator = new GeneratePushDataReport(m,customizer);
+			IReportGenerator generator = new GeneratePushDataReport(m);
 			generator.GenerateReport();
 			
 			ReportLoader rl = new ReportLoader();

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/ReportStructureFixture.cs

@@ -13,12 +13,7 @@ namespace ICSharpCode.Reports.Addin.Test.Wizard
 	[TestFixture]
 	public class ReportStructureFixture
 	{
-		[Test]
-		public void Constructore()
-		{
-			ReportStructure rs = new ReportStructure();
-			Assert.IsNotNull(rs,"ReportStructure should not be 'null'");
-		}
+		
 		
 		[Test]
 		public void FormSheetReport ()