From ecb36b99fb18a7245fea1639aba2e955fd1b68da Mon Sep 17 00:00:00 2001
From: samuele <samuele@steamware.net>
Date: Mon, 22 Oct 2012 15:38:46 +0200
Subject: [PATCH] reinclusi placeholder files refresh generale

---
 .gitignore                                    |   2 ++
 ETS-WS/ETS-WS/ArchivioDocs/PlaceHolder.file   |   1 +
 .../ETS-WS/ArchivioDocsRed/PlaceHolder.file   |   1 +
 ETS-WS/ETS-WS/WebShipUtils.cs                 |  13 -------------
 .../WebUserControls/mod_pathAndDocs.ascx.cs   |   2 +-
 ETS-WS/ETS-WS/bin/ETS-WS.dll                  | Bin 56320 -> 56320 bytes
 6 files changed, 5 insertions(+), 14 deletions(-)
 create mode 100644 ETS-WS/ETS-WS/ArchivioDocs/PlaceHolder.file
 create mode 100644 ETS-WS/ETS-WS/ArchivioDocsRed/PlaceHolder.file

diff --git a/.gitignore b/.gitignore
index 3cac2cc..632b419 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,7 +10,9 @@
 /ETS_Data/obj/Release
 /ETS_Data/obj/WinLab
 /ETS-WS/ETS-WS/ArchivioDocs/*
+!/ETS-WS/ETS-WS/ArchivioDocs/PlaceHolder.file
 /ETS-WS/ETS-WS/ArchivioDocsRed/*
+!/ETS-WS/ETS-WS/ArchivioDocsRed/PlaceHolder.file
 /ETS-WS/ETS-WS/logs/*.log
 
 *.suo
diff --git a/ETS-WS/ETS-WS/ArchivioDocs/PlaceHolder.file b/ETS-WS/ETS-WS/ArchivioDocs/PlaceHolder.file
new file mode 100644
index 0000000..5f28270
--- /dev/null
+++ b/ETS-WS/ETS-WS/ArchivioDocs/PlaceHolder.file
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/ETS-WS/ETS-WS/ArchivioDocsRed/PlaceHolder.file b/ETS-WS/ETS-WS/ArchivioDocsRed/PlaceHolder.file
new file mode 100644
index 0000000..5f28270
--- /dev/null
+++ b/ETS-WS/ETS-WS/ArchivioDocsRed/PlaceHolder.file
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/ETS-WS/ETS-WS/WebShipUtils.cs b/ETS-WS/ETS-WS/WebShipUtils.cs
index d8abd37..82a24c8 100644
--- a/ETS-WS/ETS-WS/WebShipUtils.cs
+++ b/ETS-WS/ETS-WS/WebShipUtils.cs
@@ -38,20 +38,7 @@ namespace ETS_WS
             {
                 // calcolo valori data e red
                 string aammgg = metaDati.dataDoc.ToString("yyMMdd");
-#if false
-                string comPath = "";
-                if (!metaDati.isRed)
-                {
-                    comPath = "comunicazioni";
-                }
-                else
-                {
-                    comPath = "comunicazioni_red";
-                }
                 // calcolo
-                answ = string.Format("/{0}/{1}/{2}/{3}/{4}/{5}/", metaDati.commessa, comPath, metaDati.fase, metaDati.InOut, metaDati.fonte, aammgg); 
-#endif
-               // calcolo
                 answ = string.Format("/{0}/{1}/{2}/{3}/{4}/", metaDati.commessa, metaDati.fase, metaDati.InOut, metaDati.fonte, aammgg);
             }
             catch
diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_pathAndDocs.ascx.cs b/ETS-WS/ETS-WS/WebUserControls/mod_pathAndDocs.ascx.cs
index f082d98..e29c57b 100644
--- a/ETS-WS/ETS-WS/WebUserControls/mod_pathAndDocs.ascx.cs
+++ b/ETS-WS/ETS-WS/WebUserControls/mod_pathAndDocs.ascx.cs
@@ -96,7 +96,7 @@ namespace ETS_WS.WebUserControls
                 // aggiunto al path cartella archivio corretta...
                 pathDest = string.Format("{0}{1}", comPath, docsData.path);
                 // fix redattore
-                string redattore = utils.obj.currUserCognomeNome; // usa utente corrente
+                string redattore = utils.obj.currUserNomeCognome; // usa utente corrente
                 idxFile = WebShipUtils.archiviaFile(docsData, WebShipUtils.mng.UserTempPath, pathDest, nomeTemplate, redattore);
                 // recupero dati documento
                 docsData = WebShipUtils.mng.docMetaFromIdxFile(idxFile);
diff --git a/ETS-WS/ETS-WS/bin/ETS-WS.dll b/ETS-WS/ETS-WS/bin/ETS-WS.dll
index a3b6163991a27e4f72b877926ec364f671d06611..43ae8c33588495db294d2b0f52accf82f1582e69 100644
GIT binary patch
delta 100
zcmV-q0Gt1SxC4N=1CWRUK}@lVYDfVhv-L=gT_i$AGe$QyF*z+pG)6QnG%`0hEkZ;x
zIV~|nIYKo;Lqj<;MMkrxrj{WP8FoLv^z?W_y(t}=Tg;R1vrNbY3<5z+lTy?w0Uon`
G)Po1B1tW+6

delta 100
zcmZqJ!Q8Nec|r%1nAgUxEDuJT&0jrwV^ti@%q&byEG=~nOdL&gO&kpkbS=!xOm$7o
z%}foPO^uw~OieZ~TQ*HmV5UpPvL!46UTvx2sXRgZLpJ-IVBrCpHaX~u7NgAO+AGcM
E07Rf5NB{r;