Browse Source

Better Errorhandling in ReportWizard if SqlParameters (DateTime)for StoredProcedures has wrong values

ReportViewer show correct pages during rendering

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/3.0@5410 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
pull/1/head
Peter Forstmeier 16 years ago
parent
commit
e687e39a1b
  1. 3
      src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/ResultPanel.cs
  2. 1
      src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Exporter/BasePager.cs
  3. 4
      src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Exporter/FormPageBuilder.cs
  4. 1
      src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.cs

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

@ -167,8 +167,11 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
try { try {
SqlDataAccessStrategy.BuildQueryParameters(command,sqlParamsCollection); SqlDataAccessStrategy.BuildQueryParameters(command,sqlParamsCollection);
adapter.SelectCommand = (DbCommand)command; adapter.SelectCommand = (DbCommand)command;
adapter.Fill (dataSet); adapter.Fill (dataSet);
return dataSet; return dataSet;
} catch (Exception e) {
MessageService.ShowError(e.Message);
} finally { } finally {
if (adapter.SelectCommand.Connection.State == ConnectionState.Open) { if (adapter.SelectCommand.Connection.State == ConnectionState.Open) {
adapter.SelectCommand.Connection.Close(); adapter.SelectCommand.Connection.Close();

1
src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Exporter/BasePager.cs

@ -74,7 +74,6 @@ namespace ICSharpCode.Reports.Core.Exporter
} }
SectionBounds sectionBounds = new SectionBounds (this.reportModel.ReportSettings,firstPage); SectionBounds sectionBounds = new SectionBounds (this.reportModel.ReportSettings,firstPage);
ExporterPage sp = ExporterPage.CreateInstance(sectionBounds,this.pages.Count + 1); ExporterPage sp = ExporterPage.CreateInstance(sectionBounds,this.pages.Count + 1);
return sp; return sp;
} }

4
src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Exporter/FormPageBuilder.cs

@ -54,9 +54,7 @@ namespace ICSharpCode.Reports.Core.Exporter
base.BuildReportHeader(); base.BuildReportHeader();
if (base.Pages.Count == 0) { if (base.Pages.Count == 0) {
this.ReportModel.ReportHeader.SectionOffset = base.SinglePage.SectionBounds.ReportHeaderRectangle.Top; this.ReportModel.ReportHeader.SectionOffset = base.SinglePage.SectionBounds.ReportHeaderRectangle.Top;
base.ConvertSection(this.ReportModel.ReportHeader, base.ConvertSection(this.ReportModel.ReportHeader,1);
// base.SinglePage.SectionBounds.ReportHeaderRectangle.Top,
1 );
} }
} }

1
src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.cs

@ -194,6 +194,7 @@ namespace ICSharpCode.Reports.Core.ReportViewer
private void BackgroundWorker_ProgressChanged(object sender, ProgressChangedEventArgs e) private void BackgroundWorker_ProgressChanged(object sender, ProgressChangedEventArgs e)
{ {
this.pageNumber = e.ProgressPercentage;
this.ShowSelectedPage(); this.ShowSelectedPage();
} }

Loading…
Cancel
Save