From a36e654eb5c011a6f4a4afdf5e8fdf912b9c1935 Mon Sep 17 00:00:00 2001
From: samuele <samuele@steamware.net>
Date: Thu, 11 Oct 2012 18:43:34 +0200
Subject: [PATCH] bozza gestione sostituzioen test in docx x mettere numero
 protocollo...

---
 ETS-WS/ETS-WS/WebShipUtils.cs                 |  52 ++++++++++++++++--
 .../mod_archivioDocumenti.ascx.cs             |  25 ++-------
 .../WebUserControls/mod_pathAndDocs.ascx.cs   |   9 ++-
 ETS-WS/ETS-WS/bin/ETS-WS.dll                  | Bin 49664 -> 50176 bytes
 ETS_Data/ETS_Data.csproj                      |   2 +
 5 files changed, 63 insertions(+), 25 deletions(-)

diff --git a/ETS-WS/ETS-WS/WebShipUtils.cs b/ETS-WS/ETS-WS/WebShipUtils.cs
index e88a59c..60d5649 100644
--- a/ETS-WS/ETS-WS/WebShipUtils.cs
+++ b/ETS-WS/ETS-WS/WebShipUtils.cs
@@ -182,7 +182,7 @@ namespace ETS_WS
         /// </summary>
         /// <param name="idxFile"></param>
         /// <returns></returns>
-        public string nomeFileFromIdxFile(int idxFile)
+        public static string nomeFileFromIdxFile(int idxFile)
         {
             string answ = "";
             try
@@ -193,6 +193,22 @@ namespace ETS_WS
             { }
             return answ;
         }
+        /// <summary>
+        /// nome del file da idx DB
+        /// </summary>
+        /// <param name="idxFile"></param>
+        /// <returns></returns>
+        public static string nomeFileFullFromIdxFile(int idxFile)
+        {
+            string answ = "";
+            try
+            {
+                answ = utils.obj.taDoc.getByIdxFile(idxFile)[0].Nome;
+            }
+            catch
+            { }
+            return answ;
+        }
 
         /// <summary>
         /// effettua operazione di archiviazione file
@@ -235,10 +251,38 @@ namespace ETS_WS
                     }
                 }
             }
-            // sposto il file!
-            fileMover.obj.muoviFile(pathOrig, pathDest, nomeFile);
+            // ricalcolo nome file
+            string newFileName = WebShipUtils.nomeFileFullFromIdxFile((int)newIdxFile);
+            // sposto file
+            fileMover.obj.muoviFile(pathOrig, pathDest, nomeFile, newFileName, true);
+        }
+        /// <summary>
+        /// aggiorna file archiviato (prendendo da temp utente!)
+        /// </summary>
+        /// <param name="nomeFile"></param>
+        public void aggiornaFileArchiviato(string nomeFile)
+        {
+            lg.Info("Caricato file {0} per sostituzione", nomeFile);
+            int idxFile = WebShipUtils.mng.idxFileEdit;
+            // effettuo operazioni sostituzione file!
+            docMetaDataSet docsData = WebShipUtils.mng.docMetaFromIdxFile(idxFile);
+            string path = docsData.path;
+            if (path != "")
+            {
+                // calcolo path
+                path = string.Format("{0}{1}", utils.obj.confReadString("archiveDir"), docsData.path);
+                // elimino file vecchio
+                fileMover.obj.eliminaFile(path, WebShipUtils.nomeFileFullFromIdxFile(idxFile));
+                // aggiorno su DB
+                utils.obj.taDoc.updateFile(idxFile, utils.obj.currUserAD, nomeFile, path);
+                lg.Info("Aggiornato in db nome file {0} per sostituzione", nomeFile);
+                // ricalcolo nome file
+                string newFileName = WebShipUtils.nomeFileFullFromIdxFile(idxFile);
+                // sposto file
+                fileMover.obj.muoviFile(WebShipUtils.mng.UserTempPath, path, nomeFile, newFileName, true);
+                lg.Info("Spostato file {0} per sostituzione", nomeFile);                
+            }
         }
-
     }
 
     /// <summary>
diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx.cs b/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx.cs
index 639a587..0c6ae5f 100644
--- a/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx.cs
+++ b/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx.cs
@@ -244,26 +244,11 @@ namespace ETS_WS.WebUserControls
             grView.SelectedIndex = grView.EditIndex;
             WebShipUtils.mng.idxFileEdit = Convert.ToInt32(grView.SelectedDataKey["idxFile"]);
             string nomeFile = mod_singleFileUpload1.newFileName;
-            lg.Info("Caricato file {0} per sostituzione", nomeFile);
-            int idxFile = WebShipUtils.mng.idxFileEdit;
-            // effettuo operazioni sostituzione file!
-            docMetaDataSet docsData = WebShipUtils.mng.docMetaFromIdxFile(idxFile);
-            string path = docsData.path;
-            if (path != "")
-            {
-                // calcolo path
-                path = string.Format("{0}{1}", utils.obj.confReadString("archiveDir"), docsData.path);
-                // elimino file vecchio
-                fileMover.obj.eliminaFile(path, WebShipUtils.mng.nomeFileFromIdxFile(idxFile));
-                // sposto file
-                fileMover.obj.muoviFile(WebShipUtils.mng.UserTempPath, path, nomeFile);
-                lg.Info("Spostato file {0} per sostituzione", nomeFile);
-                // aggiorno su DB
-                utils.obj.taDoc.updateFile(WebShipUtils.mng.idxFileEdit, utils.obj.currUserAD, nomeFile, path);
-                lg.Info("Aggiornato in db nome file {0} per sostituzione", nomeFile);
-                // update gridview!
-                grView.DataBind();
-            }
+            WebShipUtils.mng.aggiornaFileArchiviato(nomeFile);
+            // update gridview!
+            grView.DataBind();
         }
+
+        
     }
 }
\ No newline at end of file
diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_pathAndDocs.ascx.cs b/ETS-WS/ETS-WS/WebUserControls/mod_pathAndDocs.ascx.cs
index e4bce02..279d3de 100644
--- a/ETS-WS/ETS-WS/WebUserControls/mod_pathAndDocs.ascx.cs
+++ b/ETS-WS/ETS-WS/WebUserControls/mod_pathAndDocs.ascx.cs
@@ -34,7 +34,7 @@ namespace ETS_WS.WebUserControls
             // verifico attivazione button submin (ovvero ci sono tutti i valori...)
             btnSubmit.Visible = WebShipUtils.mng.metaPresent;
             // mostro gen protocolli SE ho richiesta di generare protocollo
-            pnlGenDocs.Visible = WebShipUtils.mng.currMetaData.reqProto;
+            pnlGenDocs.Visible = (WebShipUtils.mng.metaPresent && WebShipUtils.mng.currMetaData.reqProto);
         }
         /// <summary>
         /// richiesta update
@@ -80,8 +80,15 @@ namespace ETS_WS.WebUserControls
             string pathDest = docsData.path;
             if (pathDest != "")
             {
+                pathDest = string.Format("{0}{1}", utils.obj.confReadString("archiveDir"), docsData.path);
                 string redattore = utils.obj.currUserCognomeNome; // usa utente corrente
                 WebShipUtils.archiviaFile(docsData, WebShipUtils.mng.UserTempPath, pathDest, nomeFile, redattore);
+
+                // recupero full path del documento
+                string fullPath="";
+                string protocollo="1234";
+                // prendo il nuovo file generato e sostituisco parte del nome con il codice protocollo
+                //officeXmlMan.replaceDocxText(fullPath, "Protocollo", protocollo); // !!!FARE!!!
             }
             Response.Redirect("~/GestioneDocumenti.aspx");
         }
diff --git a/ETS-WS/ETS-WS/bin/ETS-WS.dll b/ETS-WS/ETS-WS/bin/ETS-WS.dll
index e44f7d10a07a2c8a4fc58061cdc2e70b196f2edb..19c1018b6b33650c0f6e6eeba91e0cc6b6ac59da 100644
GIT binary patch
delta 13659
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
OEoz*5E=UV=E&l@#qJc&L

delta 13449
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
I^9n5g1IC{?-2eap

diff --git a/ETS_Data/ETS_Data.csproj b/ETS_Data/ETS_Data.csproj
index 248ea80..350fa4f 100644
--- a/ETS_Data/ETS_Data.csproj
+++ b/ETS_Data/ETS_Data.csproj
@@ -47,6 +47,7 @@
     <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="DocumentFormat.OpenXml, Version=2.0.5022.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
     <Reference Include="NLog">
       <HintPath>..\ETS-WS\packages\NLog.2.0.0.2000\lib\net40\NLog.dll</HintPath>
     </Reference>
@@ -76,6 +77,7 @@
       <DependentUpon>DS_WebScip.xsd</DependentUpon>
     </Compile>
     <Compile Include="fileMover.cs" />
+    <Compile Include="officeXmlMan.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Settings.Designer.cs">
       <AutoGen>True</AutoGen>