diff --git a/ETS-WS/ETS-WS/MyDocs.aspx b/ETS-WS/ETS-WS/MyDocs.aspx index 5e6c08a..5768957 100644 --- a/ETS-WS/ETS-WS/MyDocs.aspx +++ b/ETS-WS/ETS-WS/MyDocs.aspx @@ -6,6 +6,8 @@ <%@ Register Src="WebUserControls/mod_inputDati.ascx" TagName="mod_inputDati" TagPrefix="uc3" %> <%@ Register Src="WebUserControls/mod_pathAndDocs.ascx" TagName="mod_pathAndDocs" TagPrefix="uc4" %> + +
diff --git a/ETS-WS/ETS-WS/MyDocs.aspx.cs b/ETS-WS/ETS-WS/MyDocs.aspx.cs index cfd59f0..cd53b84 100644 --- a/ETS-WS/ETS-WS/MyDocs.aspx.cs +++ b/ETS-WS/ETS-WS/MyDocs.aspx.cs @@ -10,27 +10,50 @@ namespace ETS_WS { public partial class MyDocs : System.Web.UI.Page { + /// + /// salvo stato upload in corso... + /// + protected bool uploadInCorso + { + get + { + return utils.obj.BoolSessionObj("uploadInCorso"); + } + set + { + utils.obj.setSessionVal("uploadInCorso", value); + } + } + /// + /// caricamento pagina + /// + /// + /// protected void Page_Load(object sender, EventArgs e) { - if (!Page.IsPostBack) + if (!Page.IsPostBack && !uploadInCorso) { + timerUpload.Enabled = false; showUpload = true; setPnlVisibility(); -#if false - // verifico se c'รจ in sessione una richiesta di editing ed adeguo visualizzazione! - if (WebShipUtils.mng.idxFileEdit > 0) - { - showUpload = false; - setPnlVisibility(); - mod_inputDati1.loadEditData(); - } -#endif } mod_fileUpload1.eh_fileCaricato += new EventHandler(mod_fileUpload1_eh_fileCaricato); mod_inputDati1.eh_newData += new EventHandler(mod_inputDati1_eh_newData); mod_pathAndDocs1.eh_reqSalva += new EventHandler(mod_pathAndDocs1_eh_reqSalva); + timerUpload.Tick += new EventHandler(timerUpload_Tick); + } + /// + /// quando scade il timer rimanda a visualizzazione risultati + /// + /// + /// + void timerUpload_Tick(object sender, EventArgs e) + { + showUpload = false; + setPnlVisibility(); + timerUpload.Enabled = false; } /// /// update inserimento metadati @@ -57,9 +80,12 @@ namespace ETS_WS /// void mod_fileUpload1_eh_fileCaricato(object sender, EventArgs e) { - mod_myTempFile1.doUpdate(); + uploadInCorso = true; + timerUpload.Enabled = true; } - + /// + /// fix panel visibility + /// private void setPnlVisibility() { pnlFileUpload.Visible = showUpload; @@ -73,7 +99,14 @@ namespace ETS_WS { get { - return utils.obj.BoolSessionObj("showPnlUpdate"); + bool answ = true; + try + { + answ = utils.obj.BoolSessionObj("showPnlUpdate"); + } + catch + { } + return answ; } set { @@ -87,6 +120,7 @@ namespace ETS_WS /// protected void lnkUpload_Click(object sender, EventArgs e) { + uploadInCorso = false; showUpload = true; setPnlVisibility(); } @@ -97,6 +131,7 @@ namespace ETS_WS /// protected void lnkGestione_Click(object sender, EventArgs e) { + uploadInCorso = false; showUpload = false; setPnlVisibility(); } diff --git a/ETS-WS/ETS-WS/MyDocs.aspx.designer.cs b/ETS-WS/ETS-WS/MyDocs.aspx.designer.cs index 110deeb..226abf5 100644 --- a/ETS-WS/ETS-WS/MyDocs.aspx.designer.cs +++ b/ETS-WS/ETS-WS/MyDocs.aspx.designer.cs @@ -12,6 +12,15 @@ namespace ETS_WS { public partial class MyDocs { + /// + /// timerUpload control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.Timer timerUpload; + /// /// lnkUpload control. /// diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_fileUpload.ascx.cs b/ETS-WS/ETS-WS/WebUserControls/mod_fileUpload.ascx.cs index d1bcf03..3b50bd0 100644 --- a/ETS-WS/ETS-WS/WebUserControls/mod_fileUpload.ascx.cs +++ b/ETS-WS/ETS-WS/WebUserControls/mod_fileUpload.ascx.cs @@ -18,6 +18,7 @@ namespace ETS_WS.WebUserControls { lg = LogManager.GetCurrentClassLogger(); } + /// /// completato upload file /// diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_myTempFile.ascx b/ETS-WS/ETS-WS/WebUserControls/mod_myTempFile.ascx index c4fd8d2..2ce3707 100644 --- a/ETS-WS/ETS-WS/WebUserControls/mod_myTempFile.ascx +++ b/ETS-WS/ETS-WS/WebUserControls/mod_myTempFile.ascx @@ -58,7 +58,7 @@ - + diff --git a/ETS-WS/ETS-WS/bin/ETS-WS.dll b/ETS-WS/ETS-WS/bin/ETS-WS.dll index 3ac94c5..e2d1514 100644 Binary files a/ETS-WS/ETS-WS/bin/ETS-WS.dll and b/ETS-WS/ETS-WS/bin/ETS-WS.dll differ diff --git a/ETS-WS/ETS-WS/bin/ETS_Data.dll b/ETS-WS/ETS-WS/bin/ETS_Data.dll index 2a518c5..71d05a5 100644 Binary files a/ETS-WS/ETS-WS/bin/ETS_Data.dll and b/ETS-WS/ETS-WS/bin/ETS_Data.dll differ