From 1872dfcfecf4cde78b06d821891882240f04bcd4 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Fri, 7 Dec 2018 18:28:15 +0100
Subject: [PATCH] Fix problema com 101 su SITE

---
 Jenkinsfile                                   |  2 +-
 .../WebUserControls/mod_statoMacchina.ascx.cs | 22 ++++++++++++++-----
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index aead2d2e..2d9f255d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -18,7 +18,7 @@ pipeline {
 
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=1035']) {
+        withEnv(['NEXT_BUILD_NUMBER=1036']) {
           // env.versionNumber = VersionNumber(versionNumberString : '6.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
           env.versionNumber = VersionNumber(versionNumberString : '6.2.${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-Site/WebUserControls/mod_statoMacchina.ascx.cs b/MP-Site/WebUserControls/mod_statoMacchina.ascx.cs
index 02821e34..88a0dd44 100644
--- a/MP-Site/WebUserControls/mod_statoMacchina.ascx.cs
+++ b/MP-Site/WebUserControls/mod_statoMacchina.ascx.cs
@@ -277,19 +277,31 @@ namespace MP_SITE.WebUserControls
     /// </summary>
     private void updateHL()
     {
-      bool answ = true;
+      bool answ = false;
       int minuti = memLayer.ML.CRI("keepAliveMin");
       // controllo se il keep alive è oltre il termine...
       DateTime lastKA = DateTime.Now.AddMinutes(-minuti);
       if (_IdxMacchina != "nd")
       {
         string nomeVar = string.Format("KeepAlive:{0}", _IdxMacchina);
-        var _lastKA = memLayer.ML.objCacheObj(nomeVar);
-        if (_lastKA != null)
+        string redKey = memLayer.ML.redHash(nomeVar);
+        var _lastKA = memLayer.ML.getRSV(redKey);
+        if (_lastKA == null)
         {
-          DateTime.TryParse(_lastKA.ToString(), out lastKA);
+          answ = true;
+          //cerco su DB...
+          try
+          {
+            var tabDati = DataLayer.obj.taKeepAlive.getByIdxMacchina(_IdxMacchina);
+            if (tabDati.Rows.Count > 0)
+            {
+              lastKA = tabDati[0].DataOraServer;
+              answ = (lastKA.AddMinutes(minuti) < DateTime.Now);
+            }
+          }
+          catch
+          { }
         }
-        answ = (lastKA.AddMinutes(minuti) < DateTime.Now) || _lastKA == null;
       }
       hlComWarning.Visible = answ;
     }