diff --git a/Jenkinsfile b/Jenkinsfile
index 32d1e2cc..0d02e855 100644
--- a/Jenkinsfile
+++ b/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'
diff --git a/MP-TAB/WebUserControls/mod_ODL.ascx.cs b/MP-TAB/WebUserControls/mod_ODL.ascx.cs
index c2a30236..baf058a5 100644
--- a/MP-TAB/WebUserControls/mod_ODL.ascx.cs
+++ b/MP-TAB/WebUserControls/mod_ODL.ascx.cs
@@ -315,12 +315,10 @@ namespace MoonProTablet.WebUserControls
}
}
-#if false
-
///
/// idx macchina selezionata
///
- public string idxMacchinaFix
+ public new string idxMacchinaFix
{
get
{
@@ -340,7 +338,6 @@ namespace MoonProTablet.WebUserControls
cmp_newODL.idxMacchinaFix = value;
}
}
-#endif
///
/// IdxODL su ALTRA macchina (se multi)
diff --git a/MP-TAB/utility.cs b/MP-TAB/utility.cs
index 6a00e87d..59eb6ca3 100644
--- a/MP-TAB/utility.cs
+++ b/MP-TAB/utility.cs
@@ -3,38 +3,42 @@ using System;
namespace MoonProTablet
{
- public class utility
- {
- ///
- /// formatta la durata in minuti in un modo "human readable" gg/ore/min
- ///
- /// minuti
- ///
- 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
+
+ ///
+ /// formatta la durata in minuti in un modo "human readable" gg/ore/min
+ ///
+ /// minuti
+ ///
+ 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}m {tempo.Second}s";
+ }
+ else if (minuti < memLayer.ML.CRI("maxOre"))
+ {
+ answ = $"{tempo.Hour}h {tempo.Minute}m";
+ }
+ else
+ {
+ answ = $"{tempo.DayOfYear}g {tempo.Hour}h";
+ }
+ return answ;
+ }
+
+ #endregion Public Methods
}
- }
}
\ No newline at end of file