fix per doppio pooallet + ritardo maggiore

This commit is contained in:
Samuele E. Locatelli
2020-11-17 15:10:12 +01:00
parent 93e3a9ca17
commit 36c3c8fbc9
4 changed files with 4 additions and 29 deletions
Vendored
+1 -1
View File
@@ -12,7 +12,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=1323']) {
withEnv(['NEXT_BUILD_NUMBER=1324']) {
// env.versionNumber = VersionNumber(versionNumberString : '6.11.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '6.11.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO'
+1 -10
View File
@@ -1,13 +1,6 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_confProd.ascx.cs" Inherits="MoonProTablet.WebUserControls.mod_confProd" %>
<script type="text/javascript">
<%-- var prm = Sys.WebForms.PageRequestManager.getInstance();
prm.add_endRequest(function () {
console.log("end prm!");
document.getElementById('<%= lblUpdating.ClientID %>').hidden = true;
});--%>
function hideConfirmButton() {
//console.log('hide confirm');
document.getElementById('<%= lbtSalva.ClientID %>').hidden = true;
@@ -22,12 +15,10 @@
console.log('start delay'); setTimeout(function () {
console.log('after');
document.getElementById('<%= lblUpdating.ClientID %>').hidden = true;
}, 100);
}, 200);
}
</script>
<asp:HiddenField runat="server" ID="hfShowInnov" />
<div class="card bg-secondary">
<div class="card-header p-0">
<div class="row">
+2 -9
View File
@@ -172,13 +172,11 @@ namespace MoonProTablet.WebUserControls
{
get
{
bool answ = false;
bool.TryParse(hfShowInnov.Value, out answ);
return answ;
return divInnovazioni.Visible;
}
set
{
hfShowInnov.Value = $"{value}";
divInnovazioni.Visible = value;
}
}
@@ -322,11 +320,6 @@ namespace MoonProTablet.WebUserControls
divInnovazioni.Visible = showConf;
if (showConf)
{
#if false
// continuo update
lbtSalva.Visible = showConf;
lblUpdating.Visible = !showConf;
#endif
try
{
updatePzBuoni();
-9
View File
@@ -14,15 +14,6 @@ namespace MoonProTablet.WebUserControls
public partial class mod_confProd
{
/// <summary>
/// Controllo hfShowInnov.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hfShowInnov;
/// <summary>
/// Controllo lblConfProd.
/// </summary>