diff --git a/C2P/Properties/PublishProfiles/IIS02.pubxml b/C2P/Properties/PublishProfiles/IIS02.pubxml index a4b8a9f..d44c3dc 100644 --- a/C2P/Properties/PublishProfiles/IIS02.pubxml +++ b/C2P/Properties/PublishProfiles/IIS02.pubxml @@ -18,7 +18,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt False WMSVC True - steamwarewin\samuele + steamwarewin\administrator <_SavePWD>True diff --git a/C2P/Web.DEMO.config b/C2P/Web.DEMO.config index 18587b2..b2acb50 100644 --- a/C2P/Web.DEMO.config +++ b/C2P/Web.DEMO.config @@ -16,8 +16,9 @@ --> - + + diff --git a/C2P/Web.config b/C2P/Web.config index 67e567e..0b111bc 100644 --- a/C2P/Web.config +++ b/C2P/Web.config @@ -40,7 +40,7 @@ - + diff --git a/C2P/bin/C2P.dll b/C2P/bin/C2P.dll index 86fa59f..7ca7ba5 100644 Binary files a/C2P/bin/C2P.dll and b/C2P/bin/C2P.dll differ diff --git a/C2P/bin/C2P_Data.dll b/C2P/bin/C2P_Data.dll index 72e8181..1e02d30 100644 Binary files a/C2P/bin/C2P_Data.dll and b/C2P/bin/C2P_Data.dll differ diff --git a/C2P/bin/NLog.dll b/C2P/bin/NLog.dll index 11a5469..5a2f145 100644 Binary files a/C2P/bin/NLog.dll and b/C2P/bin/NLog.dll differ diff --git a/C2P_Data/bin/Release/C2P_Data.dll b/C2P_Data/bin/Release/C2P_Data.dll index 72e8181..1e02d30 100644 Binary files a/C2P_Data/bin/Release/C2P_Data.dll and b/C2P_Data/bin/Release/C2P_Data.dll differ diff --git a/C2P_Data/reportPrinter.cs b/C2P_Data/reportPrinter.cs index 66fc10c..6a11328 100644 --- a/C2P_Data/reportPrinter.cs +++ b/C2P_Data/reportPrinter.cs @@ -171,6 +171,7 @@ public class reportPrinter public void printReport(reportRichiesto tipoReport, string printerName, int ticket, devInfoParam deviceInfoParam) { LocalReport report = new LocalReport(); + report.EnableExternalImages = true; string deviceInfo = ""; switch (tipoReport) { diff --git a/C2P_Report/Default.aspx.cs b/C2P_Report/Default.aspx.cs index 2b72598..a750328 100644 --- a/C2P_Report/Default.aspx.cs +++ b/C2P_Report/Default.aspx.cs @@ -7,6 +7,7 @@ using System.Web.UI.WebControls; using Microsoft.Reporting.WebForms; using System.Data; using C2P_Data; +using SteamWare; namespace C2P_Report { @@ -20,7 +21,7 @@ namespace C2P_Report protected void btnReport_Click(object sender, EventArgs e) { DateTime start = DateTime.Now; - reportPrinter.obj.stampaReport(reportRichiesto.ReportOffers, 4, @"\\W2012R2SAM\PDFCreator"); + reportPrinter.obj.stampaReport(reportRichiesto.ReportOffers, 4, memLayer.ML.confReadString("localPrinter")); lblOut.Text = string.Format("Impiegati {0} ms", DateTime.Now.Subtract(start).TotalMilliseconds); } } diff --git a/C2P_Report/Properties/PublishProfiles/218.pubxml b/C2P_Report/Properties/PublishProfiles/218.pubxml index ceb52e5..8a8b1b0 100644 --- a/C2P_Report/Properties/PublishProfiles/218.pubxml +++ b/C2P_Report/Properties/PublishProfiles/218.pubxml @@ -10,18 +10,14 @@ by editing this MSBuild file. In order to learn more about this please visit htt Any CPU True - True - True - False - DonotMerge True - https://10.74.82.218:8172/MsDeploy.axd + https://IIS02:8172/MsDeploy.axd Default Web Site/C2P_Report False WMSVC True - administrator + steamwarewin\administrator <_SavePWD>True @@ -37,6 +33,10 @@ by editing this MSBuild file. In order to learn more about this please visit htt + True + True + False + DonotMerge diff --git a/C2P_Report/ReportViewer.aspx b/C2P_Report/ReportViewer.aspx index 999c54e..3b15161 100644 --- a/C2P_Report/ReportViewer.aspx +++ b/C2P_Report/ReportViewer.aspx @@ -4,5 +4,5 @@ - + diff --git a/C2P_Report/Web.DEMO.config b/C2P_Report/Web.DEMO.config index afdc08e..4ef095e 100644 --- a/C2P_Report/Web.DEMO.config +++ b/C2P_Report/Web.DEMO.config @@ -15,6 +15,7 @@ --> + diff --git a/C2P_Report/Web.WinLab.config b/C2P_Report/Web.WinLab.config index d898eee..44ee622 100644 --- a/C2P_Report/Web.WinLab.config +++ b/C2P_Report/Web.WinLab.config @@ -15,6 +15,7 @@ --> + diff --git a/C2P_Report/Web.config b/C2P_Report/Web.config index 2ad47be..278dd3b 100644 --- a/C2P_Report/Web.config +++ b/C2P_Report/Web.config @@ -19,6 +19,8 @@ + + diff --git a/C2P_Report/bin/C2P_Data.dll b/C2P_Report/bin/C2P_Data.dll index 72e8181..1e02d30 100644 Binary files a/C2P_Report/bin/C2P_Data.dll and b/C2P_Report/bin/C2P_Data.dll differ diff --git a/C2P_Report/bin/C2P_Report.dll b/C2P_Report/bin/C2P_Report.dll index 54d885a..27e18d3 100644 Binary files a/C2P_Report/bin/C2P_Report.dll and b/C2P_Report/bin/C2P_Report.dll differ