continuata integrazione con NUOVI componenti, ma ANCORA NON VA... 40+ errori...

This commit is contained in:
Samuele Locatelli
2017-02-10 18:25:58 +01:00
parent eeb71fd615
commit b20f400372
23 changed files with 253 additions and 107 deletions
+1 -1
View File
@@ -136,7 +136,7 @@
<add key="_logMaxMb" value="30"/>
<add key="_allowForceUser" value="true"/>
<add key="_safePages" value="chLang.aspx#jumper.aspx#unauthorized.aspx#allegati.aspx#forceUser.aspx#login.aspx#test.aspx#UserAdmin"/>
<add key="PageNoIndex" value="Test#UserAdmin"/>
<add key="PageNoIndex" value="Test#UserAdmin#Login"/>
<add key="_commonPages" value="menu.aspx"/>
<add key="_titoloPagina" value="XPS"/>
<add key="titleApp" value="XPS_titleApp"/>
+5 -10
View File
@@ -13,7 +13,7 @@ using XPS_data;
namespace XPS.WebUserControls
{
public partial class mod_ULP : ApplicationUserControl
public partial class mod_ULP : SteamWare.UserControl
{
#region area da NON modificare
@@ -25,10 +25,9 @@ namespace XPS.WebUserControls
/// <summary>
/// aggiorna controlli datagrid e numero righe in pagina
/// </summary>
protected override void aggiornaControlliDataGL()
protected void aggiornaControlliDataGL()
{
base.aggiornaControlliDataGL();
grView.PageSize = _righeDataGridMed;
grView.PageSize = righeDataGridMed;
}
/// <summary>
/// traduce gli header delle colonne
@@ -139,14 +138,10 @@ namespace XPS.WebUserControls
protected override void OnInit(EventArgs e)
{
base.OnInit(e);
aggiornaControlliDataGL();
_idxGridView = "CodRow";
}
protected override void bindControlli()
{
base.bindControlli();
}
/// <summary>
/// determino se il pulsante di conferma tutto schedulato sia visibile...
/// </summary>
@@ -12,7 +12,7 @@ using SteamWare;
namespace XPS.WebUserControls
{
public partial class mod_anagraficaEventi : ApplicationUserControl
public partial class mod_anagraficaEventi : SteamWare.UserControl
{
#region area da NON modificare
@@ -85,10 +85,9 @@ namespace XPS.WebUserControls
/// <summary>
/// aggiorna controlli datagrid e numero righe in pagina
/// </summary>
protected override void aggiornaControlliDataGL()
protected void aggiornaControlliDataGL()
{
base.aggiornaControlliDataGL();
grView.PageSize = _righeDataGridMed;
grView.PageSize = righeDataGridMed;
}
/// <summary>
/// traduce gli header delle colonne
@@ -165,9 +164,8 @@ namespace XPS.WebUserControls
/// <summary>
/// collega i controlli
/// </summary>
protected override void bindControlli()
protected void bindControlli()
{
base.bindControlli();
caricaTabelle();
}
/// <summary>
@@ -262,6 +260,8 @@ namespace XPS.WebUserControls
protected override void OnInit(EventArgs e)
{
base.OnInit(e);
aggiornaControlliDataGL();
bindControlli();
_idxGridView = "CodEvento";
}
void Mod_filtro1_eh_selValore(object sender, EventArgs e)
@@ -13,7 +13,7 @@ using XPS_data;
namespace XPS.WebUserControls
{
public partial class mod_anagraficaMappe : ApplicationUserControl
public partial class mod_anagraficaMappe : SteamWare.UserControl
{
#region area da NON modificare
@@ -55,10 +55,9 @@ namespace XPS.WebUserControls
/// <summary>
/// aggiorna controlli datagrid e numero righe in pagina
/// </summary>
protected override void aggiornaControlliDataGL()
protected void aggiornaControlliDataGL()
{
base.aggiornaControlliDataGL();
grView.PageSize = _righeDataGridMed;
grView.PageSize = righeDataGridMed;
}
/// <summary>
/// traduce gli header delle colonne
@@ -205,6 +204,7 @@ namespace XPS.WebUserControls
protected override void OnInit(EventArgs e)
{
base.OnInit(e);
aggiornaControlliDataGL();
_idxGridView = "CodMappe";
}
void Mod_filtro1_eh_selValore(object sender, EventArgs e)
@@ -12,7 +12,7 @@ using SteamWare;
namespace XPS.WebUserControls
{
public partial class mod_anagraficaStati : ApplicationUserControl
public partial class mod_anagraficaStati : SteamWare.UserControl
{
#region area da NON modificare
@@ -85,10 +85,9 @@ namespace XPS.WebUserControls
/// <summary>
/// aggiorna controlli datagrid e numero righe in pagina
/// </summary>
protected override void aggiornaControlliDataGL()
{
base.aggiornaControlliDataGL();
grView.PageSize = _righeDataGridMed;
protected void aggiornaControlliDataGL()
{
grView.PageSize = righeDataGridMed;
}
/// <summary>
/// traduce gli header delle colonne
@@ -240,9 +239,8 @@ namespace XPS.WebUserControls
/// <summary>
/// traduco labels
/// </summary>
protected override void traduciObj()
protected void traduciObj()
{
base.traduciObj();
lblMappe.Text = traduci("lblMappe");
lblTipo.Text = traduci("lblTipo");
btnShowClona.Text = traduci("btnShowClona");
@@ -255,6 +253,8 @@ namespace XPS.WebUserControls
protected override void OnInit(EventArgs e)
{
base.OnInit(e);
aggiornaControlliDataGL();
traduciObj();
_idxGridView = "CodStato";
if (!Page.IsPostBack)
{
+1 -2
View File
@@ -1,10 +1,9 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:2.0.50727.4963
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
+1 -1
View File
@@ -7,7 +7,7 @@ using SteamWare;
namespace XPS.WebUserControls
{
public partial class mod_barcode : ApplicationUserControl
public partial class mod_barcode : SteamWare.UserControl
{
#region area protected
+8 -3
View File
@@ -12,7 +12,7 @@ using SteamWare;
namespace XPS.WebUserControls
{
public partial class mod_chLang : ApplicationUserControl
public partial class mod_chLang : SteamWare.UserControl
{
protected void dataListLingue_SelectedIndexChanged(object sender, EventArgs e)
{
@@ -21,10 +21,15 @@ namespace XPS.WebUserControls
// salvo richiesta udpate in sessione...
SteamWare.memLayer.ML.setSessionVal("doUpdateNow", "true");
user_std.UtSn.ricaricaMappaSito();
Response.Redirect(_paginaCorrente);
Response.Redirect(devicesAuthProxy.pagCorrente);
}
protected override void OnInit(EventArgs e)
{
base.OnInit(e);
traduciObj();
}
protected override void traduciObj()
protected void traduciObj()
{
lblScegli.Text = traduci("scegliLingua");
}
+4 -4
View File
@@ -13,7 +13,7 @@ using XPS_data;
namespace XPS.WebUserControls
{
public partial class mod_dettComm : ApplicationUserControl
public partial class mod_dettComm : SteamWare.UserControl
{
#region area da NON modificare
@@ -25,10 +25,9 @@ namespace XPS.WebUserControls
/// <summary>
/// aggiorna controlli datagrid e numero righe in pagina
/// </summary>
protected override void aggiornaControlliDataGL()
protected void aggiornaControlliDataGL()
{
base.aggiornaControlliDataGL();
grView.PageSize = _righeDataGridMed;
grView.PageSize = righeDataGridMed;
}
/// <summary>
/// traduce gli header delle colonne
@@ -130,6 +129,7 @@ namespace XPS.WebUserControls
protected override void OnInit(EventArgs e)
{
base.OnInit(e);
aggiornaControlliDataGL();
_idxGridView = "CodRow";
updateNavBar();
mod_logStati1.eh_reset += new EventHandler(mod_logStati1_eh_reset);
+8 -8
View File
@@ -13,7 +13,7 @@ using XPS_data;
namespace XPS.WebUserControls
{
public partial class mod_elencoComm : ApplicationUserControl
public partial class mod_elencoComm : SteamWare.UserControl
{
#region area da NON modificare
@@ -25,11 +25,10 @@ namespace XPS.WebUserControls
/// <summary>
/// aggiorna controlli datagrid e numero righe in pagina
/// </summary>
protected override void aggiornaControlliDataGL()
protected void aggiornaControlliDataGL()
{
base.aggiornaControlliDataGL();
checkFixOds();
grView.PageSize = _righeDataGridMed;
grView.PageSize = righeDataGridMed;
}
/// <summary>
/// traduce gli header delle colonne
@@ -138,6 +137,8 @@ namespace XPS.WebUserControls
protected override void OnInit(EventArgs e)
{
base.OnInit(e);
SetUpByUserRight();
aggiornaControlliDataGL();
_idxGridView = "CodDDT";
mf_clienti.eh_selValore += new EventHandler(mf_clienti_eh_selValore);
mf_tipoFiltro.eh_selValore += new EventHandler(mf_tipoFiltro_eh_selValore);
@@ -207,15 +208,14 @@ namespace XPS.WebUserControls
pnlSetDueDate.Visible = false;
}
/// <summary>
/// sistemo permessi utente e in cascata sistemo visualizzaizone filtri e controlli
/// sistemo permessi utente e in cascata sistemo visualizzazione filtri e controlli
/// </summary>
protected override void SetUpByUserRight()
protected void SetUpByUserRight()
{
base.SetUpByUserRight();
if (!Page.IsPostBack)
{
// imposto la pag corrente nel controllo di filtraggio...
lblPag.Text = _paginaCorrente;
lblPag.Text = devicesAuthProxy.pagCorrente;
mf_tipoFiltro.ods = odsTipoFiltro;
mf_clienti.ods = odsFiltroClienti;
fixControlliDaModoCorrente();
+6 -6
View File
@@ -13,7 +13,7 @@ using XPS_data;
namespace XPS.WebUserControls
{
public partial class mod_ev2stati : ApplicationUserControl
public partial class mod_ev2stati : SteamWare.UserControl
{
#region area da NON modificare
@@ -55,10 +55,9 @@ namespace XPS.WebUserControls
/// <summary>
/// aggiorna controlli datagrid e numero righe in pagina
/// </summary>
protected override void aggiornaControlliDataGL()
protected void aggiornaControlliDataGL()
{
base.aggiornaControlliDataGL();
grView.PageSize = _righeDataGridMed;
grView.PageSize = righeDataGridMed;
}
/// <summary>
/// traduce gli header delle colonne
@@ -205,6 +204,8 @@ namespace XPS.WebUserControls
protected override void OnInit(EventArgs e)
{
base.OnInit(e);
traduciObj();
aggiornaControlliDataGL();
_idxGridView = "CodStato";
if (!Page.IsPostBack)
{
@@ -214,9 +215,8 @@ namespace XPS.WebUserControls
/// <summary>
/// traduco labels
/// </summary>
protected override void traduciObj()
protected void traduciObj()
{
base.traduciObj();
btnShowClona.Text = traduci("btnShowClona");
btnClonaStati.Text = traduci("btnClonaStati");
}
+1 -1
View File
@@ -12,7 +12,7 @@ using SteamWare;
namespace XPS.WebUserControls
{
public partial class mod_filtro : ApplicationUserControl
public partial class mod_filtro : SteamWare.UserControl
{
protected ObjectDataSource _ods;
protected string _valore
+9 -4
View File
@@ -12,14 +12,19 @@ using SteamWare;
namespace XPS.WebUserControls
{
public partial class mod_lemmiVocab : ApplicationUserControl
public partial class mod_lemmiVocab : SteamWare.UserControl
{
#region protected
protected override void aggiornaControlliDataGL()
protected void aggiornaControlliDataGL()
{
base.aggiornaControlliDataGL();
grView.PageSize = _righeDataGridAnagr;
grView.PageSize = righeDataGridAnagr;
}
protected override void OnInit(EventArgs e)
{
base.OnInit(e);
aggiornaControlliDataGL();
}
protected void grView_DataBound(object sender, EventArgs e)
+1 -1
View File
@@ -15,7 +15,7 @@ namespace XPS.WebUserControls
/// <summary>
/// classe gestione login e forzatura login
/// </summary>
public partial class mod_login : ApplicationUserControl
public partial class mod_login : SteamWare.UserControl
{
#region area protected/private
+1 -1
View File
@@ -12,7 +12,7 @@ using SteamWare;
namespace XPS.WebUserControls
{
public partial class mod_main_help : ApplicationUserControl
public partial class mod_main_help : SteamWare.UserControl
{
#region inizializzazione generica & utility
+165 -13
View File
@@ -13,7 +13,7 @@ using SteamWare;
namespace XPS.WebUserControls
{
public partial class mod_menuTop : ApplicationUserControl
public partial class mod_menuTop : SteamWare.UserControl
{
private string _titleString;
@@ -23,9 +23,48 @@ 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);
if (!Page.IsPostBack)
{
Page.Title = Request.Url.ToString();
// se ho cambiato pagina registro...)
if (devicesAuthProxy.pagPrecedente != titolo)
{
devicesAuthProxy.pagPrecedente = devicesAuthProxy.pagCorrente;
}
// salvo pagina corrente
devicesAuthProxy.pagCorrente = titolo;
}
// SOLO se la pagina NON E' "safe"...
if (memLayer.ML.confReadString("PageNoIndex").IndexOf(titolo) < 0)
{
bool userOk = checkUser();
bool pageOk = checkPageIsAuth();
// controllo se c'è utente in sessione..
if ((userOk))
{
// ora controllo pagina...
if (!pageOk)
{
if (devicesAuthProxy.stObj.isPageEnabled(devicesAuthProxy.pagPrecedente))
{
Response.Redirect(devicesAuthProxy.pagPrecedente);
}
else
{
Response.Redirect("Default");
}
}
}
else
{
// rimando pagina x registrazione devices
Response.Redirect("UserAdmin");
}
}
#if false
btnLogOut.Visible = user_std.UtSn.isForcedUser;
if (SteamWare.memLayer.ML.isInSessionObject("doUpdateNow"))
{
@@ -37,12 +76,131 @@ namespace XPS.WebUserControls
{
updateTreeMenu();
}
if (!Page.IsPostBack)
{
_titleString = SteamWare.memLayer.ML.StringSessionObj("_titleString");
}
#endif
}
/// <summary>
/// verifica che la pagina sia tra quelle autorizzate x l'utente
/// </summary>
/// <returns></returns>
private bool checkPageIsAuth()
{
bool allOk = false;
bool pageSafe = (memLayer.ML.confReadString("PageNoIndex").IndexOf(titolo) >= 0);
bool pageAuth = devicesAuthProxy.stObj.isPageEnabled(titolo);
allOk = (pageSafe || pageAuth);
return allOk;
}
/// <summary>
/// verifica presenza utente autorizzato in sessione
/// </summary>
private bool checkUser()
{
bool allOk = devicesAuthProxy.stObj.isAuth;
//if (!devicesAuthProxy.stObj.isAuth)
//{
// controllo cookie device...
allOk = checkAuthCookie();
if (!allOk)
{
ResetUser();
}
//}
return allOk;
}
/// <summary>
/// Restituisce cognome/nome da sessione...
/// </summary>
public string CognomeNome
{
get
{
string answ = "-";
try
{
answ = SteamWare.devicesAuthProxy.stObj.CognomeNome;
}
catch
{ }
return answ;
}
}
/// <summary>
/// verifica la presenza di un cookie VALIDO per autorizzare il device ed avvia utente...
/// </summary>
private bool checkAuthCookie()
{
bool answ = false;
try
{
HttpCookie cookie = Request.Cookies[devicesAuthProxy.AuthCookieName];
if (!(cookie == null || cookie.Value == ""))
{
// ricavo utente da cookie...
string userAgent = "";
string postazione_IP = "";
string devSecret = cookie.Value;
DS_Auth.AnagDevicesRow device = null;
// cerco il device...ogni dipendente può averne + di 1 registrato a suo nome...
string email = "";
try
{
device = devicesAuthProxy.stObj.taAnagDev.getByDeviceSecret(devSecret)[0];
email = device.USER_NAME;
}
catch
{ }
if (email != "")
{
// aggiorno descrizione (user agent) ed IP...
userAgent = Request.UserAgent;
postazione_IP = Request.UserHostAddress;
// controllo IP e DeviceDescription x eventuale update
if ((device.lastIPv4 != postazione_IP) || (device.Description != userAgent))
{
// salvo ultimo "contatto" del device aggiornando descrizione ed IP
devicesAuthProxy.stObj.taAnagDev.updateIP(device.IdxDevice, DateTime.Now, postazione_IP, userAgent);
}
// salvo in sessione utente
memLayer.ML.setSessionVal("email", email);
// avvio utente...
devicesAuthProxy.stObj.startUpUtente(email);
// salvo gruppo...
if (devicesAuthProxy.stObj.isAuth)
{
// se tutto ok
memLayer.ML.setSessionVal("Gruppo", devicesAuthProxy.stObj.rigaUtente.CodGruppo);
answ = true;
}
}
}
}
catch (Exception exc)
{
logger.lg.scriviLog(string.Format("Errore in checkAuthCookie:{0}{1}", Environment.NewLine, exc), tipoLog.EXCEPTION);
}
return answ;
}
private void ResetUser()
{
devicesAuthProxy.stObj.clearAllUserData();
// svuoto cookie...
memLayer.ML.setCookieVal(devicesAuthProxy.AuthCookieName, "");
memLayer.ML.emptyCookieVal(devicesAuthProxy.AuthCookieName);
}
protected void btnLogOut_Click(object sender, EventArgs e)
{
Session.Abandon();
Response.Redirect("forceUser.aspx");
#if false
Response.Redirect("forceUser.aspx");
#endif
ResetUser();
}
protected void btnUpdate_Click(object sender, EventArgs e)
{
@@ -86,16 +244,10 @@ namespace XPS.WebUserControls
eh_reqUpdateMenu(this, new EventArgs());
}
Response.Redirect(_paginaCorrente);
Response.Redirect(devicesAuthProxy.pagCorrente);
}
protected override void loadSessionData()
{
base.loadSessionData();
_titleString = SteamWare.memLayer.ML.StringSessionObj("_titleString");
}
protected override void bindControlli()
protected void bindControlli()
{
if (!Page.IsPostBack)
{
+1 -1
View File
@@ -12,7 +12,7 @@ using SteamWare;
namespace XPS.WebUserControls
{
public partial class mod_navPath : SteamWare.ApplicationUserControl
public partial class mod_navPath : SteamWare.UserControl
{
/// <summary>
/// link alla pagina precedente...
@@ -12,14 +12,20 @@ using SteamWare;
namespace XPS.WebUserControls
{
public partial class mod_pageTitleAndSearch : ApplicationUserControl
public partial class mod_pageTitleAndSearch : SteamWare.UserControl
{
#region area protected
protected string _titolo;
protected override void traduciObj()
protected override void OnInit(EventArgs e)
{
DataLayer_AnagGen.PermessiRow riga = (DataLayer_AnagGen.PermessiRow)user_std.UtSn.permessi.Select(string.Format("URL = '{0}'", _paginaCorrente))[0];
base.OnInit(e);
traduciObj();
}
protected string _titolo;
protected void traduciObj()
{
DataLayer_AnagGen.PermessiRow riga = (DataLayer_AnagGen.PermessiRow)user_std.UtSn.permessi.Select(string.Format("URL = '{0}'", devicesAuthProxy.pagCorrente))[0];
_titolo = riga.NOME;
lblTitolo.Text = traduci(_titolo);
}
@@ -12,7 +12,7 @@ using SteamWare;
namespace XPS.WebUserControls
{
public partial class mod_ricercaGenerica : ApplicationUserControl
public partial class mod_ricercaGenerica : SteamWare.UserControl
{
#region gestione eventi
@@ -12,7 +12,7 @@ using SteamWare;
namespace XPS.WebUserControls
{
public partial class mod_scadenziarioCommesse : ApplicationUserControl
public partial class mod_scadenziarioCommesse : SteamWare.UserControl
{
protected override void traduciObj()
{
@@ -13,7 +13,7 @@ using SteamWare;
namespace XPS.WebUserControls
{
[ValidationProperty("valore")]
public partial class mod_selettore_ajax : ApplicationUserControl
public partial class mod_selettore_ajax : SteamWare.UserControl
{
protected bool _chkVisibile = false;
+9 -5
View File
@@ -12,7 +12,7 @@ using SteamWare;
namespace XPS.WebUserControls
{
public partial class mod_vocabolario : ApplicationUserControl
public partial class mod_vocabolario : SteamWare.UserControl
{
#region gestione eventi
@@ -57,16 +57,20 @@ namespace XPS.WebUserControls
// aggiorno il vocabolario in memoria...
DataWrap.DW.resetVocabolario();
// riparto...
Response.Redirect(_paginaCorrente);
Response.Redirect(devicesAuthProxy.pagCorrente);
}
}
protected override void aggiornaControlliDataGL()
protected void aggiornaControlliDataGL()
{
base.aggiornaControlliDataGL();
grView.PageSize = _righeDataGridAnagr;
grView.PageSize = righeDataGridAnagr;
ods.DataBind();
}
protected override void OnInit(EventArgs e)
{
base.OnInit(e);
aggiornaControlliDataGL();
}
protected void grView_DataBound(object sender, EventArgs e)
{
+2 -22
View File
@@ -67,26 +67,6 @@ namespace XPS
Response.Redirect("UserAdmin");
}
}
#if false
// controllo cookie...
bool cookieLogin = false;
if (memLayer.ML.confReadBool("enableCookie"))
{
cookieLogin = authProxy.tryAuthByCookie(memLayer.ML.confReadString("AuthCookie"));
}
if (!cookieLogin)
{
// compongo stringa x sito auth
string authPage = "./unauthorized.aspx";
try
{
authPage = string.Format("{0}login.aspx?AuthCookie={1}&jumpPage={2}", memLayer.ML.confReadString("authSite"), memLayer.ML.confReadString("AuthCookie"), memLayer.ML.confReadString("currSite"));
}
catch
{ }
Response.Redirect(authPage);
}
#endif
// setto modalità login
mod_login1.modoLogin = SteamWare.loginMode.normale;
}
@@ -122,7 +102,7 @@ namespace XPS
//if (!devicesAuthProxy.stObj.isAuth)
//{
// controllo cookie device...
allOk = checkAuthCookieScheMe();
allOk = checkAuthCookie();
if (!allOk)
{
ResetUser();
@@ -150,7 +130,7 @@ namespace XPS
/// <summary>
/// verifica la presenza di un cookie VALIDO per autorizzare il device ed avvia utente...
/// </summary>
private bool checkAuthCookieScheMe()
private bool checkAuthCookie()
{
bool answ = false;
try