diff --git a/.vs/config/applicationhost.config b/.vs/config/applicationhost.config
index 810b780..d8b461f 100644
--- a/.vs/config/applicationhost.config
+++ b/.vs/config/applicationhost.config
@@ -163,7 +163,7 @@
-
+
@@ -171,7 +171,7 @@
-
+
@@ -179,7 +179,7 @@
-
+
diff --git a/XPS/WebUserControls/mod_ULP.ascx.cs b/XPS/WebUserControls/mod_ULP.ascx.cs
index 5cb68d0..5575712 100644
--- a/XPS/WebUserControls/mod_ULP.ascx.cs
+++ b/XPS/WebUserControls/mod_ULP.ascx.cs
@@ -140,8 +140,12 @@ namespace XPS.WebUserControls
base.OnInit(e);
aggiornaControlliDataGL();
_idxGridView = "CodRow";
+ if (!Page.IsPostBack)
+ {
+ traduciObj();
+ }
}
-
+
///
/// determino se il pulsante di conferma tutto schedulato sia visibile...
///
@@ -166,9 +170,8 @@ namespace XPS.WebUserControls
pnlSetAllSched.Visible = allSched;
}
- protected override void traduciObj()
+ protected void traduciObj()
{
- base.traduciObj();
lblULP.Text = traduci("lblULP");
lblDataPrev.Text = traduci("updateObjDueDate");
txtDueDate.Text = DateTime.Now.AddDays(memLayer.ML.confReadInt("defDayLeadTime")).ToString("dd/MM/yyyy");
diff --git a/XPS/WebUserControls/mod_barcode.ascx.cs b/XPS/WebUserControls/mod_barcode.ascx.cs
index 5a3a3f2..ee86ec1 100644
--- a/XPS/WebUserControls/mod_barcode.ascx.cs
+++ b/XPS/WebUserControls/mod_barcode.ascx.cs
@@ -47,9 +47,8 @@ namespace XPS.WebUserControls
///
///
///
- protected override void Page_Load(object sender, EventArgs e)
+ protected void Page_Load(object sender, EventArgs e)
{
- base.Page_Load(sender, e);
DetectAgent();
myInitialize();
}
diff --git a/XPS/WebUserControls/mod_dettComm.ascx.cs b/XPS/WebUserControls/mod_dettComm.ascx.cs
index a128462..5cc9e79 100644
--- a/XPS/WebUserControls/mod_dettComm.ascx.cs
+++ b/XPS/WebUserControls/mod_dettComm.ascx.cs
@@ -129,6 +129,7 @@ namespace XPS.WebUserControls
protected override void OnInit(EventArgs e)
{
base.OnInit(e);
+ traduciObj();
aggiornaControlliDataGL();
_idxGridView = "CodRow";
updateNavBar();
@@ -159,9 +160,8 @@ namespace XPS.WebUserControls
}
}
- protected override void traduciObj()
+ protected void traduciObj()
{
- base.traduciObj();
lblRowsDDT.Text = traduci("lblRowsDDT");
}
diff --git a/XPS/WebUserControls/mod_elencoComm.ascx.cs b/XPS/WebUserControls/mod_elencoComm.ascx.cs
index 0f093ba..66a4cd4 100644
--- a/XPS/WebUserControls/mod_elencoComm.ascx.cs
+++ b/XPS/WebUserControls/mod_elencoComm.ascx.cs
@@ -137,6 +137,10 @@ namespace XPS.WebUserControls
protected override void OnInit(EventArgs e)
{
base.OnInit(e);
+ if(!Page.IsPostBack)
+ {
+ traduciObj();
+ }
SetUpByUserRight();
aggiornaControlliDataGL();
_idxGridView = "CodDDT";
@@ -259,9 +263,8 @@ namespace XPS.WebUserControls
grView.DataBind();
}
- protected override void traduciObj()
+ protected void traduciObj()
{
- base.traduciObj();
btnShowNew.Text = traduci("btnShowNew");
btnNewComm.Text = traduci("btnNewComm");
lblCli.Text = traduci("lblCli");
diff --git a/XPS/WebUserControls/mod_filtro.ascx.cs b/XPS/WebUserControls/mod_filtro.ascx.cs
index 8bd6820..5ffa49a 100644
--- a/XPS/WebUserControls/mod_filtro.ascx.cs
+++ b/XPS/WebUserControls/mod_filtro.ascx.cs
@@ -14,6 +14,16 @@ namespace XPS.WebUserControls
{
public partial class mod_filtro : SteamWare.UserControl
{
+ protected override void OnInit(EventArgs e)
+ {
+ base.OnInit(e);
+ if (!Page.IsPostBack)
+ {
+ traduciObj();
+ }
+ bindControlli();
+ }
+
protected ObjectDataSource _ods;
protected string _valore
{
@@ -30,7 +40,7 @@ namespace XPS.WebUserControls
protected bool _changeCheckVisible = true;
protected bool _changeSelEnabled = true;
protected string _where = "";
- protected override void traduciObj()
+ protected void traduciObj()
{
if (_changeCheckVisible)
{
@@ -83,7 +93,7 @@ namespace XPS.WebUserControls
{
chkFilt.Visible = _changeCheckVisible;
}
- protected override void bindControlli()
+ protected void bindControlli()
{
updateChk();
fixValore();
@@ -214,7 +224,7 @@ namespace XPS.WebUserControls
chkFilt.Checked = true;
}
}
- catch(Exception exc)
+ catch (Exception exc)
{
logger.lg.scriviLog("Errore bind ods filtraggio");
}
diff --git a/XPS/WebUserControls/mod_login.ascx.cs b/XPS/WebUserControls/mod_login.ascx.cs
index 283f31f..927add6 100644
--- a/XPS/WebUserControls/mod_login.ascx.cs
+++ b/XPS/WebUserControls/mod_login.ascx.cs
@@ -17,6 +17,14 @@ namespace XPS.WebUserControls
///
public partial class mod_login : SteamWare.UserControl
{
+ protected override void OnInit(EventArgs e)
+ {
+ base.OnInit(e);
+ if (!Page.IsPostBack)
+ {
+ traduciObj();
+ }
+ }
#region area protected/private
#region area proprietà
@@ -42,7 +50,7 @@ namespace XPS.WebUserControls
}
}
- protected override void traduciObj()
+ protected void traduciObj()
{
lblPwd.Text = user_std.UtSn.Traduci("lblPwd");
lblUser.Text = user_std.UtSn.Traduci("lblUser");
@@ -164,7 +172,7 @@ namespace XPS.WebUserControls
else
{
lblMessage.Text = String.Format("{0}
key not allowed for operation!!! operation logged!!!", user_std.UtSn.Traduci("AccessFail"));
- mandaEmail(_fromEmail, _adminEmail, "Attenzione: tentativo di accesso non autorizzato!", String.Format("Tentativo di forcing user non autorizzato!
L'utente {0} ha tentato di accedere a {1} forzando l'utente ma la sua key autorizzativa e' sbagliata...", Page.User.Identity.Name, user_std.UtSn.Traduci(SteamWare.memLayer.ML.confReadString("defaultApp"))));
+ gestEmail.geAuth.mandaEmail(email.senderEmail, email.adminEmail, "Attenzione: tentativo di accesso non autorizzato!", String.Format("Tentativo di forcing user non autorizzato!
L'utente {0} ha tentato di accedere a {1} forzando l'utente ma la sua key autorizzativa e' sbagliata...", Page.User.Identity.Name, user_std.UtSn.Traduci(SteamWare.memLayer.ML.confReadString("defaultApp"))));
string _rigaLog = String.Format("User {0}\t tried to force user - wrong password - he tried to log as \t {1}\\{2}", Page.User.Identity.Name, dominio.Text, user.Text);
SteamWare.logger.lg.scriviLog(_rigaLog, SteamWare.tipoLog.WARNING);
if (Login_Error != null)
@@ -175,7 +183,7 @@ namespace XPS.WebUserControls
}
else
{
- mandaEmail(_fromEmail, _adminEmail, "Attenzione: tentativo di accesso non autorizzato!", String.Format("Tentativo di forcing user non autorizzato!
L'utente {0} ha tentato di accedere a {1} forzando l'utente ma la funzione e' disabilitata...", Page.User.Identity.Name, user_std.UtSn.Traduci(SteamWare.memLayer.ML.confReadString("defaultApp"))));
+ gestEmail.geAuth.mandaEmail(email.senderEmail, email.adminEmail, "Attenzione: tentativo di accesso non autorizzato!", String.Format("Tentativo di forcing user non autorizzato!
L'utente {0} ha tentato di accedere a {1} forzando l'utente ma la funzione e' disabilitata...", Page.User.Identity.Name, user_std.UtSn.Traduci(SteamWare.memLayer.ML.confReadString("defaultApp"))));
string _rigaLog = String.Format("User {0}\t tried to force user - access disabled - he tried to log as \t {1}\\{2}", Page.User.Identity.Name, dominio.Text, user.Text);
SteamWare.logger.lg.scriviLog(_rigaLog, SteamWare.tipoLog.WARNING);
if (Login_Error != null)
@@ -237,11 +245,8 @@ namespace XPS.WebUserControls
///
/// avvio pagina
///
- protected override void Page_Load(object sender, EventArgs e)
+ protected void Page_Load(object sender, EventArgs e)
{
- base.Page_Load(sender, e);
- //carico da web.config i default values
- loadDefaultsWebConfig();
// procedo...
setLoginMode();
Session.RemoveAll();
diff --git a/XPS/WebUserControls/mod_main_help.ascx.cs b/XPS/WebUserControls/mod_main_help.ascx.cs
index e92c423..ebcd684 100644
--- a/XPS/WebUserControls/mod_main_help.ascx.cs
+++ b/XPS/WebUserControls/mod_main_help.ascx.cs
@@ -21,7 +21,7 @@ namespace XPS.WebUserControls
protected string defaultTitle;
protected string defaultBody;
- protected override void traduciObj()
+ protected void traduciObj()
{
defaultApp = SteamWare.memLayer.ML.confReadString("defaultApp");
defaultTitle = SteamWare.memLayer.ML.confReadString("defaultTitle");
@@ -31,6 +31,12 @@ namespace XPS.WebUserControls
lblMess.Text = user_std.UtSn.Traduci(defaultBody);
}
+ protected override void OnInit(EventArgs e)
+ {
+ base.OnInit(e);
+ traduciObj();
+ }
+
#endregion
#region public
diff --git a/XPS/WebUserControls/mod_navPath.ascx.cs b/XPS/WebUserControls/mod_navPath.ascx.cs
index 355cdd6..a4aa272 100644
--- a/XPS/WebUserControls/mod_navPath.ascx.cs
+++ b/XPS/WebUserControls/mod_navPath.ascx.cs
@@ -99,7 +99,7 @@ namespace XPS.WebUserControls
txtTooltip.Text = value;
}
}
- protected override void bindControlli()
+ protected void bindControlli()
{
hlNaviga.NavigateUrl = txtLink.Text;
//mostro solo una substring: il minore tra la lungh e xx char
@@ -115,7 +115,11 @@ namespace XPS.WebUserControls
hlNaviga.ToolTip = string.Format("{0} ({1})", txtTesto.Text, txtTooltip.Text);
lblSeparatore.Text = string.Format(" {0} ", txtSeparatore.Text);
}
-
+ protected override void OnInit(EventArgs e)
+ {
+ base.OnInit(e);
+ bindControlli();
+ }
///
/// primo valore di una chiave multicampo
///
diff --git a/XPS/WebUserControls/mod_ricercaGenerica.ascx.cs b/XPS/WebUserControls/mod_ricercaGenerica.ascx.cs
index cc34415..47ff681 100644
--- a/XPS/WebUserControls/mod_ricercaGenerica.ascx.cs
+++ b/XPS/WebUserControls/mod_ricercaGenerica.ascx.cs
@@ -34,9 +34,8 @@ namespace XPS.WebUserControls
#endregion
- protected override void Page_Load(object sender, EventArgs e)
+ protected void Page_Load(object sender, EventArgs e)
{
- base.Page_Load(sender, e);
updateText();
}
///
diff --git a/XPS/WebUserControls/mod_scadenziarioCommesse.ascx.cs b/XPS/WebUserControls/mod_scadenziarioCommesse.ascx.cs
index 35f7a8f..220819e 100644
--- a/XPS/WebUserControls/mod_scadenziarioCommesse.ascx.cs
+++ b/XPS/WebUserControls/mod_scadenziarioCommesse.ascx.cs
@@ -14,9 +14,8 @@ namespace XPS.WebUserControls
{
public partial class mod_scadenziarioCommesse : SteamWare.UserControl
{
- protected override void traduciObj()
+ protected void traduciObj()
{
- base.traduciObj();
lblFromDate.Text = traduci("lblFromDate");
txtFromDate.Text = DateTime.Now.ToString("dd/MM/yyyy");
// traduco tab panels
@@ -24,6 +23,11 @@ namespace XPS.WebUserControls
tabPnlCompletate.HeaderText = traduci("tabPnlCompletate");
tabPnlProxScadenze.HeaderText = traduci("tabPnlProxScadenze");
}
+ protected override void OnInit(EventArgs e)
+ {
+ base.OnInit(e);
+ traduciObj();
+ }
///
/// aggiornata data inizio riferimento
@@ -56,9 +60,8 @@ namespace XPS.WebUserControls
mod_completate1.dataRif = Convert.ToDateTime(txtFromDate.Text);
mod_completate1.doUpdate();
}
- protected override void Page_Load(object sender, EventArgs e)
+ protected void Page_Load(object sender, EventArgs e)
{
- base.Page_Load(sender, e);
if (!Page.IsPostBack)
{
if (memLayer.ML.isInSessionObject("cicloLavSel"))
diff --git a/XPS/WebUserControls/mod_selettore_ajax.ascx.cs b/XPS/WebUserControls/mod_selettore_ajax.ascx.cs
index c43e957..7364a80 100644
--- a/XPS/WebUserControls/mod_selettore_ajax.ascx.cs
+++ b/XPS/WebUserControls/mod_selettore_ajax.ascx.cs
@@ -30,19 +30,18 @@ namespace XPS.WebUserControls
#region gestione pagina
- protected override void Page_Load(object sender, EventArgs e)
+ protected void Page_Load(object sender, EventArgs e)
{
- base.Page_Load(sender, e);
updateChkOpzione();
if (!Page.IsPostBack)
{
- SteamWare.memLayer.ML.emptySessionVal(searchSessionName);
+ memLayer.ML.emptySessionVal(searchSessionName);
+ traduciObj();
}
}
- protected override void traduciObj()
+ protected void traduciObj()
{
- base.traduciObj();
lblCerca.Text = traduci("lblCerca");
btnCerca.Text = traduci("search");
if (_chkVisibile)
@@ -74,7 +73,10 @@ namespace XPS.WebUserControls
}
traduciObj();
}
+ bindControlli();
}
+
+ public tipoVistaMod vistaModulo { get; set; }
///
/// imposta il valore della ricerca da quello in session
///
@@ -223,9 +225,8 @@ namespace XPS.WebUserControls
///
/// sistemo gli ods
///
- protected override void bindControlli()
+ protected void bindControlli()
{
- base.bindControlli();
fixChkOds();
fixOds();
}
diff --git a/XPS/WebUserControls/mod_vocabolario.ascx.cs b/XPS/WebUserControls/mod_vocabolario.ascx.cs
index ad7f83c..c64fee8 100644
--- a/XPS/WebUserControls/mod_vocabolario.ascx.cs
+++ b/XPS/WebUserControls/mod_vocabolario.ascx.cs
@@ -24,9 +24,8 @@ namespace XPS.WebUserControls
#region protected
- protected override void traduciObj()
+ protected void traduciObj()
{
- base.traduciObj();
btnNewLemma.Text = user_std.UtSn.Traduci("btnNewLemma");
txtNewLemma.Text = "";
TBW_newLemma.WatermarkText = user_std.UtSn.Traduci("insertNewLemma");
@@ -69,6 +68,10 @@ namespace XPS.WebUserControls
protected override void OnInit(EventArgs e)
{
base.OnInit(e);
+ if(!Page.IsPostBack)
+ {
+ traduciObj();
+ }
aggiornaControlliDataGL();
}
diff --git a/XPS_data/ExtLib/Microsoft.ReportViewer.WinForms.dll b/XPS_data/ExtLib/Microsoft.ReportViewer.WinForms.dll
new file mode 100644
index 0000000..2cb6418
Binary files /dev/null and b/XPS_data/ExtLib/Microsoft.ReportViewer.WinForms.dll differ
diff --git a/XPS_data/XPS_data.csproj b/XPS_data/XPS_data.csproj
index 08c8638..9a9d61c 100644
--- a/XPS_data/XPS_data.csproj
+++ b/XPS_data/XPS_data.csproj
@@ -184,6 +184,7 @@
+
Always