From 0dc9e40b5ee7a9665039d921f24ca1252385f542 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Wed, 11 Mar 2020 11:04:54 +0100
Subject: [PATCH] Fix path x dxf in risposta NEST

---
 Jenkinsfile                                   |  2 +-
 NKC_WF/Controllers/BatchProcController.cs     | 24 +------------------
 .../cmp_validationSummary.ascx.cs             |  2 +-
 NKC_WF/site/OrderManager.aspx.cs              |  4 ++--
 4 files changed, 5 insertions(+), 27 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 95d4acd..05a94b8 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -11,7 +11,7 @@ pipeline {
       steps {
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=264']) {
+        withEnv(['NEXT_BUILD_NUMBER=265']) {
           // env.versionNumber = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true)
           env.versionNumber = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
           env.versionNumberBeta = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
diff --git a/NKC_WF/Controllers/BatchProcController.cs b/NKC_WF/Controllers/BatchProcController.cs
index c60084a..fa88711 100644
--- a/NKC_WF/Controllers/BatchProcController.cs
+++ b/NKC_WF/Controllers/BatchProcController.cs
@@ -209,7 +209,7 @@ namespace NKC_WF.Controllers
               // salvo udpate elenco ITEMS
               ComLib.updatePartsFromNesting(rispStima.PartList);
               // aggiorno cadPath x items che non abbiano valorizzato...
-              string cadBasePath = $"{memLayer.ML.CRS("nestBasePath")}/{memLayer.ML.CRS("drawingFolder")}";
+              string cadBasePath = $"{memLayer.ML.CRS("nestBasePath")}{memLayer.ML.CRS("drawingFolder")}/";
               DataLayer.man.taIL.updateCadPath(cadBasePath, rispStima.BatchID, false);
               // verifico IN CASO di validazione andata a buon fine --> valorizzo tabella!
               if (bStatus > 7)
@@ -305,27 +305,5 @@ namespace NKC_WF.Controllers
       // restituisco risposta
       return answ;
     }
-
-
-
-#if false
-
-    // POST: api/BatchProc
-    public void Post([FromBody]string value)
-    {
-    }
-
-    // PUT: api/BatchProc/5
-    public void Put(int id, [FromBody]string value)
-    {
-    }
-
-    // DELETE: api/BatchProc/5
-    public void Delete(int id)
-    {
-    } 
-
-#endif
-
   }
 }
diff --git a/NKC_WF/WebUserControls/cmp_validationSummary.ascx.cs b/NKC_WF/WebUserControls/cmp_validationSummary.ascx.cs
index 0a26c1c..59f78bb 100644
--- a/NKC_WF/WebUserControls/cmp_validationSummary.ascx.cs
+++ b/NKC_WF/WebUserControls/cmp_validationSummary.ascx.cs
@@ -33,7 +33,7 @@ namespace NKC_WF.WebUserControls
       // chiamo stored x creazione NUOVI BATCH...
       try
       {
-        string cadBasePath = $"{memLayer.ML.CRS("nestBasePath")}/{memLayer.ML.CRS("drawingFolder")}";
+        string cadBasePath = $"{memLayer.ML.CRS("nestBasePath")}{memLayer.ML.CRS("drawingFolder")}/";
         DataLayer.man.taBL.createPartValBatch(cadBasePath);
         // eventualmente mando primo batch da validare...
         bool newValidSent = ComLib.sendFirstValidationBatch();
diff --git a/NKC_WF/site/OrderManager.aspx.cs b/NKC_WF/site/OrderManager.aspx.cs
index 8311981..4b4cbf3 100644
--- a/NKC_WF/site/OrderManager.aspx.cs
+++ b/NKC_WF/site/OrderManager.aspx.cs
@@ -19,11 +19,11 @@ namespace NKC_WF
     /// <summary>
     /// Path base x nesting
     /// </summary>
-    protected string cadBasePath = $"{memLayer.ML.CRS("nestBasePath")}/{memLayer.ML.CRS("drawingFolder")}";
+    protected string cadBasePath = $"{memLayer.ML.CRS("nestBasePath")}{memLayer.ML.CRS("drawingFolder")}/";
     /// <summary>
     /// Path base x server
     /// </summary>
-    protected string srvCadBasePath = $"{memLayer.ML.CRS("servBasePath")}/{memLayer.ML.CRS("drawingFolder")}";
+    protected string srvCadBasePath = $"{memLayer.ML.CRS("servBasePath")}{memLayer.ML.CRS("drawingFolder")}/";
 
     protected void Page_Load(object sender, EventArgs e)
     {