diff --git a/ETS-WS/ETS-WS/MyDocs.aspx b/ETS-WS/ETS-WS/MyDocs.aspx index 5768957..6182b77 100644 --- a/ETS-WS/ETS-WS/MyDocs.aspx +++ b/ETS-WS/ETS-WS/MyDocs.aspx @@ -6,8 +6,6 @@ <%@ Register Src="WebUserControls/mod_inputDati.ascx" TagName="mod_inputDati" TagPrefix="uc3" %> <%@ Register Src="WebUserControls/mod_pathAndDocs.ascx" TagName="mod_pathAndDocs" TagPrefix="uc4" %> - -
@@ -36,8 +34,14 @@
- - + + + + + + + +
diff --git a/ETS-WS/ETS-WS/MyDocs.aspx.cs b/ETS-WS/ETS-WS/MyDocs.aspx.cs index cd53b84..92a732b 100644 --- a/ETS-WS/ETS-WS/MyDocs.aspx.cs +++ b/ETS-WS/ETS-WS/MyDocs.aspx.cs @@ -11,20 +11,19 @@ namespace ETS_WS public partial class MyDocs : System.Web.UI.Page { /// - /// salvo stato upload in corso... + /// salvo countDown upload in corso... /// - protected bool uploadInCorso + protected int countDown { get { - return utils.obj.BoolSessionObj("uploadInCorso"); + return utils.obj.IntSessionObj("countDown"); } set { - utils.obj.setSessionVal("uploadInCorso", value); + utils.obj.setSessionVal("countDown", value); } } - /// /// caricamento pagina /// @@ -32,10 +31,9 @@ namespace ETS_WS /// protected void Page_Load(object sender, EventArgs e) { - - if (!Page.IsPostBack && !uploadInCorso) + //Page.IsCallback; + if (!Page.IsPostBack) { - timerUpload.Enabled = false; showUpload = true; setPnlVisibility(); } @@ -44,6 +42,14 @@ namespace ETS_WS mod_pathAndDocs1.eh_reqSalva += new EventHandler(mod_pathAndDocs1_eh_reqSalva); timerUpload.Tick += new EventHandler(timerUpload_Tick); } + + //protected override void OnUnload(EventArgs e) + //{ + // base.OnUnload(e); + + // timerUpload.Tick += new EventHandler(timerUpload_Tick); + //} + /// /// quando scade il timer rimanda a visualizzazione risultati /// @@ -51,9 +57,21 @@ namespace ETS_WS /// void timerUpload_Tick(object sender, EventArgs e) { - showUpload = false; - setPnlVisibility(); - timerUpload.Enabled = false; + // solo se in "fase upload" + if (showUpload) + { + // controllo countDown... + if (countDown > 0) + { + countDown--; + } + else if (countDown == 0) + { + showUpload = false; + setPnlVisibility(); + countDown = -1; + } + } } /// /// update inserimento metadati @@ -80,8 +98,7 @@ namespace ETS_WS /// void mod_fileUpload1_eh_fileCaricato(object sender, EventArgs e) { - uploadInCorso = true; - timerUpload.Enabled = true; + countDown = utils.obj.confReadInt("countDownUploadFile"); } /// /// fix panel visibility @@ -120,7 +137,6 @@ namespace ETS_WS /// protected void lnkUpload_Click(object sender, EventArgs e) { - uploadInCorso = false; showUpload = true; setPnlVisibility(); } @@ -131,7 +147,6 @@ 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 226abf5..d7b9f4a 100644 --- a/ETS-WS/ETS-WS/MyDocs.aspx.designer.cs +++ b/ETS-WS/ETS-WS/MyDocs.aspx.designer.cs @@ -12,15 +12,6 @@ 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. /// @@ -75,6 +66,24 @@ namespace ETS_WS { /// protected global::ETS_WS.WebUserControls.mod_inputDati mod_inputDati1; + /// + /// upMain control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.UpdatePanel upMain; + + /// + /// timerUpload control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.Timer timerUpload; + /// /// mod_pathAndDocs1 control. /// diff --git a/ETS-WS/ETS-WS/Web.config b/ETS-WS/ETS-WS/Web.config index 7aa2f66..a6920af 100644 --- a/ETS-WS/ETS-WS/Web.config +++ b/ETS-WS/ETS-WS/Web.config @@ -28,7 +28,7 @@ - + @@ -39,6 +39,7 @@ + diff --git a/ETS-WS/ETS-WS/WebMasterPages/AjaxSimpleFull.Master b/ETS-WS/ETS-WS/WebMasterPages/AjaxSimpleFull.Master index 830e9ff..ad11eb4 100644 --- a/ETS-WS/ETS-WS/WebMasterPages/AjaxSimpleFull.Master +++ b/ETS-WS/ETS-WS/WebMasterPages/AjaxSimpleFull.Master @@ -1,13 +1,11 @@ -<%@ Master Language="C#" AutoEventWireup="true" CodeBehind="AjaxSimpleFull.master.cs" - Inherits="GMW.WebMasterPages.AjaxSimpleFull" %> +<%@ Master Language="C#" AutoEventWireup="true" CodeBehind="AjaxSimpleFull.master.cs" Inherits="GMW.WebMasterPages.AjaxSimpleFull" %> <%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %> <%@ Register Src="../WebUserControls/mod_testata.ascx" TagName="mod_testata" TagPrefix="uc1" %> -<%@ Register Src="../WebUserControls/mod_menuBottomFullpage.ascx" TagName="mod_menuBottomFullpage" - TagPrefix="uc2" %> +<%@ Register Src="../WebUserControls/mod_menuBottomFullpage.ascx" TagName="mod_menuBottomFullpage" TagPrefix="uc2" %> <% if (false) { %> - + <% } %> @@ -17,9 +15,9 @@ <%--Area jQueryUI via CDN--%> - + - + <%--Area jQuery via delivery locale--%> <%-- @@ -43,26 +41,34 @@
- +
- - - <%--testata pagina--%> -
+ <%--testata pagina--%> +
+ + -
-
+ + +
+ <%--corpo pagina--%> +
+ + -
- <%--footer pagina--%> -
+ + +
+ <%--footer pagina--%> +
+ + -
- - + + +
diff --git a/ETS-WS/ETS-WS/WebMasterPages/AjaxSimpleFull.Master.designer.cs b/ETS-WS/ETS-WS/WebMasterPages/AjaxSimpleFull.Master.designer.cs index 72283dc..545e8ac 100644 --- a/ETS-WS/ETS-WS/WebMasterPages/AjaxSimpleFull.Master.designer.cs +++ b/ETS-WS/ETS-WS/WebMasterPages/AjaxSimpleFull.Master.designer.cs @@ -40,13 +40,13 @@ namespace GMW.WebMasterPages { protected global::AjaxControlToolkit.ToolkitScriptManager ToolkitScriptManager1; /// - /// updPanelPagina control. + /// updPanelTop control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.UpdatePanel updPanelPagina; + protected global::System.Web.UI.UpdatePanel updPanelTop; /// /// mod_testata1 control. @@ -57,6 +57,15 @@ namespace GMW.WebMasterPages { /// protected global::ETS_WS.WebUserControls.mod_testata mod_testata1; + /// + /// upMain control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.UpdatePanel upMain; + /// /// ContentPlaceHolder1 control. /// @@ -66,6 +75,15 @@ namespace GMW.WebMasterPages { /// protected global::System.Web.UI.WebControls.ContentPlaceHolder ContentPlaceHolder1; + /// + /// upLineClock control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.UpdatePanel upLineClock; + /// /// mod_menuBottomFullpage1 control. /// diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_fileUpload.ascx.cs b/ETS-WS/ETS-WS/WebUserControls/mod_fileUpload.ascx.cs index 3b50bd0..1939ba4 100644 --- a/ETS-WS/ETS-WS/WebUserControls/mod_fileUpload.ascx.cs +++ b/ETS-WS/ETS-WS/WebUserControls/mod_fileUpload.ascx.cs @@ -35,7 +35,7 @@ namespace ETS_WS.WebUserControls // carico path e file path = string.Format("{0}/{1}", path, System.IO.Path.GetFileName(e.FileName)); fileUpload.SaveAs(MapPath(path)); - lg.Info("salvato file: {0}, {1} Kb", path, e.FileSize / 1024); + lg.Info("salvato file: {0}, {1:#.0} Kb", path, (double)e.FileSize / 1024); if (eh_fileCaricato != null) { eh_fileCaricato(this, new EventArgs()); diff --git a/ETS-WS/ETS-WS/bin/ETS-WS.dll b/ETS-WS/ETS-WS/bin/ETS-WS.dll index e2d1514..45121a3 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 71d05a5..a0ce5be 100644 Binary files a/ETS-WS/ETS-WS/bin/ETS_Data.dll and b/ETS-WS/ETS-WS/bin/ETS_Data.dll differ