diff --git a/samples/SharpDevelopReports/SampleReports/FormSheet/JCA.srd b/samples/SharpDevelopReports/SampleReports/FormSheet/JCA.srd
index 693ddcb7ce..9e74be01c4 100644
--- a/samples/SharpDevelopReports/SampleReports/FormSheet/JCA.srd
+++ b/samples/SharpDevelopReports/SampleReports/FormSheet/JCA.srd
@@ -1,26 +1,217 @@
-FormSheetTrueTextNo Data for this ReportFormSheet5, 5, 5, 5Millimeter8, 8Microsoft Sans Serif, 10ptReport150, 50, 50, 50FalseFalse50, 5050ReportHeaderFile103, 24ReportImageControl582, 50FalseReportImageControlWindowD:\SharpReportTester\TestReports\GoodFiles\Logos\Bannerbeige2.gifD:\SharpReportTester\TestReports\GoodFiles\Logos\Bannerbeige2.gifFalseFalse0WindowFalse718, 85False50, 15050ReportPageHeaderWindowFramereportTextItem190, 10reportTextItem1TopCenterTrue599, 57#develop Open Source Project
-Joint Copyright Assignment by Contributor To AlphaSierraPapaWhiteMicrosoft Sans Serif, 14pt, style=BoldFalseControlTextFlat10, 592, 82reportLineControl1597, 9reportLineControl1FlatSolidWhiteFlatControlText40, 51FalseFalse0WindowFalse718, 95False50, 26050ReportDetailWindowFramereportTextItem150, 8TopLeftTrue622, 135reportTextItem1Contact Information:
+
+
+
+
+ 8, 8
+ 827, 1169
+
+ False
+
+ 50
+ No Data for this Report
+ Microsoft Sans Serif, 10pt
+ FormSheet
+ True
+ Text
+ Millimeter
+ 50
+
+ 5, 5, 5, 5
+ 50
+
+ FormSheet
+ 50
+
+ Report1
+
+
+
+
+
+ 718, 85
+ ReportHeader
+ False
+ 50
+ 0
+ Window
+
+
+ File
+ 103, 24
+ ReportImageControl
+ 582, 50
+ False
+ Window
+ D:\SharpReportTester\TestReports\GoodFiles\Logos\Bannerbeige2.gif
+ D:\Reporting3.0_branches\SharpDevelop\samples\SharpDevelopReports\SampleReports\Logos\Bannerbeige2.gif
+
+
+ 50, 50
+ False
+
+
+ 718, 95
+ ReportPageHeader
+ False
+ 50
+ 0
+ Window
+
+
+ White
+ False
+ None
+ #develop Open Source Project
+Joint Copyright Assignment by Contributor To AlphaSierraPapa
+ 90, 10
+ TopCenter
+ False
+ False
+ Microsoft Sans Serif, 14pt, style=Bold
+ False
+
+ reportTextItem1
+ WindowFrame
+ 599, 57
+ ControlText
+
+
+ Flat
+ 10, 5
+ 92, 82
+ reportLineControl1
+ 597, 9
+ Flat
+ Solid
+ White
+ Flat
+ ControlText
+ 40, 5
+ 1
+
+
+ 50, 150
+ False
+
+
+ 718, 723
+ ReportDetail
+ False
+ 50
+ 0
+ Window
+
+
+ White
+ False
+ None
+ Contact Information:
Full Name:_________________________________ (the "Contributor")
Mailing Address_________________________ e-mail :_________________________
______________________________________ Telephone :_________________________
-Country:_______________________________ Facsimile :_________________________WhiteMicrosoft Sans Serif, 10ptTrueControlTextWindowFramereportTextItem250, 171TopLeftTrue675, 67reportTextItem21. Contributor owns, and has sufficient rights to contribute, all source code and related material intended
+Country:_______________________________ Facsimile :_________________________
+ 50, 8
+ TopLeft
+ False
+ True
+ Microsoft Sans Serif, 10pt
+ False
+
+ reportTextItem1
+ WindowFrame
+ 622, 135
+ ControlText
+
+
+ White
+ False
+ None
+ 1. Contributor owns, and has sufficient rights to contribute, all source code and related material intended
to be compiled or integrated with the source code for the #develop open source product (the
"Contribution") which Contributor has ever delivered, and AlphaSierraPapa has accepted, for
- incorporation into the technology made available under the #develop open source project.WhiteMicrosoft Sans Serif, 10ptTrueControlTextWindowFramereportTextItem350, 257TopLeftTrue695, 113reportTextItem32. Contributor hereby assigns to AlphaSierraPapa joint ownership in all worldwide common law and
+ incorporation into the technology made available under the #develop open source project.
+ 50, 171
+ TopLeft
+ False
+ True
+ Microsoft Sans Serif, 10pt
+ False
+
+ reportTextItem2
+ WindowFrame
+ 675, 67
+ ControlText
+
+
+ White
+ False
+ None
+ 2. Contributor hereby assigns to AlphaSierraPapa joint ownership in all worldwide common law and
statutory rights associated with the copyrights, copyright application, copyright registration and moral
rights in the Contribution to the extent allowable under applicable local laws and copyright
conventions. Contributor agrees that this assignment may be submitted by AlphaSierraPapa to register
a copyright in the Contribution. Contributor retains the right to use the Contribution for Contributor's
own purposes. This Joint Copyright Assignment supersedes and replaces all prior copyright
- assignments made by Contributor to AlphaSierraPapa under the #develop project.WhiteMicrosoft Sans Serif, 10ptTrueControlTextWindowFramereportTextItem450, 380TopLeftTrue696, 373. Contributor is legally entitled to grant the above assignment and agrees not to provide any
- Contribution that violates any law or breaches any contract.reportTextItem4WhiteMicrosoft Sans Serif, 10ptFalseControlTextWindowFramereportTextItem5reportTextItem550, 443TopLeftTrue695, 80Signed:________________________________________ Date_______________
+ assignments made by Contributor to AlphaSierraPapa under the #develop project.
+ 50, 257
+ TopLeft
+ False
+ True
+ Microsoft Sans Serif, 10pt
+ False
+
+ reportTextItem3
+ WindowFrame
+ 695, 113
+ ControlText
+
+
+ White
+ False
+ None
+ 3. Contributor is legally entitled to grant the above assignment and agrees not to provide any
+ Contribution that violates any law or breaches any contract.
+ 50, 380
+ TopLeft
+ False
+ False
+ Microsoft Sans Serif, 10pt
+ False
+
+ reportTextItem4
+ WindowFrame
+ 696, 37
+ ControlText
+
+
+ White
+ False
+ None
+ Signed:________________________________________ Date_______________
Printed Name:__________________________________
-Please send a signed copy of this assignment by facsimile to AlphaSierraPapa at:WhiteMicrosoft Sans Serif, 10ptTrueControlTextreportTextItem6WindowFramereportTextItem650, 551TopLeftTrue213, 139+43-3842-22620
+Please send a signed copy of this assignment by facsimile to AlphaSierraPapa at:
+ 50, 443
+ TopLeft
+ False
+ True
+ Microsoft Sans Serif, 10pt
+ False
+
+ reportTextItem5
+ WindowFrame
+ 695, 80
+ ControlText
+
+
+ White
+ False
+ None
+ +43-3842-22620
or mail it to:
@@ -28,4 +219,44 @@ AlphaSierraPapa
Christoph Wille
Vordernbergerstrasse 27/8
8700 Leoben
-AUSTRIAWhiteMicrosoft Sans Serif, 10ptFalseControlTextFalseFalse0WindowFalse718, 723False50, 99850ReportPageFooterFalseFalse0WindowFalse718, 50False50, 106350ReportFooterFalseFalse0WindowFalse718, 50
\ No newline at end of file
+AUSTRIA
+ 50, 551
+ TopLeft
+ False
+ False
+ Microsoft Sans Serif, 10pt
+ False
+
+ reportTextItem6
+ WindowFrame
+ 213, 139
+ ControlText
+
+
+ 50, 260
+ False
+
+
+ 718, 50
+ ReportPageFooter
+ False
+ 50
+ 0
+ Window
+
+ 50, 998
+ False
+
+
+ 718, 50
+ ReportFooter
+ False
+ 50
+ 0
+ Window
+
+ 50, 1063
+ False
+
+
+
\ No newline at end of file
diff --git a/samples/SharpDevelopReports/SampleReports/Ilist/ContributorsList.srd b/samples/SharpDevelopReports/SampleReports/Ilist/ContributorsList.srd
new file mode 100644
index 0000000000..ecd31f255d
--- /dev/null
+++ b/samples/SharpDevelopReports/SampleReports/Ilist/ContributorsList.srd
@@ -0,0 +1,176 @@
+
+
+
+ Report1
+ DataReport
+ True
+ 50, 50, 50, 50
+ Millimeter
+ 8, 8
+ 5, 5, 5, 5
+
+
+
+
+
+ PushData
+ No Data for this Report
+ Microsoft Sans Serif, 10pt
+
+
+
+
+ Window
+ 786, 35
+ False
+ False
+ 50
+
+ False
+ ReportHeader
+
+
+ Window
+ 786, 108
+ False
+ False
+ 50
+
+
+ 661, 42
+ 47, 6
+ ReportImageControl
+ D:\SharpReport\samples\Reports\Logos\Bannerbeige2.gif
+ ..\Logos\Bannerbeige2.gif
+ False
+ True
+
+
+ 661, 19
+ 47, 87
+ 47, 87
+ 708, 87
+ 1
+ Solid
+ ControlText
+ True
+ White
+
+
+ reportTextItem1
+ 46, 63
+ 109, 20
+ Microsoft Sans Serif, 10pt
+ Firstname
+
+ EllipsisCharacter
+ MiddleLeft
+ False
+ ControlText
+ True
+ White
+
+
+ False
+ ReportPageHeader
+
+
+ Window
+ 786, 51
+ False
+ False
+ 50
+
+
+ Row
+ 655, 40
+ 47, 10
+ Microsoft Sans Serif, 10pt
+
+ 0
+ 5, 5, 5, 5
+
+
+ 147, 25
+ 10, 10
+ Microsoft Sans Serif, 10pt
+ First
+ First
+ System.String
+
+ EllipsisCharacter
+ MiddleLeft
+ False
+ ControlText
+ True
+ unbound1
+ White
+
+
+ 139, 25
+ 187, 10
+ Microsoft Sans Serif, 10pt
+ last
+ last
+ System.String
+
+ EllipsisCharacter
+ MiddleLeft
+ False
+ ControlText
+ True
+ unbound2
+ White
+
+
+ 216, 25
+ 382, 10
+ Microsoft Sans Serif, 10pt
+ Job
+ Job
+ System.String
+
+ EllipsisCharacter
+ MiddleLeft
+ False
+ ControlText
+ True
+ unbound3
+ White
+
+
+ False
+ ControlText
+ True
+ White
+
+
+ False
+ ReportDetail
+
+
+ Window
+ 786, 47
+ False
+ False
+ 50
+
+ False
+ ReportPageFooter
+
+
+ Window
+ 786, 55
+ False
+ False
+ 50
+
+ False
+ ReportFooter
+
+
+
\ No newline at end of file
diff --git a/samples/SharpDevelopReports/src/ReportSamples.sln b/samples/SharpDevelopReports/src/ReportSamples.sln
index 6dce6d0f2d..deddfc223b 100644
--- a/samples/SharpDevelopReports/src/ReportSamples.sln
+++ b/samples/SharpDevelopReports/src/ReportSamples.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 10.00
# Visual Studio 2008
-# SharpDevelop 3.1.1.5340
+# SharpDevelop 3.2.0.5366
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReportSamples", "ReportSamples\ReportSamples.csproj", "{9BFECB53-827E-44BF-9DFD-C15F0A6106BE}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpReportSamples", "SharpReportSamples\SharpReportSamples.csproj", "{BB5D34DA-3561-48B1-894A-46765C2A18C1}"
diff --git a/samples/SharpDevelopReports/src/ReportSamples/ReportSamples.csproj b/samples/SharpDevelopReports/src/ReportSamples/ReportSamples.csproj
index ed37401a3a..12eac84bc2 100644
--- a/samples/SharpDevelopReports/src/ReportSamples/ReportSamples.csproj
+++ b/samples/SharpDevelopReports/src/ReportSamples/ReportSamples.csproj
@@ -36,9 +36,6 @@
-
- ..\..\..\..\AddIns\AddIns\Misc\SharpDevelopReports\ICSharpCode.Reports.Core.dll
-
@@ -71,5 +68,9 @@
+
+ {4B2239FF-8FD6-431D-9D22-1B8049BA6917}
+ ICSharpCode.Reports.Core
+
\ No newline at end of file
diff --git a/samples/SharpDevelopReports/src/SharpReportSamples/MainForm.cs b/samples/SharpDevelopReports/src/SharpReportSamples/MainForm.cs
index daffdd2e1c..c832e621df 100644
--- a/samples/SharpDevelopReports/src/SharpReportSamples/MainForm.cs
+++ b/samples/SharpDevelopReports/src/SharpReportSamples/MainForm.cs
@@ -89,30 +89,36 @@ namespace SharpReportSamples
private void RunStandardReport(string reportName)
{
- ReportEngine engine = new ReportEngine();
- this.previewControl1.SetupAsynchron(reportName,null);
+ ReportParameters parameters = ReportEngine.LoadParameters(reportName);
+
+ if ((parameters != null)&& (parameters.SqlParameters.Count > 0)){
+ parameters.SqlParameters[0].ParameterValue = "I'm the Parameter";
+ }
+
+ this.previewControl1.SetupAsynchron(reportName,parameters);
}
-
+// FileAccess: D:\Reporting3.0_branches\SharpDevelop\AddIns\AddIns\Misc\SharpDevelopReports\ICSharpCode.Reports.Core.dll
+// hint : ..\..\..\..\AddIns\AddIns\Misc\SharpDevelopReports\ICSharpCode.Reports.Core.dl
private void SelectReport ()
- {
+ {
TreeNode selectedNode = this.treeView1.SelectedNode;
- if (selectedNode != null) {
- if (!String.IsNullOrEmpty(selectedNode.Tag.ToString())) {
- if (selectedNode.Parent == this.pushNode) {
- Console.WriteLine("push");
- } else {
- RunStandardReport(selectedNode.Tag.ToString());
-
- }
-
+ if ((selectedNode == null)|| (selectedNode.Tag == null)) {
+ return;
+ }
+ if (!String.IsNullOrEmpty(selectedNode.Tag.ToString())) {
+ if (selectedNode.Parent == this.pushNode) {
+ MessageBox.Show("PushModel reports not implemented yet");
+ } else {
+ RunStandardReport(selectedNode.Tag.ToString());
}
}
}
+
void TreeView1MouseDoubleClick(object sender, MouseEventArgs e)
{
SelectReport();
diff --git a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ReportEngine.cs b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ReportEngine.cs
index 3a7d86550a..0e91ae9104 100644
--- a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ReportEngine.cs
+++ b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ReportEngine.cs
@@ -117,11 +117,20 @@ namespace ICSharpCode.Reports.Core {
internal static void CheckForParameters (IReportModel model,ReportParameters reportParameters)
{
if (reportParameters != null) {
- if (reportParameters.SortColumnCollection != null) {
- if (reportParameters.SortColumnCollection.Count > 0) {
- model.ReportSettings.SortColumnCollection.AddRange(reportParameters.SortColumnCollection);
+
+ if (reportParameters.SortColumnCollection.Count > 0) {
+ model.ReportSettings.SortColumnCollection.AddRange(reportParameters.SortColumnCollection);
+ }
+
+ if (reportParameters.SqlParameters.Count > 0) {
+ foreach (BasicParameter bp in reportParameters.SqlParameters) {
+ BasicParameter p = model.ReportSettings.ParameterCollection.Find(bp.ParameterName);
+ if (p != null) {
+ p.ParameterValue = bp.ParameterValue;
+ }
}
}
+
}
}
diff --git a/src/AddIns/Misc/SharpReport/SharpDevelop.Reports.Test.sln b/src/AddIns/Misc/SharpReport/SharpDevelop.Reports.Test.sln
index c8c59ccfbb..a502341556 100644
--- a/src/AddIns/Misc/SharpReport/SharpDevelop.Reports.Test.sln
+++ b/src/AddIns/Misc/SharpReport/SharpDevelop.Reports.Test.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 10.00
# Visual Studio 2008
-# SharpDevelop 3.1.1.5340
+# SharpDevelop 3.2.0.5366
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Reports.Addin", "ICSharpCode.Reports.Addin\ICSharpCode.Reports.Addin.csproj", "{35D002D7-C78B-44FB-92AA-104BEB431678}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Reports.Addin.Test", "ICSharpCode.Reports.Addin\Test\ICSharpCode.Reports.Addin.Test.csproj", "{2B232C7E-CFB6-4B73-A1B8-134A8A2ED4F7}"
@@ -16,8 +16,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Irony", "Irony\Irony.csproj
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop", "..\..\..\Main\Base\Project\ICSharpCode.SharpDevelop.csproj", "{2748AD25-9C63-4E12-877B-4DCE96FBED54}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core", "..\..\..\Main\Core\Project\ICSharpCode.Core.csproj", "{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}"
-EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -52,9 +50,5 @@ Global
{2748AD25-9C63-4E12-877B-4DCE96FBED54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2748AD25-9C63-4E12-877B-4DCE96FBED54}.Release|Any CPU.Build.0 = Release|Any CPU
{2748AD25-9C63-4E12-877B-4DCE96FBED54}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}.Release|Any CPU.Build.0 = Release|Any CPU
- {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}.Release|Any CPU.ActiveCfg = Release|Any CPU
EndGlobalSection
EndGlobal