diff --git a/Jenkinsfile b/Jenkinsfile index 691205bf..5ef6484c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -18,7 +18,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=1212']) { + withEnv(['NEXT_BUILD_NUMBER=1213']) { // env.versionNumber = VersionNumber(versionNumberString : '6.6.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '6.6.${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-TAB/ODL.aspx.cs b/MP-TAB/ODL.aspx.cs index 83d03a4d..45f9016a 100644 --- a/MP-TAB/ODL.aspx.cs +++ b/MP-TAB/ODL.aspx.cs @@ -139,6 +139,8 @@ namespace MoonProTablet private void checkAll() { + // parto: nascondo tutto... + mod_ODL1.hideAll(); fixSelMacc(); memLayer.ML.setSessionVal("TipoLink", "EditMacch"); // imposto idxMacchina x subControl... @@ -216,6 +218,7 @@ namespace MoonProTablet protected void ddlSubMacc_SelectedIndexChanged(object sender, EventArgs e) { + // procedo... subMaccSel = ddlSubMacc.SelectedValue; checkAll(); } diff --git a/MP-TAB/WebUserControls/cmp_dettODL.ascx.cs b/MP-TAB/WebUserControls/cmp_dettODL.ascx.cs index bce7fd32..e8e1dd59 100644 --- a/MP-TAB/WebUserControls/cmp_dettODL.ascx.cs +++ b/MP-TAB/WebUserControls/cmp_dettODL.ascx.cs @@ -30,5 +30,6 @@ namespace MoonProTablet.WebUserControls frmView.DataBind(); } } + } } \ No newline at end of file diff --git a/MP-TAB/WebUserControls/mod_ODL.ascx.cs b/MP-TAB/WebUserControls/mod_ODL.ascx.cs index ef47c8ca..44fc55e3 100644 --- a/MP-TAB/WebUserControls/mod_ODL.ascx.cs +++ b/MP-TAB/WebUserControls/mod_ODL.ascx.cs @@ -420,6 +420,11 @@ namespace MoonProTablet.WebUserControls Response.Redirect("~/ODL"); } + public void hideAll() + { + divDettOdl.Visible = false; + } + public void checkAll() { lblOut.Text = ""; diff --git a/MP-TAB/fixODL.aspx.cs b/MP-TAB/fixODL.aspx.cs index 2aa9dd33..bd25a3f0 100644 --- a/MP-TAB/fixODL.aspx.cs +++ b/MP-TAB/fixODL.aspx.cs @@ -147,7 +147,7 @@ namespace MoonProTablet return answ; } } - + protected void ddlODL_SelectedIndexChanged(object sender, EventArgs e) { @@ -197,10 +197,14 @@ namespace MoonProTablet { logger.lg.scriviLog(string.Format("Errore recupero ODL corrente da confermare per la macchina {0}{1}{2}", idxMacchina, Environment.NewLine, exc), tipoLog.ERROR); } - if (odlOk) - { - Response.Redirect("ODL"); - } + //if (odlOk) + //{ + Response.Redirect("ODL"); + //} + //else + //{ + // mod_dettMacchina1.doUpdate(); + //} } } } \ No newline at end of file