diff --git a/ETS-WS/ETS-WS/Web.config b/ETS-WS/ETS-WS/Web.config index 30b5282..ff2f620 100644 --- a/ETS-WS/ETS-WS/Web.config +++ b/ETS-WS/ETS-WS/Web.config @@ -31,7 +31,7 @@ - + @@ -56,12 +56,12 @@ - - - - - - + + + + + + diff --git a/ETS-WS/ETS-WS/WebShipUtils.cs b/ETS-WS/ETS-WS/WebShipUtils.cs index 5144838..2ebd575 100644 --- a/ETS-WS/ETS-WS/WebShipUtils.cs +++ b/ETS-WS/ETS-WS/WebShipUtils.cs @@ -792,18 +792,25 @@ namespace ETS_WS { destinatario = mittente; } - string subject = string.Format(utils.obj.confReadString("mailSubject"), docsData.oggetto, NumProt); + /* ************************************************************* + * Struttura formato campi: + * {0} = newline + * {1} = oggetto + * {2} = numProtocollo (nnnn-aaaa) + * {3} = dataDoc + * {4} = commessa (nnnn-aaaa) + * {5} = redattore + * {6} = mittente + * *************************************************************/ + string subject = string.Format(utils.obj.confReadString("mailSubject"), Environment.NewLine, docsData.oggetto, NumProt, docsData.dataDoc, docsData.commessa, redattore, mittente); + string body = ""; - //body += string.Format("Villa D'Almè, {1:dd/MM/yyyy}{0}", Environment.NewLine, docsData.dataDoc); - //body += string.Format("{1} - {2}{0}", Environment.NewLine, docsData.commessa, docsData.oggetto); - //body += string.Format("Prot. N.: {1}{0}{0}{0}{0}", Environment.NewLine, NumProt); - //body += string.Format("Distinti Saluti.{0}{1}{0}{0}ETS S.p.A.{0}---------------------------------{0}Via Mazzi, 32{0}24018 Villa D'Almè{0}Bergamo{0}{0}", Environment.NewLine, redattore); - //body += string.Format("Trasmesso da:{0}{1}", Environment.NewLine, mittente); - body += string.Format(utils.obj.confReadString("mailBody01"), Environment.NewLine, docsData.dataDoc); - body += string.Format(utils.obj.confReadString("mailBody02"), Environment.NewLine, docsData.commessa, docsData.oggetto); - body += string.Format(utils.obj.confReadString("mailBody03"), Environment.NewLine, NumProt); - body += string.Format(utils.obj.confReadString("mailBody04"), Environment.NewLine, redattore); - body += string.Format(utils.obj.confReadString("mailBody05"), Environment.NewLine, mittente); + body += string.Format(utils.obj.confReadString("mailBody01"), Environment.NewLine, docsData.oggetto, NumProt, docsData.dataDoc, docsData.commessa, redattore, mittente); + body += string.Format(utils.obj.confReadString("mailBody02"), Environment.NewLine, docsData.oggetto, NumProt, docsData.dataDoc, docsData.commessa, redattore, mittente); + body += string.Format(utils.obj.confReadString("mailBody03"), Environment.NewLine, docsData.oggetto, NumProt, docsData.dataDoc, docsData.commessa, redattore, mittente); + body += string.Format(utils.obj.confReadString("mailBody04"), Environment.NewLine, docsData.oggetto, NumProt, docsData.dataDoc, docsData.commessa, redattore, mittente); + body += string.Format(utils.obj.confReadString("mailBody05"), Environment.NewLine, docsData.oggetto, NumProt, docsData.dataDoc, docsData.commessa, redattore, mittente); + // creo vera email! string newFileName = WebShipUtils.CreaEml(mittente, destinatario, subject, body, null, HttpContext.Current.Server.MapPath(pathDest)); // sostituisco file appena creato con quello nuovo fileMover.obj.muoviFile(pathDest, pathDest, newFileName, WebShipUtils.nomeFileFullFromIdxFile(idxFile), true); diff --git a/ETS-WS/ETS-WS/bin/ETS-WS.dll b/ETS-WS/ETS-WS/bin/ETS-WS.dll index 631b5cb..eac95f4 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 b732c03..8b03647 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/CSAutoParameterize/original/Web.config b/ETS-WS/ETS-WS/obj/ETS/CSAutoParameterize/original/Web.config index 71e4d5b..9067a6f 100644 --- a/ETS-WS/ETS-WS/obj/ETS/CSAutoParameterize/original/Web.config +++ b/ETS-WS/ETS-WS/obj/ETS/CSAutoParameterize/original/Web.config @@ -31,7 +31,7 @@ - + @@ -56,12 +56,12 @@ - - - - - - + + + + + + diff --git a/ETS-WS/ETS-WS/obj/ETS/CSAutoParameterize/transformed/Web.config b/ETS-WS/ETS-WS/obj/ETS/CSAutoParameterize/transformed/Web.config index f3a61ef..4cb8b2d 100644 --- a/ETS-WS/ETS-WS/obj/ETS/CSAutoParameterize/transformed/Web.config +++ b/ETS-WS/ETS-WS/obj/ETS/CSAutoParameterize/transformed/Web.config @@ -31,7 +31,7 @@ - + @@ -56,12 +56,12 @@ - - - - - - + + + + + + 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 308c4b2..a654d8e 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 631b5cb..eac95f4 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.zip b/ETS-WS/ETS-WS/obj/ETS/Package/ETS-WS.zip index e192842..e21336c 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-WS/ETS-WS/obj/ETS/TransformWebConfig/original/Web.config b/ETS-WS/ETS-WS/obj/ETS/TransformWebConfig/original/Web.config index 99631f1..c28c469 100644 --- a/ETS-WS/ETS-WS/obj/ETS/TransformWebConfig/original/Web.config +++ b/ETS-WS/ETS-WS/obj/ETS/TransformWebConfig/original/Web.config @@ -31,7 +31,7 @@ - + @@ -56,12 +56,12 @@ - - - - - - + + + + + + diff --git a/ETS-WS/ETS-WS/obj/ETS/TransformWebConfig/transformed/Web.config b/ETS-WS/ETS-WS/obj/ETS/TransformWebConfig/transformed/Web.config index 71e4d5b..9067a6f 100644 --- a/ETS-WS/ETS-WS/obj/ETS/TransformWebConfig/transformed/Web.config +++ b/ETS-WS/ETS-WS/obj/ETS/TransformWebConfig/transformed/Web.config @@ -31,7 +31,7 @@ - + @@ -56,12 +56,12 @@ - - - - - - + + + + + + diff --git a/ETS_Data/bin/ETS/ETS_Data.dll b/ETS_Data/bin/ETS/ETS_Data.dll index b732c03..8b03647 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/obj/ETS/ETS_Data.dll b/ETS_Data/obj/ETS/ETS_Data.dll index b732c03..8b03647 100644 Binary files a/ETS_Data/obj/ETS/ETS_Data.dll and b/ETS_Data/obj/ETS/ETS_Data.dll differ