From 23ff5d49bbd9df1070a68493a657fb12eedac0bb Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Thu, 31 Oct 2019 08:58:10 +0100
Subject: [PATCH] Correzione description con NOME FILE

---
 INTERFACE/WebLCP/WUC/mod_startJob.ascx.cs | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/INTERFACE/WebLCP/WUC/mod_startJob.ascx.cs b/INTERFACE/WebLCP/WUC/mod_startJob.ascx.cs
index 126586a..24cdb32 100644
--- a/INTERFACE/WebLCP/WUC/mod_startJob.ascx.cs
+++ b/INTERFACE/WebLCP/WUC/mod_startJob.ascx.cs
@@ -69,6 +69,18 @@ namespace WebLCP.WUC
         Response.Redirect("Default");
       }
     }
+    /// <summary>
+    /// Restituisce il nome del JOB caricato come descrizione digitata + nome file uploaded
+    /// </summary>
+    protected string jobDescription
+    {
+      get
+      {
+        string answ = $"{txtJobDescr.Text.Trim()} | {FUplCsv.FileName}";
+
+        return answ;
+      }
+    }
 
     private void checkAndUploadFile()
     {
@@ -82,11 +94,11 @@ namespace WebLCP.WUC
       // STEP1: inizio controlli su nomi...
       if (FUplCsv.FileName != "" && (FUplCsv.FileName.EndsWith(".txt") || FUplCsv.FileName.EndsWith(".csv")))
       {
-        newSuccessList.Add("DB_INPUT", "OK Filename DB INPUT");
+        newSuccessList.Add("FILE INPUT", "OK Filename format");
       }
       else
       {
-        newErrorList.Add("DB_INPUT", "WRONG Filename DB INPUT (only *.csv and *.txt)");
+        newErrorList.Add("FILE INPUT", "WRONG Filename format (only *.csv and *.txt)");
       }
 
       // STEP 2: se NON HO errori faccio controllo files
@@ -106,7 +118,7 @@ namespace WebLCP.WUC
       if (newErrorList.Count == 0)
       {
         // creo record
-        DS_App.JobsListDataTable tabJobs = dataLayer.man.taJL.insertNew(txtJobDescr.Text.Trim(), devicesAuthProxy.stObj.utente);
+        DS_App.JobsListDataTable tabJobs = dataLayer.man.taJL.insertNew(jobDescription, devicesAuthProxy.stObj.utente);
         if (tabJobs.Count == 1)
         {
           /*************************************************
@@ -269,7 +281,9 @@ namespace WebLCP.WUC
       fileMover.obj.setDirectory(sourceDir);
       fileMover.obj.checkDir();
       // proseguo con upload files...
-      string fileName = Path.GetFileName(FUplCsv.FileName);
+#if false
+      string fileName = Path.GetFileName(FUplCsv.FileName); 
+#endif
       FUplCsv.SaveAs($"{sourceDir}DB_INPUT.csv");
       return sourceDir;
     }