pimhwang
/
SharpDevelop
mirror of https://github.com/icsharpcode/SharpDevelop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Fix http://community.sharpdevelop.net/forums/t/11284.aspx 

add DemoReport 'ContributorsListWithparameters'

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/reports@5950 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
pull/1/head
Peter Forstmeier 15 years ago
parent
507cb35a84
commit
1307b501b3
14 changed files with 458 additions and 33 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 310
      samples/SharpDevelopReports/SampleReports/Ilist/ContributorsListWithParameters.srd
  2. 12
      samples/SharpDevelopReports/src/ReportSamples.sln
  3. 88
      samples/SharpDevelopReports/src/SharpReportSamples/MainForm.cs
  4. 5
      samples/SharpDevelopReports/src/SharpReportSamples/SharpReportSamples.csproj
  5. 3
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/StandardFormatter.cs
  6. 2
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/CollectionStrategy.cs
  7. 2
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/SqlQueryChecker.cs
  8. 4
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converter/ItemsConverter.cs
  9. 2
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/ExpressionEvaluatorFacade.cs
  10. 11
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/SimpleExpressionEvaluator/Compilation/Functions/ReportingService/FieldReference.cs
  11. 19
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Factories/DataManagerFacrory.cs
  12. 4
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Globals/FilePathConverter.cs
  13. 27
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.cs
  14. 2
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/Converters/BaseConverter.cs

310
samples/SharpDevelopReports/SampleReports/Ilist/ContributorsListWithParameters.srd
Unescape View File

@ -0,0 +1,310 @@ @@ -0,0 +1,310 @@
<?xml version="1.0" encoding="utf-8"?>
<ReportModel>
<ReportSettings>
<ReportSettings>
<ReportName>Report1</ReportName>
<ReportType>DataReport</ReportType>
<BottomMargin>50</BottomMargin>
<TopMargin>50</TopMargin>
<LeftMargin>50</LeftMargin>
<RightMargin>50</RightMargin>
<PageSize>827, 1169</PageSize>
<Landscape>False</Landscape>
<GraphicsUnit>Millimeter</GraphicsUnit>
<Padding>5, 5, 5, 5</Padding>
<AvailableFieldsCollection />
<SortColumnCollection />
<GroupColumnsCollection />
<ParameterCollection>
<BasicParameter>
<ParameterName>p1</ParameterName>
<ParameterValue>ValueOfP1</ParameterValue>
</BasicParameter>
</ParameterCollection>
<ConnectionString />
<CommandText />
<CommandType>Text</CommandType>
<DataModel>PushData</DataModel>
<NoDataMessage>No Data for this Report</NoDataMessage>
<DefaultFont>Microsoft Sans Serif, 10pt</DefaultFont>
<UseStandardPrinter>True</UseStandardPrinter>
</ReportSettings>
</ReportSettings>
<SectionCollection>
<BaseSection>
<Location>50, 50</Location>
<Size>786, 35</Size>
<BackColor>Window</BackColor>
<SectionOffset>0</SectionOffset>
<SectionMargin>50</SectionMargin>
<DrawBorder>False</DrawBorder>
<PageBreakAfter>False</PageBreakAfter>
<Items />
<FrameColor>Black</FrameColor>
<Name>ReportHeader</Name>
</BaseSection>
<BaseSection>
<Location>50, 100</Location>
<Size>786, 108</Size>
<BackColor>Window</BackColor>
<SectionOffset>0</SectionOffset>
<SectionMargin>50</SectionMargin>
<DrawBorder>False</DrawBorder>
<PageBreakAfter>False</PageBreakAfter>
<Items>
<BaseTextItem>
<Location>45, 20</Location>
<Size>272, 20</Size>
<BackColor>White</BackColor>
<Font>Segoe UI, 9pt</Font>
<FormatString />
<StringTrimming>None</StringTrimming>
<ContentAlignment>TopLeft</ContentAlignment>
<CanGrow>False</CanGrow>
<CanShrink>False</CanShrink>
<Text>="Param " + Parameters!p1</Text>
<DrawBorder>False</DrawBorder>
<FrameColor>Black</FrameColor>
<ForeColor>0, 0, 0</ForeColor>
<Visible>True</Visible>
<Name>BaseTextItem2147483646</Name>
</BaseTextItem>
<BaseTextItem>
<Location>429, 63</Location>
<Size>100, 20</Size>
<BackColor>White</BackColor>
<Font>Microsoft Sans Serif, 12pt, style=Bold</Font>
<FormatString />
<StringTrimming>None</StringTrimming>
<ContentAlignment>TopLeft</ContentAlignment>
<CanGrow>False</CanGrow>
<CanShrink>False</CanShrink>
<Text>Job</Text>
<DrawBorder>False</DrawBorder>
<FrameColor>WindowFrame</FrameColor>
<ForeColor>ControlText</ForeColor>
<Visible>True</Visible>
<Name>Job</Name>
</BaseTextItem>
<BaseTextItem>
<Location>234, 63</Location>
<Size>100, 20</Size>
<BackColor>White</BackColor>
<Font>Microsoft Sans Serif, 12pt, style=Bold</Font>
<FormatString />
<StringTrimming>None</StringTrimming>
<ContentAlignment>TopLeft</ContentAlignment>
<CanGrow>False</CanGrow>
<CanShrink>False</CanShrink>
<Text>Lastname</Text>
<DrawBorder>False</DrawBorder>
<FrameColor>WindowFrame</FrameColor>
<ForeColor>ControlText</ForeColor>
<Visible>True</Visible>
<Name>Lastname</Name>
</BaseTextItem>
<BaseImageItem>
<Location>429, 6</Location>
<Size>273, 42</Size>
<BackColor>Window</BackColor>
<ImageFileName>D:\SharpDevelop3.0_CHECKOUT\SharpDevelop\samples\SharpDevelopReports\SampleReports\Logos\Bannerbeige2.gif</ImageFileName>
<ScaleImageToSize>False</ScaleImageToSize>
<ImageSource>File</ImageSource>
<RelativeFileName>..\..\..\..\..\..\SharpDevelop3.0_CHECKOUT\SharpDevelop\samples\SharpDevelopReports\SampleReports\Logos\Bannerbeige2.gif</RelativeFileName>
<Name>ReportImageControl</Name>
</BaseImageItem>
<BaseLineItem>
<Location>47, 87</Location>
<Size>661, 18</Size>
<BackColor>White</BackColor>
<ForeColor>ControlText</ForeColor>
<FromPoint>0, 3</FromPoint>
<ToPoint>614, 3</ToPoint>
<StartLineCap>Flat</StartLineCap>
<EndLineCap>Flat</EndLineCap>
<DashLineCap>Flat</DashLineCap>
<DashStyle>Solid</DashStyle>
<Thickness>2</Thickness>
<Name />
</BaseLineItem>
<BaseTextItem>
<Location>46, 63</Location>
<Size>109, 20</Size>
<BackColor>White</BackColor>
<Font>Microsoft Sans Serif, 12pt, style=Bold</Font>
<FormatString />
<StringTrimming>EllipsisCharacter</StringTrimming>
<ContentAlignment>TopLeft</ContentAlignment>
<CanGrow>False</CanGrow>
<CanShrink>False</CanShrink>
<Text>Firstname</Text>
<DrawBorder>False</DrawBorder>
<FrameColor>WindowFrame</FrameColor>
<ForeColor>ControlText</ForeColor>
<Visible>True</Visible>
<Name>reportTextItem1</Name>
</BaseTextItem>
</Items>
<FrameColor>Black</FrameColor>
<Name>ReportPageHeader</Name>
</BaseSection>
<BaseSection>
<Location>50, 223</Location>
<Size>750, 51</Size>
<BackColor>Window</BackColor>
<SectionOffset>0</SectionOffset>
<SectionMargin>50</SectionMargin>
<DrawBorder>False</DrawBorder>
<PageBreakAfter>False</PageBreakAfter>
<Items>
<BaseRowItem>
<Location>3, 10</Location>
<Size>699, 40</Size>
<BackColor>White</BackColor>
<DrawBorder>False</DrawBorder>
<ForeColor>ControlText</ForeColor>
<Visible>True</Visible>
<FrameColor>WindowFrame</FrameColor>
<Items>
<BaseDataItem>
<Location>43, 12</Location>
<Size>147, 25</Size>
<BackColor>White</BackColor>
<Font>Microsoft Sans Serif, 10pt</Font>
<FormatString />
<StringTrimming>EllipsisCharacter</StringTrimming>
<ContentAlignment>MiddleLeft</ContentAlignment>
<CanGrow>False</CanGrow>
<CanShrink>False</CanShrink>
<DataType>System.String</DataType>
<Text>First</Text>
<DrawBorder>False</DrawBorder>
<FrameColor>WindowFrame</FrameColor>
<ForeColor>ControlText</ForeColor>
<Visible>True</Visible>
<ColumnName>First</ColumnName>
<Name>unbound1</Name>
</BaseDataItem>
<BaseDataItem>
<Location>231, 12</Location>
<Size>139, 25</Size>
<BackColor>White</BackColor>
<Font>Microsoft Sans Serif, 10pt</Font>
<FormatString />
<StringTrimming>EllipsisCharacter</StringTrimming>
<ContentAlignment>MiddleLeft</ContentAlignment>
<CanGrow>False</CanGrow>
<CanShrink>False</CanShrink>
<DataType>System.String</DataType>
<Text>last</Text>
<DrawBorder>False</DrawBorder>
<FrameColor>WindowFrame</FrameColor>
<ForeColor>ControlText</ForeColor>
<Visible>True</Visible>
<ColumnName>last</ColumnName>
<Name>unbound2</Name>
</BaseDataItem>
<BaseDataItem>
<Location>426, 10</Location>
<Size>216, 25</Size>
<BackColor>White</BackColor>
<Font>Microsoft Sans Serif, 10pt</Font>
<FormatString />
<StringTrimming>EllipsisCharacter</StringTrimming>
<ContentAlignment>MiddleLeft</ContentAlignment>
<CanGrow>False</CanGrow>
<CanShrink>False</CanShrink>
<DataType>System.String</DataType>
<Text>Job</Text>
<DrawBorder>False</DrawBorder>
<FrameColor>WindowFrame</FrameColor>
<ForeColor>ControlText</ForeColor>
<Visible>True</Visible>
<ColumnName>Job</ColumnName>
<NullValue>--------------</NullValue>
<Name>unbound3</Name>
</BaseDataItem>
</Items>
<AlternateBackColor />
<ChangeBackColorEveryNRow>0</ChangeBackColorEveryNRow>
<Name>Row</Name>
</BaseRowItem>
</Items>
<FrameColor>Black</FrameColor>
<Name>ReportDetail</Name>
</BaseSection>
<BaseSection>
<Location>50, 289</Location>
<Size>750, 49</Size>
<BackColor>Window</BackColor>
<SectionOffset>0</SectionOffset>
<SectionMargin>50</SectionMargin>
<DrawBorder>False</DrawBorder>
<PageBreakAfter>False</PageBreakAfter>
<Items>
<BaseTextItem>
<Location>45, 24</Location>
<Size>483, 20</Size>
<BackColor>White</BackColor>
<Font>Microsoft Sans Serif, 8.25pt</Font>
<FormatString />
<StringTrimming>None</StringTrimming>
<ContentAlignment>TopLeft</ContentAlignment>
<CanGrow>False</CanGrow>
<CanShrink>False</CanShrink>
<Text>=Globals!ReportFolder</Text>
<DrawBorder>False</DrawBorder>
<FrameColor>WindowFrame</FrameColor>
<ForeColor>ControlText</ForeColor>
<Visible>True</Visible>
<Name>=Globals!ReportFolder</Name>
</BaseTextItem>
<BaseLineItem>
<Location>45, 3</Location>
<Size>663, 15</Size>
<BackColor>White</BackColor>
<ForeColor>ControlText</ForeColor>
<FromPoint>0, 0</FromPoint>
<ToPoint>656, 0</ToPoint>
<StartLineCap>Flat</StartLineCap>
<EndLineCap>Flat</EndLineCap>
<DashLineCap>Flat</DashLineCap>
<DashStyle>Solid</DashStyle>
<Thickness>2</Thickness>
<Name>object_177a5444_b8e0_4202_87d2_05cdc7cd1194</Name>
</BaseLineItem>
<BaseTextItem>
<Location>602, 24</Location>
<Size>100, 20</Size>
<BackColor>White</BackColor>
<Font>Microsoft Sans Serif, 8.25pt</Font>
<FormatString />
<StringTrimming>None</StringTrimming>
<ContentAlignment>TopLeft</ContentAlignment>
<CanGrow>False</CanGrow>
<CanShrink>False</CanShrink>
<Text>='Page ' + Globals!PageNumber</Text>
<DrawBorder>False</DrawBorder>
<FrameColor>WindowFrame</FrameColor>
<ForeColor>ControlText</ForeColor>
<Visible>True</Visible>
<Name>='Page ' + Globals!PageNumber</Name>
</BaseTextItem>
</Items>
<FrameColor>Black</FrameColor>
<Name>ReportPageFooter</Name>
</BaseSection>
<BaseSection>
<Location>50, 353</Location>
<Size>750, 55</Size>
<BackColor>Window</BackColor>
<SectionOffset>0</SectionOffset>
<SectionMargin>50</SectionMargin>
<DrawBorder>False</DrawBorder>
<PageBreakAfter>False</PageBreakAfter>
<Items />
<FrameColor>Black</FrameColor>
<Name>ReportFooter</Name>
</BaseSection>
</SectionCollection>
</ReportModel>

12
samples/SharpDevelopReports/src/ReportSamples.sln
Unescape View File

@ -1,19 +1,25 @@ @@ -1,19 +1,25 @@

Microsoft Visual Studio Solution File, Format Version 10.00
# Visual Studio 2008
# SharpDevelop 3.2.0.5633
Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
# SharpDevelop 4.0.0.5930
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpReportSamples", "SharpReportSamples\SharpReportSamples.csproj", "{BB5D34DA-3561-48B1-894A-46765C2A18C1}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
Debug|x86 = Debug|x86
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{BB5D34DA-3561-48B1-894A-46765C2A18C1}.Debug|Any CPU.Build.0 = Debug|x86
{BB5D34DA-3561-48B1-894A-46765C2A18C1}.Debug|Any CPU.ActiveCfg = Debug|x86
{BB5D34DA-3561-48B1-894A-46765C2A18C1}.Release|Any CPU.Build.0 = Release|x86
{BB5D34DA-3561-48B1-894A-46765C2A18C1}.Release|Any CPU.ActiveCfg = Release|x86
{BB5D34DA-3561-48B1-894A-46765C2A18C1}.Debug|x86.Build.0 = Debug|x86
{BB5D34DA-3561-48B1-894A-46765C2A18C1}.Debug|x86.ActiveCfg = Debug|x86
{BB5D34DA-3561-48B1-894A-46765C2A18C1}.Release|x86.Build.0 = Release|x86
{BB5D34DA-3561-48B1-894A-46765C2A18C1}.Release|x86.ActiveCfg = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

88
samples/SharpDevelopReports/src/SharpReportSamples/MainForm.cs
Unescape View File

@ -7,15 +7,13 @@ @@ -7,15 +7,13 @@
* Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern.
*/
using System;
using System.Collections;
using System.Collections.Generic;
using System.Diagnostics;
using System.Drawing;
using System.IO;
using System.Windows.Forms;
using ICSharpCode.Reports.Core;
using ICSharpCode.Reports.Core.Exporter.ExportRenderer;
using ICSharpCode.Reports.Core.old_Exporter.ExportRenderer;
namespace SharpReportSamples
{
@ -98,11 +96,18 @@ namespace SharpReportSamples @@ -98,11 +96,18 @@ namespace SharpReportSamples
string s = Path.GetFileNameWithoutExtension(reportName);
if (s == "ContributorsList" ) {
this.RunContributors(reportName);
} else if (s == "NoConnectionReport") {
}
else if (s == "ContributorsListWithParameters"){
//this.V1_RunContributorsWithParameters(reportName);
// this.V2_RunContributorsWithParameters(string fileName)
this.V3_RunContributorsWithParameters(reportName);
}
else if (s == "NoConnectionReport") {
this.RunProviderIndependent(reportName);
} else if (s =="EventLog")
this.RunEventLogger(reportName);
// this.RunEventLogger_Pdf(reportName);
this.RunEventLogger(reportName);
else {
ReportParameters parameters = ReportEngine.LoadParameters(reportName);
@ -173,6 +178,77 @@ namespace SharpReportSamples @@ -173,6 +178,77 @@ namespace SharpReportSamples
}
private void V1_RunContributorsWithParameters(string fileName)
{
ReportModel model = ReportEngine.LoadReportModel(fileName);
ReportParameters parameters = ReportEngine.LoadParameters(fileName);
BasicParameter p1 = parameters.SqlParameters[0];
p1.ParameterValue ="Value of Parameter";
List<Contributor> list = ContributorsReportData.CreateContributorsList();
this.previewControl1.PreviewLayoutChanged += delegate (object sender, EventArgs e)
{
this.previewControl1.RunReport(model,list,parameters);
};
this.previewControl1.RunReport(model,list,parameters);
}
// Can use this version for Parameters as well
private void V2_RunContributorsWithParameters(string fileName)
{
var model = ReportEngine.LoadReportModel(fileName);
ReportParameters parameters = ReportEngine.LoadParameters(fileName);
BasicParameter p1 = parameters.SqlParameters[0];
p1.ParameterValue ="Value of Parameter";
List<Contributor> list = ContributorsReportData.CreateContributorsList();
IDataManager dataManager = DataManager.CreateInstance(list,model.ReportSettings);
this.previewControl1.PreviewLayoutChanged += delegate (object sender, EventArgs e)
{
this.previewControl1.RunReport(model,dataManager);
};
this.previewControl1.RunReport(model,dataManager);
}
private void V3_RunContributorsWithParameters(string fileName)
{
var model = ReportEngine.LoadReportModel(fileName);
ReportParameters parameters = ReportEngine.LoadParameters(fileName);
BasicParameter p1 = parameters.SqlParameters[0];
p1.ParameterValue ="Value of Parameter";
List<Contributor> list = ContributorsReportData.CreateContributorsList();
// IDataManager dataManager = DataManager.CreateInstance(list,model.ReportSettings);
//IReportCreator creator = ReportEngine.CreatePageBuilder(model,eventLogger.EventLog,null);
IReportCreator creator = ReportEngine.CreatePageBuilder(model,list,parameters);
creator.SectionRendering += PushPrinting;
creator.BuildExportList();
using (PdfRenderer pdfRenderer = PdfRenderer.CreateInstance(creator,SelectFilename(),true))
{
pdfRenderer.Start();
pdfRenderer.RenderOutput();
pdfRenderer.End();
}
}
private void RunEventLogger_Pdf (string fileName)
{

5
samples/SharpDevelopReports/src/SharpReportSamples/SharpReportSamples.csproj
Unescape View File

@ -1,4 +1,5 @@ @@ -1,4 +1,5 @@
<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectGuid>{BB5D34DA-3561-48B1-894A-46765C2A18C1}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@ -6,7 +7,7 @@ @@ -6,7 +7,7 @@
<OutputType>Exe</OutputType>
<RootNamespace>SharpReportSamples</RootNamespace>
<AssemblyName>SharpReportSamples</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<AppDesignerFolder>Properties</AppDesignerFolder>
<SourceAnalysisOverrideSettingsFile>C:\Users\Peter Forstmeier\AppData\Roaming\ICSharpCode/SharpDevelop3.0\Settings.SourceAnalysis</SourceAnalysisOverrideSettingsFile>
</PropertyGroup>

3
src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/StandardFormatter.cs
Unescape View File

@ -114,8 +114,7 @@ namespace ICSharpCode.Reports.Core @@ -114,8 +114,7 @@ namespace ICSharpCode.Reports.Core
str = dec.ToString (format,CultureInfo.CurrentCulture);
} catch (System.FormatException e) {
string s = String.Format("\tDecimalValue < {0} > {1}",toFormat,e.Message);
System.Console.WriteLine("\t{0}",s);
string s = String.Format(CultureInfo.InvariantCulture,"\tDecimalValue < {0} > {1}",toFormat,e.Message);
}
return str;
} else {

2
src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/CollectionStrategy.cs
Unescape View File

@ -260,7 +260,7 @@ namespace ICSharpCode.Reports.Core { @@ -260,7 +260,7 @@ namespace ICSharpCode.Reports.Core {
if (p != null) {
baseDataItem.DBValue = p.GetValue(this.Current).ToString();
} else {
baseDataItem.DBValue = string.Format("<{0}> missing!", baseDataItem.ColumnName);
baseDataItem.DBValue = string.Format(CultureInfo.InvariantCulture,"<{0}> missing!", baseDataItem.ColumnName);
}
return;
}

2
src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/SqlQueryChecker.cs
Unescape View File

@ -24,7 +24,7 @@ namespace ICSharpCode.Reports.Core @@ -24,7 +24,7 @@ namespace ICSharpCode.Reports.Core
if (!String.IsNullOrEmpty(commandText)) {
commandText = commandText.ToUpper(CultureInfo.CurrentCulture);
if (!commandText.StartsWith("SELECT")) {
if (!commandText.StartsWith("SELECT",StringComparison.Ordinal)) {
throw new IllegalQueryException();
}
}

4
src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converter/ItemsConverter.cs
Unescape View File

@ -53,13 +53,13 @@ namespace ICSharpCode.Reports.Core.Exporter.Converter @@ -53,13 +53,13 @@ namespace ICSharpCode.Reports.Core.Exporter.Converter
private Point AdjustLocation (IReportItem parent , IReportItem item)
private static Point AdjustLocation (IReportItem parent , IReportItem item)
{
return new Point(parent.Location.X + item.Location.X,parent.Location.Y + item.Location.Y);
}
private Point AdjustLocationAfterDraw (IReportItem parent)
private static Point AdjustLocationAfterDraw (IReportItem parent)
{
return new Point(parent.Location.X + parent.Size.Width,parent.Location.Y + parent.Size.Height);
}

2
src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/ExpressionEvaluatorFacade.cs
Unescape View File

@ -49,7 +49,7 @@ namespace ICSharpCode.Reports.Expressions.ReportingLanguage @@ -49,7 +49,7 @@ namespace ICSharpCode.Reports.Expressions.ReportingLanguage
}
private bool CanEvaluate (string expressionn)
private static bool CanEvaluate (string expressionn)
{
if ((!String.IsNullOrEmpty(expressionn)) && (expressionn.StartsWith("="))) {
return true;

11
src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/SimpleExpressionEvaluator/Compilation/Functions/ReportingService/FieldReference.cs
Unescape View File

@ -32,8 +32,6 @@ namespace SimpleExpressionEvaluator.Compilation.Functions.ReportingService @@ -32,8 +32,6 @@ namespace SimpleExpressionEvaluator.Compilation.Functions.ReportingService
Variable v = Arguments[0] as Variable;
if (p.IDataNavigator.CurrentRow > -1) {
AvailableFieldsCollection avc = p.IDataNavigator.AvailableFields;
AbstractColumn item = avc.Find(v.VariableName.ToString());
CurrentItemsCollection cic = p.IDataNavigator.GetDataRow();
CurrentItem c = cic.Find(v.VariableName);
return c.Value.ToString();
@ -45,12 +43,9 @@ namespace SimpleExpressionEvaluator.Compilation.Functions.ReportingService @@ -45,12 +43,9 @@ namespace SimpleExpressionEvaluator.Compilation.Functions.ReportingService
protected override void AggregateValue(object value, AggregationState aggregationState, params object[] args)
{
// var sum = aggregationState.GetValue<string>("value");
// var nextVal = TypeNormalizer.EnsureType<string>(value);
//
// aggregationState["value"] = sum + nextVal;
}
{
}
protected override string ExtractAggregateValue(AggregationState aggregationState)
{

19
src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Factories/DataManagerFacrory.cs
Unescape View File

@ -7,7 +7,9 @@ @@ -7,7 +7,9 @@
* Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern.
*/
using System;
using System.Collections;
using System.Data;
using ICSharpCode.Reports.Core.Interfaces;
using ICSharpCode.Reports.Core.Project.Interfaces;
@ -45,6 +47,7 @@ namespace ICSharpCode.Reports.Core @@ -45,6 +47,7 @@ namespace ICSharpCode.Reports.Core
return dataManager;
}
public static IDataManager CreateDataManager (IReportModel reportModel,DataTable dataTable)
{
if (reportModel == null) {
@ -59,5 +62,21 @@ namespace ICSharpCode.Reports.Core @@ -59,5 +62,21 @@ namespace ICSharpCode.Reports.Core
}
return dataManager;
}
public static IDataManager CreateDataManager (IReportModel reportModel,IList dataTable)
{
if (reportModel == null) {
throw new ArgumentNullException("reportModel");
}
if (dataTable == null) {
throw new ArgumentNullException("dataTable");
}
IDataManager dataManager = DataManager.CreateInstance(dataTable,reportModel.ReportSettings);
if (dataManager == null) {
throw new MissingDataManagerException();
}
return dataManager;
}
}
}

4
src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Globals/FilePathConverter.cs
Unescape View File

@ -52,8 +52,8 @@ namespace ICSharpCode.Reports.Core @@ -52,8 +52,8 @@ namespace ICSharpCode.Reports.Core
if (model == null) {
throw new ArgumentNullException("model");
}
System.Diagnostics.Trace.WriteLine("");
System.Diagnostics.Trace.WriteLine (String.Format("FilePathConverter:AdjustReportName {0}",model.ReportSettings.FileName));
// System.Diagnostics.Trace.WriteLine("");
// System.Diagnostics.Trace.WriteLine (String.Format("FilePathConverter:AdjustReportName {0}",model.ReportSettings.FileName));
foreach (BaseSection section in model.SectionCollection) {
foreach (BaseReportItem item in section.Items) {
BaseImageItem baseImageItem = item as BaseImageItem;

27
src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.cs
Unescape View File

@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
// </file>
using System;
using System.ComponentModel;
using System.Collections;
using System.Data;
using System.Drawing;
using System.Drawing.Drawing2D;
@ -14,9 +14,9 @@ using System.Drawing.Text; @@ -14,9 +14,9 @@ using System.Drawing.Text;
using System.Globalization;
using System.Windows.Forms;
using ICSharpCode.Reports.Core.Interfaces;
using ICSharpCode.Reports.Core.old_Exporter;
using ICSharpCode.Reports.Core.old_Exporter.ExportRenderer;
using ICSharpCode.Reports.Core.Interfaces;
namespace ICSharpCode.Reports.Core.ReportViewer
{
@ -113,7 +113,25 @@ namespace ICSharpCode.Reports.Core.ReportViewer @@ -113,7 +113,25 @@ namespace ICSharpCode.Reports.Core.ReportViewer
if (dataTable == null) {
throw new ArgumentNullException("dataTable");
}
RunReport (reportModel,DataManagerFactory.CreateDataManager(reportModel,dataTable));
ReportEngine.CheckForParameters(reportModel,parameters);
IDataManager dataManager = DataManagerFactory.CreateDataManager(reportModel,dataTable);
RunReport (reportModel,dataManager);
}
public void RunReport (ReportModel reportModel,IList dataSource,ReportParameters parameters)
{
if (reportModel == null) {
throw new ArgumentNullException("reportModel");
}
if (dataSource == null) {
throw new ArgumentNullException("dataTable");
}
ReportEngine.CheckForParameters(reportModel,parameters);
IDataManager dataManager = DataManagerFactory.CreateDataManager(reportModel,dataSource);
RunReport (reportModel,dataManager);
}
@ -131,6 +149,7 @@ namespace ICSharpCode.Reports.Core.ReportViewer @@ -131,6 +149,7 @@ namespace ICSharpCode.Reports.Core.ReportViewer
RunDataReport(reportModel,dataManager);
}
#region Rendering
private void RunFormSheet (ReportModel reportModel)
@ -297,7 +316,7 @@ namespace ICSharpCode.Reports.Core.ReportViewer @@ -297,7 +316,7 @@ namespace ICSharpCode.Reports.Core.ReportViewer
{
if (this.comboZoom.SelectedItem.ToString().IndexOf("%") > 0) {
string s1 = this.comboZoom.SelectedItem.ToString().Substring(0,this.comboZoom.SelectedItem.ToString().IndexOf("%"));
this.zoom = (float)Convert.ToDecimal(s1) / 100;
this.zoom = (float)Convert.ToDecimal(s1,CultureInfo.InvariantCulture) / 100;
} else {
string sel = this.comboZoom.SelectedItem.ToString();
switch (sel) {

2
src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/Converters/BaseConverter.cs
Unescape View File

@ -102,7 +102,7 @@ namespace ICSharpCode.Reports.Core.old_Exporter @@ -102,7 +102,7 @@ namespace ICSharpCode.Reports.Core.old_Exporter
}
private void AdjustBackColor (ISimpleContainer container,BaseReportItem item)
private static void AdjustBackColor (ISimpleContainer container,BaseReportItem item)
{
if (item.BackColor != GlobalValues.DefaultBackColor) {
foreach (BaseReportItem i in container.Items) {

Write Preview
Loading…
Cancel
Save