diff --git a/Jenkinsfile b/Jenkinsfile index 390d5499..9be4231c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=615']) { + withEnv(['NEXT_BUILD_NUMBER=617']) { // env.versionNumber = VersionNumber(versionNumberString : '${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '${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 b/MP-Tablet/DettaglioMacchina.aspx index 53107a3f..66030b32 100644 --- a/MP-Tablet/DettaglioMacchina.aspx +++ b/MP-Tablet/DettaglioMacchina.aspx @@ -12,7 +12,6 @@ - <%--
--%>
diff --git a/MP-Tablet/DettaglioMacchina.aspx.designer.cs b/MP-Tablet/DettaglioMacchina.aspx.designer.cs index 04e66708..900fe26a 100644 --- a/MP-Tablet/DettaglioMacchina.aspx.designer.cs +++ b/MP-Tablet/DettaglioMacchina.aspx.designer.cs @@ -1,51 +1,50 @@ //------------------------------------------------------------------------------ -// -// This code was generated by a tool. +// +// Codice generato da uno strumento. // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// +// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se +// il codice viene rigenerato. +// //------------------------------------------------------------------------------ -namespace MoonProTablet -{ - - +namespace MoonProTablet { + + public partial class DettaglioMacchina { /// - /// mod_dettMacchina1 control. + /// Controllo mod_dettMacchina1. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::MoonProTablet.WebUserControls.mod_dettMacchina mod_dettMacchina1; /// - /// mod_confProd1 control. + /// Controllo mod_confProd1. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::MoonProTablet.WebUserControls.mod_confProd mod_confProd1; /// - /// mod_dettaglioProd2 control. + /// Controllo mod_dettaglioProd2. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::MoonProTablet.WebUserControls.mod_dettaglioProd mod_dettaglioProd2; /// - /// mod_dettTurni2 control. + /// Controllo mod_dettTurni2. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::MoonProTablet.WebUserControls.mod_dettTurni mod_dettTurni2; } diff --git a/MP-Tablet/Web.config b/MP-Tablet/Web.config index 77960c26..21b71d93 100644 --- a/MP-Tablet/Web.config +++ b/MP-Tablet/Web.config @@ -92,9 +92,9 @@ - - - + + + diff --git a/MP-Tablet/WebUserControls/mod_dettMacchina.ascx.cs b/MP-Tablet/WebUserControls/mod_dettMacchina.ascx.cs index 5fe39f9a..775216af 100644 --- a/MP-Tablet/WebUserControls/mod_dettMacchina.ascx.cs +++ b/MP-Tablet/WebUserControls/mod_dettMacchina.ascx.cs @@ -4,81 +4,81 @@ using System.Web.UI; namespace MoonProTablet.WebUserControls { - public partial class mod_dettMacchina : System.Web.UI.UserControl + public partial class mod_dettMacchina : System.Web.UI.UserControl + { + /// + /// idx macchina selezionata + /// + public string idxMacchina { - /// - /// idx macchina selezionata - /// - public string idxMacchina - { - get - { - return memLayer.ML.StringSessionObj("IdxMacchina"); - } - set - { - memLayer.ML.setSessionVal("IdxMacchina", value); - } - } - - /// - /// caricamento pagina - /// - /// - /// - protected void Page_Load(object sender, EventArgs e) - { - // controllo se ho dett macchina altrimenti ritorno a pagina generale... - if (idxMacchina !="") - { - Response.Redirect("~/MappaStato.aspx"); - } - } - /// - /// url completo immagine - /// - /// - /// - public string ImgUrl(object url) - { - return string.Format("./images/macchine/{0}", url); - } - /// - /// fomratta durata in minuti/ore/gg a seconda del totale... - /// - /// - /// - public string formatDurata(object min) - { - return utility.formatDurata(min); - } - /// - /// fa update del controllo - /// - public void doUpdate() - { - ods.DataBind(); - repLI.DataBind(); - } - /// - /// timeout scaduto - /// - /// - /// - protected void Timer1_Tick(object sender, EventArgs e) - { - doUpdate(); - //ScriptManager.RegisterStartupScript(Page, GetType(), "temp", "", false); - ScriptManager.RegisterStartupScript(Page, GetType(), "temp", "", false); - } - /// - /// determian se nascondere la visualizzaizone compelta (e mostrare solo nome macchina) - /// - /// mostra tutto (true) o solo header(false) - public void detailLevel(bool full) - { - pnlFullDet.Visible = full; - pnlLessDet.Visible = !full; - } + get + { + return memLayer.ML.StringSessionObj("IdxMacchina"); + } + set + { + memLayer.ML.setSessionVal("IdxMacchina", value); + } } + + /// + /// caricamento pagina + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + // controllo se ho dett macchina altrimenti ritorno a pagina generale... + if (idxMacchina == "") + { + Response.Redirect("~/MappaStato.aspx"); + } + } + /// + /// url completo immagine + /// + /// + /// + public string ImgUrl(object url) + { + return string.Format("./images/macchine/{0}", url); + } + /// + /// fomratta durata in minuti/ore/gg a seconda del totale... + /// + /// + /// + public string formatDurata(object min) + { + return utility.formatDurata(min); + } + /// + /// fa update del controllo + /// + public void doUpdate() + { + ods.DataBind(); + repLI.DataBind(); + } + /// + /// timeout scaduto + /// + /// + /// + protected void Timer1_Tick(object sender, EventArgs e) + { + doUpdate(); + //ScriptManager.RegisterStartupScript(Page, GetType(), "temp", "", false); + ScriptManager.RegisterStartupScript(Page, GetType(), "temp", "", false); + } + /// + /// determian se nascondere la visualizzaizone compelta (e mostrare solo nome macchina) + /// + /// mostra tutto (true) o solo header(false) + public void detailLevel(bool full) + { + pnlFullDet.Visible = full; + pnlLessDet.Visible = !full; + } + } } \ No newline at end of file diff --git a/MP-Tablet/WebUserControls/mod_mappaStato.ascx b/MP-Tablet/WebUserControls/mod_mappaStato.ascx index 44f63790..474a77e5 100644 --- a/MP-Tablet/WebUserControls/mod_mappaStato.ascx +++ b/MP-Tablet/WebUserControls/mod_mappaStato.ascx @@ -32,7 +32,6 @@ TypeName="MapoDb.DS_ProdTempiTableAdapters.MappaStatoExplTableAdapter"> - <%----%>