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 a3b6163..43ae8c3 100644 Binary files a/ETS-WS/ETS-WS/bin/ETS-WS.dll and b/ETS-WS/ETS-WS/bin/ETS-WS.dll differ