From d53966673a632e02ebda74bee7d0ba5f8690f25d Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Fri, 9 Mar 2018 15:06:38 +0100 Subject: [PATCH] Altro test con toggle a tempo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit mette e registra di togliere menù laterale... --- Jenkinsfile | 2 +- MP-Tablet/DettaglioMacchina.aspx.cs | 11 ++ MP-Tablet/Web.config | 2 +- MP-Tablet/WebMasterPages/Bootstrap.Master.cs | 7 + .../WebUserControls/mod_dettMacchina.ascx | 2 +- .../WebUserControls/mod_dettMacchina.ascx.cs | 17 +- MP-Tablet/WebUserControls/mod_title.ascx | 156 ++++++++++-------- MP-Tablet/WebUserControls/mod_title.ascx.cs | 13 +- .../mod_title.ascx.designer.cs | 9 + 9 files changed, 145 insertions(+), 74 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7317046f..2bccc1d2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=689']) { + withEnv(['NEXT_BUILD_NUMBER=690']) { // env.versionNumber = VersionNumber(versionNumberString : '5.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '5.0.${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-Tablet/DettaglioMacchina.aspx.cs b/MP-Tablet/DettaglioMacchina.aspx.cs index 5ccb8fcc..502a0a04 100644 --- a/MP-Tablet/DettaglioMacchina.aspx.cs +++ b/MP-Tablet/DettaglioMacchina.aspx.cs @@ -1,6 +1,7 @@ using SteamWare; using System; using System.Web.UI; +using WebMasterPages; namespace MoonProTablet { @@ -29,6 +30,16 @@ namespace MoonProTablet mod_confProd1.eh_inserting += mod_confProd1_eh_inserting; mod_confProd1.eh_newVal += mod_confProd1_eh_newVal; mod_confProd1.eh_reset += mod_confProd1_eh_reset; + mod_dettMacchina1.eh_reqRemoveModal += Mod_dettMacchina1_eh_reqRemoveModal; + } + /// + /// Fatto refresh dettaglio --> richeisto rimozione modal... + /// + /// + /// + private void Mod_dettMacchina1_eh_reqRemoveModal(object sender, EventArgs e) + { + ((Bootstrap)this.Master).removeModal(); } void mod_confProd1_eh_reset(object sender, EventArgs e) diff --git a/MP-Tablet/Web.config b/MP-Tablet/Web.config index 08c43b98..8d8b9338 100644 --- a/MP-Tablet/Web.config +++ b/MP-Tablet/Web.config @@ -57,7 +57,7 @@ - + diff --git a/MP-Tablet/WebMasterPages/Bootstrap.Master.cs b/MP-Tablet/WebMasterPages/Bootstrap.Master.cs index d872c935..9d27b616 100644 --- a/MP-Tablet/WebMasterPages/Bootstrap.Master.cs +++ b/MP-Tablet/WebMasterPages/Bootstrap.Master.cs @@ -13,5 +13,12 @@ namespace WebMasterPages protected void Page_Load(object sender, EventArgs e) { } + /// + /// Chiede al menùTop di chiudere il pnl modale... + /// + public void removeModal() + { + mod_title.removeModal(); + } } } \ No newline at end of file diff --git a/MP-Tablet/WebUserControls/mod_dettMacchina.ascx b/MP-Tablet/WebUserControls/mod_dettMacchina.ascx index 51cf9f32..f0fa4854 100644 --- a/MP-Tablet/WebUserControls/mod_dettMacchina.ascx +++ b/MP-Tablet/WebUserControls/mod_dettMacchina.ascx @@ -1,6 +1,6 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_dettMacchina.ascx.cs" Inherits="MoonProTablet.WebUserControls.mod_dettMacchina" %> <%--Riporto dettaglio singola macchina--%> - +
diff --git a/MP-Tablet/WebUserControls/mod_dettMacchina.ascx.cs b/MP-Tablet/WebUserControls/mod_dettMacchina.ascx.cs index d05c46aa..2b87f5cc 100644 --- a/MP-Tablet/WebUserControls/mod_dettMacchina.ascx.cs +++ b/MP-Tablet/WebUserControls/mod_dettMacchina.ascx.cs @@ -6,6 +6,10 @@ namespace MoonProTablet.WebUserControls { public partial class mod_dettMacchina : System.Web.UI.UserControl { + /// + /// fatto refresh --> chiedo remove modal (se c'è) + /// + public event EventHandler eh_reqRemoveModal; /// /// idx macchina selezionata /// @@ -28,7 +32,10 @@ namespace MoonProTablet.WebUserControls /// protected void Page_Load(object sender, EventArgs e) { - dmTimer.Interval = memLayer.ML.CRI("dtTimerInt"); + if (!Page.IsPostBack) + { + dmTimer.Interval = memLayer.ML.CRI("dtTimerInt"); + } // controllo se ho dett macchina altrimenti ritorno a pagina generale... if (idxMacchina == "") { @@ -71,7 +78,13 @@ namespace MoonProTablet.WebUserControls /// /// protected void Timer1_Tick(object sender, EventArgs e) - { + { + // sollevo evento! + if (eh_reqRemoveModal != null) + { + eh_reqRemoveModal(this, new EventArgs()); + } + // update doUpdate(); //ScriptManager.RegisterStartupScript(Page, GetType(), "temp", "", false); ScriptManager.RegisterStartupScript(Page, GetType(), "temp", "", false); diff --git a/MP-Tablet/WebUserControls/mod_title.ascx b/MP-Tablet/WebUserControls/mod_title.ascx index b1ae126f..0cba9d6c 100644 --- a/MP-Tablet/WebUserControls/mod_title.ascx +++ b/MP-Tablet/WebUserControls/mod_title.ascx @@ -1,90 +1,112 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_title.ascx.cs" Inherits="MoonProTablet.WebUserControls.mod_title" %> - -