From bdd0033992f726c646b50d0496bb3a72cf0e288f Mon Sep 17 00:00:00 2001 From: samuele Date: Tue, 23 Oct 2012 10:50:49 +0200 Subject: [PATCH] fix gestione caricamento e refresh con timer OCCHIO al parametro countdown!!! --- ETS-WS/ETS-WS/MyDocs.aspx | 12 +++-- ETS-WS/ETS-WS/MyDocs.aspx.cs | 45 ++++++++++------ ETS-WS/ETS-WS/MyDocs.aspx.designer.cs | 27 ++++++---- ETS-WS/ETS-WS/Web.config | 3 +- .../WebMasterPages/AjaxSimpleFull.Master | 48 ++++++++++-------- .../AjaxSimpleFull.Master.designer.cs | 22 +++++++- .../WebUserControls/mod_fileUpload.ascx.cs | 2 +- ETS-WS/ETS-WS/bin/ETS-WS.dll | Bin 56832 -> 56832 bytes ETS-WS/ETS-WS/bin/ETS_Data.dll | Bin 365056 -> 365056 bytes 9 files changed, 106 insertions(+), 53 deletions(-) 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 e2d1514603b8cdfdd412c053951626c4abaca3ac..45121a389a1111a39020cff927bb8af62d75e066 100644 GIT binary patch delta 11644 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 diff --git a/ETS-WS/ETS-WS/bin/ETS_Data.dll b/ETS-WS/ETS-WS/bin/ETS_Data.dll index 71d05a506282afc3961a8a36ad184b781431f47c..a0ce5be757a73fe768caec787632c02fd4c0b018 100644 GIT binary patch delta 70 zcmZozBG#}(Y(fV!zg=5ncWXCeYd2GCH*;$@%hqnz)MSA$MVFK>JAOFKPj!*cdbs)d ZwiMP6svyPFKXWh?P7h*4glf58`b~- delta 70 zcmZozBG#}(Y(fX~ovhZz?$&O`)^4WOZsyi*maW~asmTJ1rt$p@5=wMvwrl&d=!i}H ZwiMP6svyPFKX