From e82e914cda05a69d8b97ca03addc625811db2aef Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Tue, 18 Aug 2020 17:23:02 +0200 Subject: [PATCH 1/4] new rel --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index bc5d3ca..a2cb810 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=342']) { + withEnv(['NEXT_BUILD_NUMBER=343']) { // env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.versionNumberBeta = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') From dd7e68b98a353cda6aa9ba80cfeba25fe02f1337 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Tue, 18 Aug 2020 17:23:11 +0200 Subject: [PATCH 2/4] fix messaggio x NEST BATCH --- NKC_WF/WebUserControls/cmp_batchDetail.ascx | 135 ++++++++++---------- 1 file changed, 68 insertions(+), 67 deletions(-) diff --git a/NKC_WF/WebUserControls/cmp_batchDetail.ascx b/NKC_WF/WebUserControls/cmp_batchDetail.ascx index c6fa737..9da0444 100644 --- a/NKC_WF/WebUserControls/cmp_batchDetail.ascx +++ b/NKC_WF/WebUserControls/cmp_batchDetail.ascx @@ -2,82 +2,83 @@ - -
-
-

<%: traduci ("BatchDetail") %>

-
-
- Send to Estimation - Stop Estimation - Send to Nesting - Stop Nesting - Accept Nesting -
-
-
-
-
- -
- -
+ +
+
+

<%: traduci ("BatchDetail") %>

+
-
-
-
- -
- -
+
+ Send to Estimation + Stop Estimation + Send to Nesting + Stop Nesting + Accept Nesting
-
-
-
- -
- / -
-
-
-
-
- -
- - <%: traduci ("Min") %> -
-
-
-
- +
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ / +
+
+
+
+
+ +
+ + <%: traduci ("Min") %> +
+
+
+
+ - - - + + +
-
-
- -
- -
+
+
+ +
+ +
+
-
-
-
- -
- -
+
+
+ +
+ +
+
+
+
+
-
-
- -
From 84a5288ceb5dbea53cd097bbf2dddcd428bda098 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Tue, 18 Aug 2020 17:33:33 +0200 Subject: [PATCH 3/4] Traduzione area NESTING --- NKC_WF/WebUserControls/cmp_batchDetail.ascx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/NKC_WF/WebUserControls/cmp_batchDetail.ascx b/NKC_WF/WebUserControls/cmp_batchDetail.ascx index 9da0444..1bec3c4 100644 --- a/NKC_WF/WebUserControls/cmp_batchDetail.ascx +++ b/NKC_WF/WebUserControls/cmp_batchDetail.ascx @@ -9,11 +9,11 @@
- Send to Estimation - Stop Estimation - Send to Nesting - Stop Nesting - Accept Nesting + <%: traduci("SendToEstim") %> + <%: traduci("StopEstim") %> + traduci("SendToNest") + <%: traduci("StopNest") %> + <%: traduci("AcceptNest") %>
From 6a643336ee25ac442db2b2d58756dbe3c5e35fb2 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Tue, 18 Aug 2020 17:36:30 +0200 Subject: [PATCH 4/4] typo --- NKC_WF/WebUserControls/cmp_fileUpload.ascx.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/NKC_WF/WebUserControls/cmp_fileUpload.ascx.cs b/NKC_WF/WebUserControls/cmp_fileUpload.ascx.cs index 23b287a..efd2f8a 100644 --- a/NKC_WF/WebUserControls/cmp_fileUpload.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_fileUpload.ascx.cs @@ -192,7 +192,6 @@ namespace NKC_WF.WebUserContols protected void btnCancel_Click(object sender, EventArgs e) { - //fisVisFU(false); Response.Redirect(Request.RawUrl); }