diff --git a/ETS-WS/ETS-WS/WebShipUtils.cs b/ETS-WS/ETS-WS/WebShipUtils.cs
index c96f2c1..205e5e7 100644
--- a/ETS-WS/ETS-WS/WebShipUtils.cs
+++ b/ETS-WS/ETS-WS/WebShipUtils.cs
@@ -382,10 +382,19 @@ namespace ETS_WS
DirectoryInfo dir = new DirectoryInfo(destFolder);
FileInfo file = dir.GetFiles("*.eml", SearchOption.TopDirectoryOnly).OrderByDescending(m => m.CreationTimeUtc).First();
- // hack: inserisco il campo "non inviato" nel file di testo della email... "X-Unsent: 1"
- StreamWriter sw = file.AppendText();
- sw.Write(Environment.NewLine);
- sw.Write("X-Unsent: 1");
+ // hack: inserisco il campo "non inviato" nel file di testo della email... "X-Unsent: 1" va messo all'inizio x cui rileggo file e lo riscrivo!
+ string nomeFile = file.Name;
+ string contenutoEmail = "X-Unsent: 1";
+ contenutoEmail += Environment.NewLine;
+ StreamReader sr = file.OpenText();
+ contenutoEmail += sr.ReadToEnd();
+ sr.Close();
+ // scrivo nuovo testo!
+ StreamWriter sw = file.CreateText();
+ sw.Write(contenutoEmail);
+ //StreamWriter sw = file.AppendText();
+ //sw.Write(Environment.NewLine);
+ //sw.Write("X-Unsent: 1");
sw.Flush();
return file.Name;
}
diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_pathAndDocs.ascx.cs b/ETS-WS/ETS-WS/WebUserControls/mod_pathAndDocs.ascx.cs
index 1658112..aedc146 100644
--- a/ETS-WS/ETS-WS/WebUserControls/mod_pathAndDocs.ascx.cs
+++ b/ETS-WS/ETS-WS/WebUserControls/mod_pathAndDocs.ascx.cs
@@ -74,67 +74,6 @@ namespace ETS_WS.WebUserControls
}
Response.Redirect("~/GestioneDocumenti.aspx");
}
-#if false
- ///
- /// genera un doc da template, tramite
- /// - salvataggio
- /// - spostamento "dummy file"
- /// - enter in modalità editing
- ///
- /// file TEMPLATE
- private int generaDocDaTemplate(string nomeTemplate)
- {
- int idxFile = 0;
- fileMover.obj.muoviFile("~/DocTemplates/", WebShipUtils.mng.UserTempPath, nomeTemplate, false);
- // stacco un nuovo protocollo!
- docMetaDataSet docsData = WebShipUtils.mng.currMetaData;
- //check del path
- string pathDest = docsData.path;
- if (pathDest != "")
- {
- // verifico se è comunicazione red = riservata
- string comPath = "";
- if (!docsData.isRed)
- {
- comPath = utils.obj.confReadString("archiveDir");
- }
- else
- {
- comPath = utils.obj.confReadString("archiveDirRed");
- }
- // aggiunto al path cartella archivio corretta...
- pathDest = string.Format("{0}{1}", comPath, docsData.path);
- // fix redattore
- 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);
- // recupero full path del documento
- string fullPath = Server.MapPath(string.Format("{0}{1}", pathDest, WebShipUtils.nomeFileFullFromIdxFile(idxFile)));
- string protocollo = WebShipUtils.protocolloFromIdxFile(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, "{{Redattore}}", utils.obj.currUserCognomeNome);
- }
- else if (nomeTemplate.IndexOf("eml") >= 0)
- {
- // creo un NUOVO file alla destinazione sostituendo l'esistente con apposita classe
- string mittente = utils.obj.currUserEmail;
- string destinatario = WebShipUtils.emailDaCodForn(docsData.fonte);
- string subject = string.Format("{0}, prot. num {1}", docsData.oggetto, protocollo);
- string body = string.Format("Commessa: {1}{0}Fase: {2}{0}Oggetto: {3}{0}prot. num: {4}", Environment.NewLine, docsData.commessa, docsData.fase, docsData.oggetto, protocollo);
- string newFileName = WebShipUtils.CreaEml(mittente, destinatario, subject, body, null, Server.MapPath(pathDest));
- // sostituisco file appena creato con quello nuovo
- fileMover.obj.muoviFile(pathDest, pathDest, newFileName, WebShipUtils.nomeFileFullFromIdxFile(idxFile), true);
- }
- }
- return idxFile;
- }
-#endif
///
/// richiede salvataggio del protocollo, tramite
/// - salvataggio
diff --git a/ETS-WS/ETS-WS/bin/ETS-WS.dll b/ETS-WS/ETS-WS/bin/ETS-WS.dll
index cc2d7d9..8156fd1 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 6de14c7..b263a2a 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-WS/ETS-WS/obj/ETS/ETS-WS.csprojResolveAssemblyReference.cache b/ETS-WS/ETS-WS/obj/ETS/ETS-WS.csprojResolveAssemblyReference.cache
index fb6f6c2..426dcda 100644
Binary files a/ETS-WS/ETS-WS/obj/ETS/ETS-WS.csprojResolveAssemblyReference.cache and b/ETS-WS/ETS-WS/obj/ETS/ETS-WS.csprojResolveAssemblyReference.cache differ
diff --git a/ETS-WS/ETS-WS/obj/ETS/ETS-WS.dll b/ETS-WS/ETS-WS/obj/ETS/ETS-WS.dll
index cec417e..8156fd1 100644
Binary files a/ETS-WS/ETS-WS/obj/ETS/ETS-WS.dll and b/ETS-WS/ETS-WS/obj/ETS/ETS-WS.dll differ
diff --git a/ETS-WS/ETS-WS/obj/ETS/Package/ETS-WS.SourceManifest.xml b/ETS-WS/ETS-WS/obj/ETS/Package/ETS-WS.SourceManifest.xml
index 00205c1..7c40556 100644
--- a/ETS-WS/ETS-WS/obj/ETS/Package/ETS-WS.SourceManifest.xml
+++ b/ETS-WS/ETS-WS/obj/ETS/Package/ETS-WS.SourceManifest.xml
@@ -1,6 +1,6 @@
-
-
-
+
+
+
\ No newline at end of file
diff --git a/ETS-WS/ETS-WS/obj/ETS/Package/ETS-WS.zip b/ETS-WS/ETS-WS/obj/ETS/Package/ETS-WS.zip
index 67af0d3..689018e 100644
Binary files a/ETS-WS/ETS-WS/obj/ETS/Package/ETS-WS.zip and b/ETS-WS/ETS-WS/obj/ETS/Package/ETS-WS.zip differ
diff --git a/ETS_Data/bin/ETS/ETS_Data.dll b/ETS_Data/bin/ETS/ETS_Data.dll
index 542dadc..b263a2a 100644
Binary files a/ETS_Data/bin/ETS/ETS_Data.dll and b/ETS_Data/bin/ETS/ETS_Data.dll differ
diff --git a/ETS_Data/bin/Release/ETS_Data.dll b/ETS_Data/bin/Release/ETS_Data.dll
index 6de14c7..4b8bb96 100644
Binary files a/ETS_Data/bin/Release/ETS_Data.dll and b/ETS_Data/bin/Release/ETS_Data.dll differ
diff --git a/ETS_Data/fileMover.cs b/ETS_Data/fileMover.cs
index b11d8cc..48a0623 100644
--- a/ETS_Data/fileMover.cs
+++ b/ETS_Data/fileMover.cs
@@ -237,5 +237,6 @@ namespace ETS_Data
bool fatto = muoviFile(_pathFrom, _pathTo, _nomeFile, true);
return fatto;
}
+
}
}
diff --git a/ETS_Data/obj/Debug/ETS_Data.csprojResolveAssemblyReference.cache b/ETS_Data/obj/Debug/ETS_Data.csprojResolveAssemblyReference.cache
index a582b4d..2a48177 100644
Binary files a/ETS_Data/obj/Debug/ETS_Data.csprojResolveAssemblyReference.cache and b/ETS_Data/obj/Debug/ETS_Data.csprojResolveAssemblyReference.cache differ
diff --git a/ETS_Data/obj/Debug/ETS_Data.dll b/ETS_Data/obj/Debug/ETS_Data.dll
index 176a4d7..01b9204 100644
Binary files a/ETS_Data/obj/Debug/ETS_Data.dll and b/ETS_Data/obj/Debug/ETS_Data.dll differ
diff --git a/ETS_Data/obj/Debug/TempPE/DS_utils.Designer.cs.dll b/ETS_Data/obj/Debug/TempPE/DS_utils.Designer.cs.dll
index 4833f3e..77539fa 100644
Binary files a/ETS_Data/obj/Debug/TempPE/DS_utils.Designer.cs.dll and b/ETS_Data/obj/Debug/TempPE/DS_utils.Designer.cs.dll differ
diff --git a/ETS_Data/obj/ETS/ETS_Data.dll b/ETS_Data/obj/ETS/ETS_Data.dll
index 542dadc..b263a2a 100644
Binary files a/ETS_Data/obj/ETS/ETS_Data.dll and b/ETS_Data/obj/ETS/ETS_Data.dll differ
diff --git a/ETS_Data/obj/ETS/TempPE/DS_utils.Designer.cs.dll b/ETS_Data/obj/ETS/TempPE/DS_utils.Designer.cs.dll
index cda7360..18882af 100644
Binary files a/ETS_Data/obj/ETS/TempPE/DS_utils.Designer.cs.dll and b/ETS_Data/obj/ETS/TempPE/DS_utils.Designer.cs.dll differ