diff --git a/CMS_SC/ReportCompleto.aspx b/CMS_SC/ReportCompleto.aspx index 5d8e82f..31a1960 100644 --- a/CMS_SC/ReportCompleto.aspx +++ b/CMS_SC/ReportCompleto.aspx @@ -14,7 +14,8 @@

<%: traduci("ReportCompleto") %>

- <%: traduci("ReportCompletoAllegati") %> + <%: traduci("PrepareReportCompletoAllegati") %> + <%: traduci("DownloadReportCompletoAllegati") %>
Fase diff --git a/CMS_SC/ReportCompleto.aspx.cs b/CMS_SC/ReportCompleto.aspx.cs index aaa59a8..8f1847d 100644 --- a/CMS_SC/ReportCompleto.aspx.cs +++ b/CMS_SC/ReportCompleto.aspx.cs @@ -36,6 +36,7 @@ namespace CMS_SC private void fixFullReportVisibility() { lbtExportWithAttach.Visible = devicesAuthProxy.stObj.userHasRight("ReportFullPdf") || devicesAuthProxy.stObj.userHasRight("CapoOfficina"); + hlDownloadPdf.Visible = false; } /// @@ -142,7 +143,12 @@ namespace CMS_SC string outFile = $"{Server.MapPath(currOutPath)}\\ReportFull_{idxDossier}.pdf"; pdfUtils.mergePdfFiles(outFile, elencoPdf); // step 5: chiamo pagina x download nuovo file composto... - Response.Redirect($"downloadReport?baseDir={currOutPath}&fileName=ReportFull_{idxDossier}.pdf&cType=pdf"); + // aggiorno button! + lbtExportWithAttach.Visible = false; + hlDownloadPdf.NavigateUrl = $"downloadReport?baseDir={currOutPath}&fileName=ReportFull_{idxDossier}.pdf&cType=pdf"; + hlDownloadPdf.Visible = true; + //Response.Redirect($"downloadReport?baseDir={currOutPath}&fileName=ReportFull_{idxDossier}.pdf&cType=pdf"); + } } diff --git a/CMS_SC/ReportCompleto.aspx.designer.cs b/CMS_SC/ReportCompleto.aspx.designer.cs index 59ec6ce..3366bd6 100644 --- a/CMS_SC/ReportCompleto.aspx.designer.cs +++ b/CMS_SC/ReportCompleto.aspx.designer.cs @@ -32,6 +32,15 @@ namespace CMS_SC /// protected global::System.Web.UI.WebControls.LinkButton lbtExportWithAttach; + /// + /// Controllo hlDownloadPdf. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.HyperLink hlDownloadPdf; + /// /// Controllo ddlFase. /// diff --git a/CMS_SC/downloadReport.aspx.cs b/CMS_SC/downloadReport.aspx.cs index 4897814..def7219 100644 --- a/CMS_SC/downloadReport.aspx.cs +++ b/CMS_SC/downloadReport.aspx.cs @@ -28,7 +28,6 @@ namespace CMS_SC { Response.ContentType = $"application/{cType}"; Response.AddHeader("Content-Disposition", $"attachment; filename={fileName}"); - Response.AddHeader("Refresh", $"3; url={user_std.pagPrecedente}"); Response.TransmitFile(file2download); Response.End(); } diff --git a/CMS_SC/tmp/1101/ReportFull_1101.pdf b/CMS_SC/tmp/1101/ReportFull_1101.pdf new file mode 100644 index 0000000..dd1fa88 Binary files /dev/null and b/CMS_SC/tmp/1101/ReportFull_1101.pdf differ