admin/ayanova7
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

case 3646

Browse Source
This commit is contained in:
John Cardinal
2018-08-22 22:04:25 +00:00
parent afb22dd266
commit 68aa674685
4 changed files with 39 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
source/WinFormApp/ReportEditor.cs
View File

@@ -210,8 +210,9 @@ namespace AyaNova
mxr.DesignerLoaded += new DesignerLoadedEventHandler(r_DesignerLoaded);
if (AyaBizUtils.Trial)
Util.WatermarkReport(mxr, true);
//case 3646 removed
//if (AyaBizUtils.Trial)
// Util.WatermarkReport(mxr, true);
//mxr.ExportOptions.Email.RecipientAddress = strEmail;
@@ -278,7 +279,10 @@ namespace AyaNova
if (bReportLayoutIsDirty)
{
MemoryStream mStream = new MemoryStream();
if (AyaBizUtils.Trial) Util.WatermarkReport(mxr, false);
//case 3646
//if (AyaBizUtils.Trial) Util.WatermarkReport(mxr, false);
//Case 232
//xrDesignPanel1.Report.SaveState(mStream);
xrDesignPanel1.Report.SaveLayout(mStream);
@@ -318,7 +322,10 @@ namespace AyaNova
if (bReportLayoutIsDirty)
{
MemoryStream mStream = new MemoryStream();
if (AyaBizUtils.Trial) Util.WatermarkReport(mxr, false);
//case 3646 removed
//if (AyaBizUtils.Trial) Util.WatermarkReport(mxr, false);
//Case 232
//xrDesignPanel1.Report.SaveState(mStream);
xrDesignPanel1.Report.SaveLayout(mStream);
@@ -353,7 +360,9 @@ namespace AyaNova
{
//Save before exit
MemoryStream mStream = new MemoryStream();
if (AyaBizUtils.Trial) Util.WatermarkReport(mxr, false);
//case 3646 removed
//if (AyaBizUtils.Trial) Util.WatermarkReport(mxr, false);
//Case 232
//xrDesignPanel1.Report.SaveState(mStream);

17
source/WinFormApp/ReportEditor2.cs
View File

@@ -215,8 +215,9 @@ namespace AyaNova
mxr.DesignerLoaded += new DesignerLoadedEventHandler(r_DesignerLoaded);
if (AyaBizUtils.Trial)
Util.WatermarkReport(mxr, true);
//case 3646 removed
//if (AyaBizUtils.Trial)
// Util.WatermarkReport(mxr, true);
//xrDesignMdiController1.OpenReport(mxr);
@@ -283,7 +284,9 @@ namespace AyaNova
if (bReportLayoutIsDirty)
{
MemoryStream mStream = new MemoryStream();
if (AyaBizUtils.Trial) Util.WatermarkReport(mxr, false);
//case 3646 removed
//if (AyaBizUtils.Trial) Util.WatermarkReport(mxr, false);
xrDesignPanel1.Report.SaveLayout(mStream);
@@ -327,7 +330,9 @@ namespace AyaNova
if (bReportLayoutIsDirty)
{
MemoryStream mStream = new MemoryStream();
if (AyaBizUtils.Trial) Util.WatermarkReport(mxr, false);
//case 3646 removed
//if (AyaBizUtils.Trial) Util.WatermarkReport(mxr, false);
xrDesignPanel1.Report.SaveLayout(mStream);
@@ -362,7 +367,9 @@ namespace AyaNova
{
//Save before exit
MemoryStream mStream = new MemoryStream();
if (AyaBizUtils.Trial) Util.WatermarkReport(mxr, false);
//case 3646 removed
//if (AyaBizUtils.Trial) Util.WatermarkReport(mxr, false);
xrDesignPanel1.Report.SaveLayout(mStream);

13
source/WinFormApp/Util.cs
View File

@@ -5802,13 +5802,14 @@ At first I was happy to find your code that solved my problem, but I did not lik
}
}
if(AyaBizUtils.Trial)
{
WatermarkReport(x,true);
x.PrintingSystem.SetCommandVisibility(DevExpress.XtraPrinting.PrintingSystemCommand.Watermark,DevExpress.XtraPrinting.CommandVisibility.None);
}
//case 3646 removed
//if(AyaBizUtils.Trial)
//{
// WatermarkReport(x,true);
// x.PrintingSystem.SetCommandVisibility(DevExpress.XtraPrinting.PrintingSystemCommand.Watermark,DevExpress.XtraPrinting.CommandVisibility.None);
//}
//case 1039 //log.Debug("ReportHandleToolClick: Initialization complete, displaying report");

11
source/ri/ri/ReportView.aspx.cs
View File

@@ -99,11 +99,12 @@ namespace ri
}
}
if (AyaBizUtils.Trial)
{
WatermarkReport(x, true);
}
//case 3646 removed
//if (AyaBizUtils.Trial)
//{
// WatermarkReport(x, true);
//}
//pass it to the viewer component
this.ReportViewer1.Report = x;