Merge branch 'develop' into ES3

Jenkinsfile

@@ -12,7 +12,7 @@ pipeline {
       steps {
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=1337']) {
+        withEnv(['NEXT_BUILD_NUMBER=1338']) {
           // env.versionNumber = VersionNumber(versionNumberString : '6.12.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
           env.versionNumber = VersionNumber(versionNumberString : '6.12.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
           env.APP_NAME = 'MAPO'

MP-TAB/WebUserControls/mod_ODL.ascx.cs

@@ -315,12 +315,10 @@ namespace MoonProTablet.WebUserControls
             }
         }
 
-#if false
-
         /// <summary>
         /// idx macchina selezionata
         /// </summary>
-        public string idxMacchinaFix
+        public new string idxMacchinaFix
         {
             get
             {
@@ -340,7 +338,6 @@ namespace MoonProTablet.WebUserControls
                 cmp_newODL.idxMacchinaFix = value;
             }
         }
-#endif
 
         /// <summary>
         /// IdxODL su ALTRA macchina (se multi)

MP-TAB/utility.cs

@@ -3,38 +3,42 @@ using System;
 
 namespace MoonProTablet
 {
-  public class utility
-  {
-    /// <summary>
-    /// formatta la durata in minuti in un modo "human readable" gg/ore/min
-    /// </summary>
-    /// <param name="min">minuti</param>
-    /// <returns></returns>
-    public static string formatDurata(object min)
+    public class utility
     {
-      string answ = "";
-      DateTime tempo = new DateTime();
-      double minuti = 0;
-      try
-      {
-        minuti = Convert.ToDouble(min);
-        tempo = tempo.AddMinutes(minuti);
-      }
-      catch
-      { }
-      if (minuti < memLayer.ML.CRI("maxMinuti"))
-      {
-        answ = string.Format("{0}m {1}s", tempo.Minute, tempo.Second);
-      }
-      else if (minuti < memLayer.ML.CRI("maxOre"))
-      {
-        answ = string.Format("{0}h {1}m", tempo.Hour, tempo.Minute);
-      }
-      else
-      {
-        answ = string.Format("{0}gg {1}h {2}m", tempo.DayOfYear, tempo.Hour, tempo.Minute);
-      }
-      return answ;
+        #region Public Methods
+
+        /// <summary>
+        /// formatta la durata in minuti in un modo "human readable" gg/ore/min
+        /// </summary>
+        /// <param name="min">minuti</param>
+        /// <returns></returns>
+        public static string formatDurata(object min)
+        {
+            string answ = "";
+            DateTime tempo = new DateTime();
+            double minuti = 0;
+            try
+            {
+                minuti = Convert.ToDouble(min);
+                tempo = tempo.AddMinutes(minuti);
+            }
+            catch
+            { }
+            if (minuti < memLayer.ML.CRI("maxMinuti"))
+            {
+                answ = $"{tempo.Minute}<small>m</small> {tempo.Second}<small>s</small>";
+            }
+            else if (minuti < memLayer.ML.CRI("maxOre"))
+            {
+                answ = $"{tempo.Hour}<small>h</small> {tempo.Minute}<small>m</small>";
+            }
+            else
+            {
+                answ = $"{tempo.DayOfYear}<small>g</small> {tempo.Hour}<small>h</small>";
+            }
+            return answ;
+        }
+
+        #endregion Public Methods
     }
-  }
 }