diff --git a/NKC_WF/NKC_WF.csproj b/NKC_WF/NKC_WF.csproj index 790ecb7..dd9e60f 100644 --- a/NKC_WF/NKC_WF.csproj +++ b/NKC_WF/NKC_WF.csproj @@ -1053,9 +1053,6 @@ - - Always - Always diff --git a/NKC_WF/SHARE_NEST/.PlaceHolder.file b/NKC_WF/SHARE_NEST/.PlaceHolder.file deleted file mode 100644 index 5f28270..0000000 --- a/NKC_WF/SHARE_NEST/.PlaceHolder.file +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_BP_bunkList.ascx b/NKC_WF/WebUserControls/cmp_BP_bunkList.ascx index 05377b7..2c76bfa 100644 --- a/NKC_WF/WebUserControls/cmp_BP_bunkList.ascx +++ b/NKC_WF/WebUserControls/cmp_BP_bunkList.ascx @@ -21,15 +21,16 @@ -
- + +
+
- +
-
Sheets: <%# Eval("NumSheetsPrepared") %> / <%# Eval("NumSheets") %>
-
items: <%# Eval("NumItems") %>
+
S: <%# Eval("NumSheets") %>
+
P: <%# Eval("NumItems") %>
diff --git a/NKC_WF/WebUserControls/cmp_BP_sheetList.ascx b/NKC_WF/WebUserControls/cmp_BP_sheetList.ascx index 908301d..f67efa8 100644 --- a/NKC_WF/WebUserControls/cmp_BP_sheetList.ascx +++ b/NKC_WF/WebUserControls/cmp_BP_sheetList.ascx @@ -18,14 +18,27 @@
- + -
- +
+
+ +
+
+ +
+
+ +
+
+
+
+ + + - diff --git a/NKC_WF/WebUserControls/cmp_BP_sheetList.ascx.cs b/NKC_WF/WebUserControls/cmp_BP_sheetList.ascx.cs index eee7644..f94691b 100644 --- a/NKC_WF/WebUserControls/cmp_BP_sheetList.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_BP_sheetList.ascx.cs @@ -82,5 +82,20 @@ namespace NKC_WF.WebUserControls { raiseEvent(); } + /// + /// Formatta in min/sec il tempo in sec decimale + /// + /// + /// + public string formatMinSec(object _timeSec) + { + int totSec = 0; + string answ = ""; + int.TryParse(_timeSec.ToString(), out totSec); + int numMin = totSec / 60; + int numSec = totSec - (60 * numMin); + answ = $"{numMin:00}:{numSec:00}"; + return answ; + } } } \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx b/NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx index f2bca66..3debefd 100644 --- a/NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx +++ b/NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx @@ -5,7 +5,7 @@ - + \ No newline at end of file diff --git a/NKC_WF/site/BatchPreview.aspx b/NKC_WF/site/BatchPreview.aspx index c0df410..cff64ef 100644 --- a/NKC_WF/site/BatchPreview.aspx +++ b/NKC_WF/site/BatchPreview.aspx @@ -7,10 +7,10 @@
-
+
-
+

Batch preview - start | pause | stop