From d8b6fbe062a528af0852ee2268280fac8baec1d1 Mon Sep 17 00:00:00 2001
From: samuele <samuele@steamware.net>
Date: Mon, 29 Oct 2012 14:25:17 +0100
Subject: [PATCH] fix errore creazioen nuovi tempalte metadati

---
 ETS-WS/ETS-WS/ETS-WS.csproj                   |   2 +
 ETS-WS/ETS-WS/WebShipUtils.cs                 |  55 ++++++++++++++++++
 .../WebUserControls/mod_inputDati.ascx.cs     |   7 ++-
 .../WebUserControls/mod_pathAndDocs.ascx.cs   |  19 +++++-
 ETS-WS/ETS-WS/bin/ETS-WS.dll                  | Bin 58880 -> 59392 bytes
 ETS-WS/ETS-WS/bin/ETS_Data.dll                | Bin 373248 -> 373248 bytes
 6 files changed, 78 insertions(+), 5 deletions(-)

diff --git a/ETS-WS/ETS-WS/ETS-WS.csproj b/ETS-WS/ETS-WS/ETS-WS.csproj
index b7c7654..d8ba097 100644
--- a/ETS-WS/ETS-WS/ETS-WS.csproj
+++ b/ETS-WS/ETS-WS/ETS-WS.csproj
@@ -688,7 +688,9 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
     <None Include="DocTemplates\ETS-Fax.docx" />
+    <None Include="DocTemplates\ETS-Fax_noPrj.docx" />
     <None Include="DocTemplates\ETS-Lettera.docx" />
+    <None Include="DocTemplates\ETS-Lettera_noPrj.docx" />
     <None Include="DocTemplates\ETS-Proto.docx" />
     <None Include="DocTemplates\PlaceHolder.file" />
     <Content Include="logs\PlaceHolder.file" />
diff --git a/ETS-WS/ETS-WS/WebShipUtils.cs b/ETS-WS/ETS-WS/WebShipUtils.cs
index e149e43..1aa95a7 100644
--- a/ETS-WS/ETS-WS/WebShipUtils.cs
+++ b/ETS-WS/ETS-WS/WebShipUtils.cs
@@ -219,6 +219,54 @@ namespace ETS_WS
             return answ;
         }
         /// <summary>
+        /// commessa del file da idx DB
+        /// </summary>
+        /// <param name="idxFile"></param>
+        /// <returns></returns>
+        public static string commessaFromIdxFile(int idxFile)
+        {
+            string answ = "";
+            try
+            {
+                answ = string.Format("{0}", utils.obj.taDoc.getByIdxFile(idxFile)[0].Commessa);
+            }
+            catch
+            { }
+            return answ;
+        }
+        /// <summary>
+        /// oggetto del file da idx DB
+        /// </summary>
+        /// <param name="idxFile"></param>
+        /// <returns></returns>
+        public static string oggettoFromIdxFile(int idxFile)
+        {
+            string answ = "";
+            try
+            {
+                answ = string.Format("{0}", utils.obj.taDoc.getByIdxFile(idxFile)[0].Oggetto);
+            }
+            catch
+            { }
+            return answ;
+        }
+        /// <summary>
+        /// fonte del file da idx DB
+        /// </summary>
+        /// <param name="idxFile"></param>
+        /// <returns></returns>
+        public static string fonteFromIdxFile(int idxFile)
+        {
+            string answ = "";
+            try
+            {
+                answ = string.Format("{0}", utils.obj.taDoc.getByIdxFile(idxFile)[0].Fonte);
+            }
+            catch
+            { }
+            return answ;
+        }
+        /// <summary>
         /// statored/pubblico da idx DB
         /// </summary>
         /// <param name="idxFile"></param>
@@ -603,12 +651,19 @@ namespace ETS_WS
                 // recupero full path del documento
                 string fullPath = HttpContext.Current.Server.MapPath(string.Format("{0}{1}", pathDest, WebShipUtils.nomeFileFullFromIdxFile(idxFile)));
                 string protocollo = WebShipUtils.protocolloFromIdxFile(idxFile);
+                string commessa = WebShipUtils.commessaFromIdxFile(idxFile);
+                string oggetto = WebShipUtils.oggettoFromIdxFile(idxFile);
+                string fonte = WebShipUtils.fonteFromIdxFile(idxFile);
                 // se il nome contiene "docx" faccio sostituzioni...
                 if (nomeTemplate.IndexOf("docx") >= 0)
                 {
                     // prendo il nuovo file generato e sostituisco parte del nome con il codice protocollo // link: msdn.microsoft.com/en-us/library/bb508261.aspx 
                     officeXmlMan.replaceDocxText(fullPath, "{{Protocollo}}", protocollo);
                     officeXmlMan.replaceDocxText(fullPath, "{{DataDoc}}", docsData.dataDoc.ToShortDateString());
+                    officeXmlMan.replaceDocxText(fullPath, "{{Anno}}", docsData.dataDoc.Year.ToString());
+                    officeXmlMan.replaceDocxText(fullPath, "{{Commessa}}", commessa);
+                    officeXmlMan.replaceDocxText(fullPath, "{{Oggetto}}", oggetto);
+                    officeXmlMan.replaceDocxText(fullPath, "{{Fonte}}", fonte);
                     officeXmlMan.replaceDocxText(fullPath, "{{Redattore}}", utils.obj.currUserCognomeNome);
                 }
                 else if (nomeTemplate.IndexOf("eml") >= 0)
diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx.cs b/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx.cs
index d33cf16..473c718 100644
--- a/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx.cs
+++ b/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx.cs
@@ -308,8 +308,11 @@ namespace ETS_WS.WebUserControls
             string setName = txtNomeTMD.Text.Trim();
             if (setName != "")
             {
-                // elimino eventuale velore vecchio!
-                WebShipUtils.mng.eliminaTemplateMedatati(utils.obj.currUserId, dlElencoTemplate.SelectedValue);
+                // elimino eventuale velore vecchio SE nuovo = selected!
+                if (dlElencoTemplate.SelectedValue == setName)
+                {
+                    WebShipUtils.mng.eliminaTemplateMedatati(utils.obj.currUserId, dlElencoTemplate.SelectedValue);
+                }
                 // salvo!
                 WebShipUtils.mng.salvaTemplateMedatati(utils.obj.currUserId, setName, metaDatiDoc);
             }
diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_pathAndDocs.ascx.cs b/ETS-WS/ETS-WS/WebUserControls/mod_pathAndDocs.ascx.cs
index 10f3ee5..0b694dc 100644
--- a/ETS-WS/ETS-WS/WebUserControls/mod_pathAndDocs.ascx.cs
+++ b/ETS-WS/ETS-WS/WebUserControls/mod_pathAndDocs.ascx.cs
@@ -55,11 +55,12 @@ namespace ETS_WS.WebUserControls
         {
             // aggiorno
             updateVisual();
-            // indico evento di richeista spostamento
+            // indico evento di richiesta spostamento
             if (eh_reqSalva != null)
             {
                 eh_reqSalva(this, new EventArgs());
             }
+            Response.Redirect("~/GestioneDocumenti.aspx");
         }
 #if false
         /// <summary>
@@ -145,8 +146,14 @@ namespace ETS_WS.WebUserControls
         /// <param name="e"></param>
         protected void btnGenLettera_Click(object sender, EventArgs e)
         {
-            // effettua upload del documento "dummy" lettera
+            // nome standard con commessa...
             string nomeFile = "ETS-Lettera.docx";
+            // controllo se NON c'è una commessa/progetto...
+            if (WebShipUtils.mng.currMetaData.commessa.IndexOf("0000") < 0)
+            {
+                nomeFile = "ETS-Lettera_noPrj.docx";
+            }
+            // effettua upload del documento "dummy" lettera
             WebShipUtils.mng.generaDocDaTemplate(nomeFile, WebShipUtils.mng.currMetaData);
             WebShipUtils.dateIsOk(DateTime.Now);
             Response.Redirect("~/GestioneDocumenti.aspx");
@@ -158,8 +165,14 @@ namespace ETS_WS.WebUserControls
         /// <param name="e"></param>
         protected void btnGenFax_Click(object sender, EventArgs e)
         {
-            // effettua upload del documento "dummy" fax
+            // nome standard con commessa...
             string nomeFile = "ETS-Fax.docx";
+            // controllo se NON c'è una commessa/progetto...
+            if (WebShipUtils.mng.currMetaData.commessa.IndexOf("0000") < 0)
+            {
+                nomeFile = "ETS-Fax_noPrj.docx";
+            }
+            // effettua upload del documento "dummy" fax
             WebShipUtils.mng.generaDocDaTemplate(nomeFile, WebShipUtils.mng.currMetaData);
             WebShipUtils.dateIsOk(DateTime.Now);
             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 c5b0a702f6ec9672c5ee2db666fc97473ba55f10..7eb7cce8fff188ee7d35a56601c1774cd80f747d 100644
GIT binary patch
delta 11381
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

delta 10667
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
QAW+B+n2(<&jlQ7&15utR>i_@%

diff --git a/ETS-WS/ETS-WS/bin/ETS_Data.dll b/ETS-WS/ETS-WS/bin/ETS_Data.dll
index b0dc5a6e87ab4eecaa64a480efe1d25869b24ba1..1e0a484a9bd377c1c422060f0766d8e921eea8a9 100644
GIT binary patch
delta 167
zcmZp8BG&LkY(fXq?6iqpWqb`MSQ)$-fZzcu0|)a&MUiGD#&#t}5M}~mW*}zSuEfad
z*CN1N?;CH@-|Mg`!67I+SV?DlLn~{6iq7n`z5tK`Oh8-;#2i2qIaaYU1O>YU%L?o@
zx^gzrV}9?Vgcw$)3)5v*vHC~`rRJn27N^Fzh6KmEB$g!V6{IAAOjt3!b``7P_D!o;
G{n!DC4lw`#

delta 163
zcmZp8BG&LkY(fW<aPq{iGQOG<tPK7PK=6Q-frELXqDZq6W4jU~2r~gOGZ3?ES7K!K
zYZ2h}*I0CzsoT5hFzbd3VUZiRH?*=AsOShM_XU6qU;^S2Am#v?$gzr*At=}-_^BH2
zw7;bsUi+gt%}RtG3r&|<#p)v(o|)&9m=xn05*+W6Sdyq$kdnl(WP0N&R>SS<R<Q=L
F0|3Q-FkJuu