diff --git a/Jenkinsfile b/Jenkinsfile index b0be38a4..0a2ec8e2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=841']) { + withEnv(['NEXT_BUILD_NUMBER=842']) { // env.versionNumber = VersionNumber(versionNumberString : '6.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '6.0.${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_pianoProdMacc.ascx b/MP-TAB/WebUserControls/mod_pianoProdMacc.ascx index 38e63c83..7e554f6e 100644 --- a/MP-TAB/WebUserControls/mod_pianoProdMacc.ascx +++ b/MP-TAB/WebUserControls/mod_pianoProdMacc.ascx @@ -1,32 +1,88 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_pianoProdMacc.ascx.cs" Inherits="MoonProTablet.WebUserControls.mod_pianoProdMacc" %> +
-

ELENCO PROSSIMI PODL

- - - - <%----%> - - <%----%> - - <%----%> - - - <%----%> - <%----%> - <%----%> - - - - - - - - - - - - - - - +

ELENCO PROSSIMI PODL

+ + + + + + + + + + + + + + + + + +
+
+ <%# Eval("DueDate","{0:dd.MM.yy}") %> +
+ [<%# Eval("IdxPromessa") %>] +
+
+
+
+ + +
+
+ + +
+
+ +
+
+ +
+
+
+
+ + +
+
+ + +
+ +
+
+
+
+ + +
+
+ Tot: <%# Eval("NumPezzi") %> +
+ <%# Eval("PzPallet") %> pz/pal +
+
+
+ TC: <%# Eval("TCAssegnato","{0:0.000}") %> +
+ <%# TCMinSec(Eval("TCAssegnato")) %> (min:sec) +
+
+
+
+
+
+
+ + + + + + + + +
diff --git a/MP-TAB/WebUserControls/mod_pianoProdMacc.ascx.cs b/MP-TAB/WebUserControls/mod_pianoProdMacc.ascx.cs index 4bf8696d..58f41f87 100644 --- a/MP-TAB/WebUserControls/mod_pianoProdMacc.ascx.cs +++ b/MP-TAB/WebUserControls/mod_pianoProdMacc.ascx.cs @@ -1,9 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; namespace MoonProTablet.WebUserControls { @@ -13,5 +8,24 @@ namespace MoonProTablet.WebUserControls { } + public string TCMinSec(object _TC) + { + string TC_MinSec = ""; + decimal TC = 0; + decimal.TryParse(_TC.ToString(), out TC); + int min = 0; + int sec = 0; + try + { + // cerco di convertire in min/sec + min = Convert.ToInt32(Math.Floor(Convert.ToDouble(TC))); + sec = Convert.ToInt32((Convert.ToDouble(TC) - min) * 60); + TC_MinSec = string.Format("{0}:{1:00}", min, sec); + } + catch + { } + return TC_MinSec; + } + } } \ No newline at end of file