From ac1108a2079c364d06641aa0190afefdd0d3db88 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Thu, 4 Feb 2021 09:18:41 +0100 Subject: [PATCH] Gestione timer variabile in pedane --- Jenkinsfile | 2 +- MP-MAG/BaseUserControl.cs | 17 ++++++++ MP-MAG/Web.config | 5 +++ MP-MAG/WebUserControls/cmp_elencoPedane.ascx | 2 +- .../WebUserControls/cmp_elencoPedane.ascx.cs | 15 +++++++ MP-MAG/WebUserControls/cmp_gestPedane.ascx | 1 - MP-MAG/WebUserControls/cmp_gestPedane.ascx.cs | 41 ++++++++++++++++++- 7 files changed, 79 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6e2700e2..da427e3d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,7 +13,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=1391']) { + withEnv(['NEXT_BUILD_NUMBER=1392']) { // env.versionNumber = VersionNumber(versionNumberString : '6.12.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '6.12.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'MAPO' diff --git a/MP-MAG/BaseUserControl.cs b/MP-MAG/BaseUserControl.cs index 6b4df2d2..8df38723 100644 --- a/MP-MAG/BaseUserControl.cs +++ b/MP-MAG/BaseUserControl.cs @@ -42,6 +42,11 @@ namespace MP_MAG /// public event EventHandler eh_doReset; + /// + /// Generico evento "stato editing" + /// + public event EventHandler eh_editing; + #endregion Public Events #region Protected Properties @@ -393,6 +398,18 @@ namespace MP_MAG } } + /// + /// Chiamata evento editing + /// + public void raiseEditing() + { + // se qualcuno ascolta sollevo evento nuovo valore... + if (eh_editing != null) + { + eh_editing(this, new EventArgs()); + } + } + /// /// Chiamata evento /// diff --git a/MP-MAG/Web.config b/MP-MAG/Web.config index bb863c70..c079e858 100644 --- a/MP-MAG/Web.config +++ b/MP-MAG/Web.config @@ -27,6 +27,7 @@ + @@ -35,10 +36,14 @@ + + + + diff --git a/MP-MAG/WebUserControls/cmp_elencoPedane.ascx b/MP-MAG/WebUserControls/cmp_elencoPedane.ascx index 393efd30..9e719596 100644 --- a/MP-MAG/WebUserControls/cmp_elencoPedane.ascx +++ b/MP-MAG/WebUserControls/cmp_elencoPedane.ascx @@ -34,7 +34,7 @@
- + diff --git a/MP-MAG/WebUserControls/cmp_elencoPedane.ascx.cs b/MP-MAG/WebUserControls/cmp_elencoPedane.ascx.cs index a48c6749..8c3d7107 100644 --- a/MP-MAG/WebUserControls/cmp_elencoPedane.ascx.cs +++ b/MP-MAG/WebUserControls/cmp_elencoPedane.ascx.cs @@ -100,6 +100,11 @@ namespace MP_MAG.WebUserControls #region Protected Methods + protected void grView_RowCancelingEdit(object sender, GridViewCancelEditEventArgs e) + { + raiseReset(); + } + protected void grView_RowCommand(object sender, GridViewCommandEventArgs e) { if (e.CommandArgument != null) @@ -112,6 +117,16 @@ namespace MP_MAG.WebUserControls } } + protected void grView_RowEditing(object sender, GridViewEditEventArgs e) + { + raiseEditing(); + } + + protected void grView_RowUpdated(object sender, GridViewUpdatedEventArgs e) + { + raiseEvent(); + } + protected void grView_SelectedIndexChanged(object sender, EventArgs e) { // esegue stampa... diff --git a/MP-MAG/WebUserControls/cmp_gestPedane.ascx b/MP-MAG/WebUserControls/cmp_gestPedane.ascx index 90e4afb2..f718cd40 100644 --- a/MP-MAG/WebUserControls/cmp_gestPedane.ascx +++ b/MP-MAG/WebUserControls/cmp_gestPedane.ascx @@ -6,7 +6,6 @@ -
diff --git a/MP-MAG/WebUserControls/cmp_gestPedane.ascx.cs b/MP-MAG/WebUserControls/cmp_gestPedane.ascx.cs index c3dd123e..1a9a1103 100644 --- a/MP-MAG/WebUserControls/cmp_gestPedane.ascx.cs +++ b/MP-MAG/WebUserControls/cmp_gestPedane.ascx.cs @@ -1,4 +1,5 @@ -using System; +using SteamWare; +using System; using System.Collections.Generic; using System.Linq; using System.Web; @@ -9,6 +10,22 @@ namespace MP_MAG.WebUserControls { public partial class cmp_gestPedane : BaseUserControl { + #region Protected Properties + + protected int reqTimerInterval + { + get + { + return timerGestPed.Interval; + } + set + { + timerGestPed.Interval = value; + } + } + + #endregion Protected Properties + #region Public Properties public int PackListID @@ -33,16 +50,23 @@ namespace MP_MAG.WebUserControls private void Cmp_elencoPedane_eh_doRefresh(object sender, EventArgs e) { + setRapidRefresh(true); cmp_elencoUDC.Visible = true; cmp_elencoUDC.AlSel = cmp_elencoPedane.AlSel; } private void Cmp_elencoPedane_eh_doReset(object sender, EventArgs e) { + setRapidRefresh(true); cmp_elencoUDC.Visible = false; raiseReset(); } + private void Cmp_elencoPedane_eh_editing(object sender, EventArgs e) + { + setRapidRefresh(false); + } + private void Cmp_elencoUDC_eh_doReset(object sender, EventArgs e) { fixDisplay(); @@ -56,13 +80,19 @@ namespace MP_MAG.WebUserControls protected void Page_Load(object sender, EventArgs e) { + if (!Page.IsPostBack) + { + setRapidRefresh(true); + } cmp_elencoPedane.eh_doRefresh += Cmp_elencoPedane_eh_doRefresh; cmp_elencoPedane.eh_doReset += Cmp_elencoPedane_eh_doReset; + cmp_elencoPedane.eh_editing += Cmp_elencoPedane_eh_editing; cmp_elencoUDC.eh_doReset += Cmp_elencoUDC_eh_doReset; } protected void timerGestPed_Tick(object sender, EventArgs e) { + // chiamo refresh refreshStatus(); } @@ -90,6 +120,15 @@ namespace MP_MAG.WebUserControls cmp_elencoUDC.Visible = false; } + /// + /// Imposta il timer refresh rapido + /// + /// True = refresh rapido (1s) | False = lento (15s) + public void setRapidRefresh(bool isRapid) + { + reqTimerInterval = isRapid ? memLayer.ML.CRI("fastUpdateMs") : memLayer.ML.CRI("slowUpdateMs"); + } + #endregion Public Methods } } \ No newline at end of file