diff --git a/GMW-RT/bin/GMW-RT.dll b/GMW-RT/bin/GMW-RT.dll index 844218ec..9cb011fb 100644 Binary files a/GMW-RT/bin/GMW-RT.dll and b/GMW-RT/bin/GMW-RT.dll differ diff --git a/GMW-RT/bin/GMW_data.dll b/GMW-RT/bin/GMW_data.dll index 45cae769..e8babba6 100644 Binary files a/GMW-RT/bin/GMW_data.dll and b/GMW-RT/bin/GMW_data.dll differ diff --git a/GMW-RT/bin/SteamWare.dll b/GMW-RT/bin/SteamWare.dll index 2a95dc42..d56201c2 100644 Binary files a/GMW-RT/bin/SteamWare.dll and b/GMW-RT/bin/SteamWare.dll differ diff --git a/GMW-RT/bin/SteamWare.xml b/GMW-RT/bin/SteamWare.xml index 16aaedce..1b72ce64 100644 --- a/GMW-RT/bin/SteamWare.xml +++ b/GMW-RT/bin/SteamWare.xml @@ -3799,7 +3799,7 @@ modalità operativa controllo - + escape dei parametri input dell'ODS diff --git a/GMW-UT/bin/GMW-UT.dll b/GMW-UT/bin/GMW-UT.dll index 02d3bf31..90038657 100644 Binary files a/GMW-UT/bin/GMW-UT.dll and b/GMW-UT/bin/GMW-UT.dll differ diff --git a/GMW-UT/bin/GMW_data.dll b/GMW-UT/bin/GMW_data.dll index 45cae769..e8babba6 100644 Binary files a/GMW-UT/bin/GMW_data.dll and b/GMW-UT/bin/GMW_data.dll differ diff --git a/GMW-UT/bin/SteamWare.dll b/GMW-UT/bin/SteamWare.dll index 2a95dc42..d56201c2 100644 Binary files a/GMW-UT/bin/SteamWare.dll and b/GMW-UT/bin/SteamWare.dll differ diff --git a/GMW-UT/bin/SteamWare.xml b/GMW-UT/bin/SteamWare.xml index 16aaedce..1b72ce64 100644 --- a/GMW-UT/bin/SteamWare.xml +++ b/GMW-UT/bin/SteamWare.xml @@ -3799,7 +3799,7 @@ modalità operativa controllo - + escape dei parametri input dell'ODS diff --git a/GMW/POST_FinitiMult_OUT.aspx.cs b/GMW/POST_FinitiMult_OUT.aspx.cs index 933e8144..197a679f 100644 --- a/GMW/POST_FinitiMult_OUT.aspx.cs +++ b/GMW/POST_FinitiMult_OUT.aspx.cs @@ -26,6 +26,7 @@ namespace GMW // update vari... doUpdate(); mod_storicoAzioniOperatore1.eh_stampa += new EventHandler(mod_storicoAzioniOperatore1_eh_stampa); + mod_PostFinMultOUT.doUpdate(); mod_PostFinMultOUT.eh_reqUpdate += mod_PostRX_NT1_eh_reqUpdate; mod_selLineaNtDt1.eh_lineSelected += mod_selLineaNtDt1_eh_doRefresh; mod_selLineaNtDt1.eh_showHideStorico += mod_selLineaNtDt1_eh_showHideStorico; diff --git a/GMW/bin/GMW.dll b/GMW/bin/GMW.dll index 33fac3d2..2bcf8a87 100644 Binary files a/GMW/bin/GMW.dll and b/GMW/bin/GMW.dll differ diff --git a/GMW/bin/GMW_data.dll b/GMW/bin/GMW_data.dll index 45cae769..e8babba6 100644 Binary files a/GMW/bin/GMW_data.dll and b/GMW/bin/GMW_data.dll differ diff --git a/GMW/bin/SteamWare.dll b/GMW/bin/SteamWare.dll index 2a95dc42..d56201c2 100644 Binary files a/GMW/bin/SteamWare.dll and b/GMW/bin/SteamWare.dll differ diff --git a/GMW/bin/SteamWare.xml b/GMW/bin/SteamWare.xml index 16aaedce..1b72ce64 100644 --- a/GMW/bin/SteamWare.xml +++ b/GMW/bin/SteamWare.xml @@ -3799,7 +3799,7 @@ modalità operativa controllo - + escape dei parametri input dell'ODS diff --git a/GMW/bin/VersGen.dll b/GMW/bin/VersGen.dll index 54e65fe2..a9f53dcf 100644 Binary files a/GMW/bin/VersGen.dll and b/GMW/bin/VersGen.dll differ diff --git a/GMW_data/Postazione.cs b/GMW_data/Postazione.cs index 2a4f6095..2b4f9f17 100644 --- a/GMW_data/Postazione.cs +++ b/GMW_data/Postazione.cs @@ -192,7 +192,14 @@ namespace GMW_data { get { - return currCodCella.Substring(0, 3); + string answ = ""; + try + { + answ = currCodCella.Substring(0, 3); + } + catch + { } + return answ; } } /// diff --git a/GMW_data/UserControl.cs b/GMW_data/UserControl.cs new file mode 100644 index 00000000..645e4f31 --- /dev/null +++ b/GMW_data/UserControl.cs @@ -0,0 +1,49 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using SteamWare; +using System.Web.UI.WebControls; + +namespace GMW_data +{ + public class UserControl : SteamWare.UserControl + { + /// + /// wrapper per log con salvataggio dell'IP del chiamante + /// + /// + /// + public bool httpLog(string _testoPre) + { + bool answ = false; + string postazione_IP = ""; + try + { + postazione_IP = string.Format(" | {0} | ", Request.UserHostName); + } + catch + { } + logger.lg.scriviLog(postazione_IP + _testoPre); + return answ; + } + /// + /// wrapper per log con salvataggio dell'IP del chiamante + /// + /// + /// + public bool httpLog(string testoLog, tipoLog tipo) + { + bool answ = false; + string postazione_IP = ""; + try + { + postazione_IP = string.Format(" | {0} | ", Request.UserHostName); + } + catch + { } + logger.lg.scriviLog(postazione_IP + testoLog, tipo); + return answ; + } + } +} diff --git a/GMW_data/bin/Debug/SteamWare.xml b/GMW_data/bin/Debug/SteamWare.xml index 16aaedce..1b72ce64 100644 --- a/GMW_data/bin/Debug/SteamWare.xml +++ b/GMW_data/bin/Debug/SteamWare.xml @@ -3799,7 +3799,7 @@ modalità operativa controllo - + escape dei parametri input dell'ODS diff --git a/VersGen/GMW.cs b/VersGen/GMW.cs index cc0006f9..b76f04b4 100644 --- a/VersGen/GMW.cs +++ b/VersGen/GMW.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("3.4.867.2379")] -[assembly: AssemblyFileVersion("3.4.867.2379")] +[assembly: AssemblyVersion("3.4.869.2383")] +[assembly: AssemblyFileVersion("3.4.869.2383")] [assembly: AssemblyCopyright("Steamware © 2007-2016")] [assembly: AssemblyCompany("Steamware")]