diff --git a/NKC_WF/OrderManager.aspx.cs b/NKC_WF/OrderManager.aspx.cs
index 942cc44..b07d157 100644
--- a/NKC_WF/OrderManager.aspx.cs
+++ b/NKC_WF/OrderManager.aspx.cs
@@ -1,14 +1,11 @@
-using Newtonsoft.Json;
-using NKC_SDK;
-using SteamWare;
-using System;
-using System.Collections.Generic;
+using System;
using System.Web.UI;
namespace NKC_WF
{
public partial class OrderManager : System.Web.UI.Page
{
+#if false
///
/// Hash redis per il canale di comunicazione dei comandi
///
@@ -20,23 +17,45 @@ namespace NKC_WF
///
/// Hash redis per il canale di comunicazione dei batch eseguiti/in esecuzione
///
- protected string batchInChannel = "NKC:IN:batchReq";
+ protected string batchInChannel = "NKC:IN:batchReq";
+#endif
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
+ doUpdate();
+#if false
processPending();
- checkVisibility();
+ checkVisibility();
+#endif
}
cmp_batchList.eh_doRefresh += Cmp_batchList_eh_doRefresh;
+ cmp_fileUpload.eh_doRefresh += Cmp_fileUpload_eh_doRefresh;
+ }
+
+ private void Cmp_fileUpload_eh_doRefresh(object sender, EventArgs e)
+ {
+ doUpdate();
+#if false
+ checkVisibility();
+#endif
}
private void Cmp_batchList_eh_doRefresh(object sender, EventArgs e)
{
- checkVisibility();
+ doUpdate();
+#if false
+ checkVisibility();
+#endif
}
+ public void doUpdate()
+ {
+
+ }
+
+#if false
private void processPending()
{
// se trova batch non riportati in REDIS li scrive x richiedere processing
@@ -99,7 +118,7 @@ namespace NKC_WF
}
return answ;
}
- }
+ }
private void checkVisibility()
{
@@ -110,5 +129,6 @@ namespace NKC_WF
}
divStatus.Visible = hasBatch;
}
+#endif
}
}
\ No newline at end of file
diff --git a/NKC_WF/Web.config b/NKC_WF/Web.config
index d316be6..81bde32 100644
--- a/NKC_WF/Web.config
+++ b/NKC_WF/Web.config
@@ -55,8 +55,8 @@
-
-
+
+
diff --git a/NKC_WF/WebUserControls/cmp_fileUpload.ascx.cs b/NKC_WF/WebUserControls/cmp_fileUpload.ascx.cs
index d3939a2..6b9d03c 100644
--- a/NKC_WF/WebUserControls/cmp_fileUpload.ascx.cs
+++ b/NKC_WF/WebUserControls/cmp_fileUpload.ascx.cs
@@ -80,12 +80,12 @@ namespace NKC_WF.WebUserContols
string contentType = "";
DateTime adesso = DateTime.Now;
string dirFrom = Server.MapPath(_tempUploadDir);
- string dirTo = $"{_SqlCopyDir}\\{adesso.ToString("yyyy-MM")}\\";
- string dirImport = $"{_SqlImportDir}\\{adesso.ToString("yyyy-MM")}\\";
+ string dirTo = $"{_SqlCopyDir}{adesso.ToString("yyyy-MM")}\\";
+ string dirImport = $"{_SqlImportDir}{adesso.ToString("yyyy-MM")}\\";
// se c'è un file
if (FileUpload1.PostedFile != null)
{
- uploadedFilename = Path.GetFileName(FileUpload1.PostedFile.FileName);
+ uploadedFilename = Path.GetFileName(FileUpload1.PostedFile.FileName.Replace(" ", "_"));
csvFileName = $"{adesso.ToString("dd-HHmmss")}_{uploadedFilename}";
batchName = uploadedFilename.Replace(".csv", "");
savedFilename = Server.MapPath($"{_tempUploadDir}{csvFileName}");