diff --git a/ETS-WS/ETS-WS/DocTemplates/ETS-Proto.docx b/ETS-WS/ETS-WS/DocTemplates/ETS-Proto.docx deleted file mode 100644 index 0345cbb..0000000 Binary files a/ETS-WS/ETS-WS/DocTemplates/ETS-Proto.docx and /dev/null differ diff --git a/ETS-WS/ETS-WS/WebShipUtils.cs b/ETS-WS/ETS-WS/WebShipUtils.cs index 4c8a975..d270d2b 100644 --- a/ETS-WS/ETS-WS/WebShipUtils.cs +++ b/ETS-WS/ETS-WS/WebShipUtils.cs @@ -306,6 +306,22 @@ namespace ETS_WS return answ; } /// + /// path da idx DB + /// + /// + /// + public static string pathFromIdxFile(int idxFile) + { + string answ = ""; + try + { + answ = utils.obj.taDoc.getByIdxFile(idxFile)[0].fullPath; + } + catch + { } + return answ; + } + /// /// fornisce email dato codice fornitore /// /// diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx b/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx index 693f33c..82ab15c 100644 --- a/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx +++ b/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx @@ -176,7 +176,7 @@ + OnUpdating="ods_Updating" UpdateMethod="updateQuery" onupdated="ods_Updated"> <%--EnableCaching="true" CacheDuration="5" SortParameterName="SortExpression" --%> diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx.cs b/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx.cs index 58a5aa1..af68dfa 100644 --- a/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx.cs +++ b/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx.cs @@ -200,6 +200,8 @@ namespace ETS_WS.WebUserControls { lg.Info("Errore recupero stato red old/new", exc); } +#if false + // sposto file in area temp utente... if (isRed != isRed_Original) { // dati del file originale.. @@ -218,8 +220,11 @@ namespace ETS_WS.WebUserControls destPath = string.Format("{0}{1}", utils.obj.confReadString("archiveDir"), docsData.path); } // sposto file a nuova dest... - fileMover.obj.muoviFile(fromPath, destPath, WebShipUtils.nomeFileFullFromIdxFile(WebShipUtils.mng.idxFileEdit)); - } + fileMover.obj.muoviFile(fromPath, destPath, WebShipUtils.nomeFileFullFromIdxFile(WebShipUtils.mng.idxFileEdit), WebShipUtils.nomeFileFromIdxFile(WebShipUtils.mng.idxFileEdit), true); + } +#endif + // sposto file a nuova dest... + fileMover.obj.muoviFile(WebShipUtils.pathFromIdxFile(WebShipUtils.mng.idxFileEdit), WebShipUtils.mng.UserTempPath, WebShipUtils.nomeFileFullFromIdxFile(WebShipUtils.mng.idxFileEdit), WebShipUtils.nomeFileFromIdxFile(WebShipUtils.mng.idxFileEdit), true); } /// /// mostro button x sostituzione file @@ -337,7 +342,7 @@ namespace ETS_WS.WebUserControls if (idxFile > 0) { // controllo condizioni: in primis รจ lui che ha creato record - if (WebShipUtils.redattoreFromIdxFile(idxFile)==utils.obj.currUserNomeCognome) + if (WebShipUtils.redattoreFromIdxFile(idxFile) == utils.obj.currUserNomeCognome) { answ = true; } @@ -392,5 +397,11 @@ namespace ETS_WS.WebUserControls grView.EditIndex = -1; grView.DataBind(); } + + protected void ods_Updated(object sender, ObjectDataSourceStatusEventArgs e) + { + // risposto file da area temp ad area corretta + fileMover.obj.muoviFile(WebShipUtils.mng.UserTempPath, WebShipUtils.pathFromIdxFile(WebShipUtils.mng.idxFileEdit), WebShipUtils.nomeFileFromIdxFile(WebShipUtils.mng.idxFileEdit), WebShipUtils.nomeFileFullFromIdxFile(WebShipUtils.mng.idxFileEdit), true); + } } } \ No newline at end of file diff --git a/ETS-WS/ETS-WS/bin/ETS-WS.dll b/ETS-WS/ETS-WS/bin/ETS-WS.dll index 01a62a2..e51ca16 100644 Binary files a/ETS-WS/ETS-WS/bin/ETS-WS.dll and b/ETS-WS/ETS-WS/bin/ETS-WS.dll differ diff --git a/ETS-WS/ETS-WS/bin/ETS_Data.dll b/ETS-WS/ETS-WS/bin/ETS_Data.dll index e9205b0..98a2e08 100644 Binary files a/ETS-WS/ETS-WS/bin/ETS_Data.dll and b/ETS-WS/ETS-WS/bin/ETS_Data.dll differ diff --git a/ETS_Data/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/ETS_Data/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index fdedbc5..a5daf82 100644 Binary files a/ETS_Data/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/ETS_Data/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/ETS_Data/obj/Debug/ETS_Data.dll b/ETS_Data/obj/Debug/ETS_Data.dll index ce87c42..98a2e08 100644 Binary files a/ETS_Data/obj/Debug/ETS_Data.dll and b/ETS_Data/obj/Debug/ETS_Data.dll differ