diff --git a/Jenkinsfile b/Jenkinsfile index 2a29ab5f..fc6afbd5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=866']) { + withEnv(['NEXT_BUILD_NUMBER=867']) { // env.versionNumber = VersionNumber(versionNumberString : '6.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '6.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-MON/Web.config b/MP-MON/Web.config index efd7302e..fdc27697 100644 --- a/MP-MON/Web.config +++ b/MP-MON/Web.config @@ -29,7 +29,7 @@ - + diff --git a/MP-Site/WebUserControls/mod_statoMacchina.ascx.cs b/MP-Site/WebUserControls/mod_statoMacchina.ascx.cs index 1af9d50c..6dabb54c 100644 --- a/MP-Site/WebUserControls/mod_statoMacchina.ascx.cs +++ b/MP-Site/WebUserControls/mod_statoMacchina.ascx.cs @@ -66,10 +66,10 @@ namespace MoonPro.WebUserControls try { // popolazione tabelle - tabMSE = MapoDb.DataLayer.obj.taMSE.getByIdxMacchina(IdxMacchina); + tabMSE = DataLayer.obj.taMSE.getByIdxMacchina(IdxMacchina); - tabAnagStati = MapoDb.DataLayer.obj.taAnagStati.GetData(); - tabKeepAlive = MapoDb.DataLayer.obj.taKeepAlive.GetData(); + tabAnagStati = DataLayer.obj.taAnagStati.GetData(); + tabKeepAlive = DataLayer.obj.taKeepAlive.GetData(); } catch { } diff --git a/MP-TAB/WebUserControls/mod_mappaStato.ascx b/MP-TAB/WebUserControls/mod_mappaStato.ascx index 2e371a36..d9ea305c 100644 --- a/MP-TAB/WebUserControls/mod_mappaStato.ascx +++ b/MP-TAB/WebUserControls/mod_mappaStato.ascx @@ -56,13 +56,12 @@ TypeName="MapoDb.DS_ProdTempiTableAdapters.MappaStatoExplTableAdapter"> - <%----%> - + diff --git a/MP-TAB/WebUserControls/mod_mappaStato.ascx.cs b/MP-TAB/WebUserControls/mod_mappaStato.ascx.cs index 6a4dcae1..bdf28eea 100644 --- a/MP-TAB/WebUserControls/mod_mappaStato.ascx.cs +++ b/MP-TAB/WebUserControls/mod_mappaStato.ascx.cs @@ -9,7 +9,6 @@ namespace MoonProTablet.WebUserControls { protected void Page_Load(object sender, EventArgs e) { - } /// /// url completo immagine @@ -62,7 +61,6 @@ namespace MoonProTablet.WebUserControls protected void Timer1_Tick(object sender, EventArgs e) { doUpdate(); - //ScriptManager.RegisterStartupScript(Page, GetType(), "temp", "", false); ScriptManager.RegisterStartupScript(Page, GetType(), "temp", "", false); } }