diff --git a/WebSCR.v11.suo b/WebSCR.v11.suo index 4c142cd..08c0b90 100644 Binary files a/WebSCR.v11.suo and b/WebSCR.v11.suo differ diff --git a/WebSCR/WebUserControls/mod_elencoClienti.ascx b/WebSCR/WebUserControls/mod_elencoClienti.ascx index ce1b1e2..a609ba7 100644 --- a/WebSCR/WebUserControls/mod_elencoClienti.ascx +++ b/WebSCR/WebUserControls/mod_elencoClienti.ascx @@ -37,7 +37,10 @@ - +
+ + +
diff --git a/WebSCR/WebUserControls/mod_elencoClienti.ascx.cs b/WebSCR/WebUserControls/mod_elencoClienti.ascx.cs index a81bf74..f1f4764 100644 --- a/WebSCR/WebUserControls/mod_elencoClienti.ascx.cs +++ b/WebSCR/WebUserControls/mod_elencoClienti.ascx.cs @@ -48,8 +48,6 @@ namespace WebSCR.WebUserControls memLayer.ML.setSessionVal("CodCliente", CodCliente); DS_Applicazione.AnagClientiRow riga = DtProxy.man.taAC.getByKey(CodCliente)[0]; memLayer.ML.setSessionVal("Cliente", string.Format("{0} {1} ({2:dd/MM/yyyy})", riga.Cognome, riga.Nome, riga.CodFis)); - // mando a dettaglio con filtro x cliente! - Response.Redirect(string.Format("Interventi?FiltroCliente=1&ShowState=0&CodCliente={0}", grView.SelectedDataKey["CodCliente"])); } catch(Exception exc) @@ -57,14 +55,16 @@ namespace WebSCR.WebUserControls logger.lg.scriviLog(string.Format("Errore in rimando clienti --> interventi: {0}{1}", Environment.NewLine, exc)); } - // no edit!!! -#if false - if (lastCmd == "edit") + if (lastCmd == "add") { - // richiamo pagina con edit del record richiesto - Response.Redirect(string.Format("ClientiEdit?CodCliente={0}", grView.SelectedDataKey["CodCliente"])); - } -#endif + // mando a AGGIUNTA intervento cliente! + Response.Redirect(string.Format("Pianificazione?CodCliente={0}", grView.SelectedDataKey["CodCliente"])); + } + else + { + // mando a dettaglio con filtro x cliente! + Response.Redirect(string.Format("Interventi?FiltroCliente=1&ShowState=0&CodCliente={0}", grView.SelectedDataKey["CodCliente"])); + } } protected void grView_RowCommand(object sender, GridViewCommandEventArgs e) diff --git a/WebSCR/WebUserControls/mod_footer.ascx.cs b/WebSCR/WebUserControls/mod_footer.ascx.cs index dd5c529..5764d19 100644 --- a/WebSCR/WebUserControls/mod_footer.ascx.cs +++ b/WebSCR/WebUserControls/mod_footer.ascx.cs @@ -26,7 +26,7 @@ namespace WebSCR.WebUserControls { string answ = ""; string nome = nomeElem.ToString(); - if (Request.Url.ToString().Contains(nome)) answ = "ui-btn-active"; + if (Request.Url.ToString().ToLower().Contains(nome.ToLower())) answ = "ui-btn-active"; // se E' Dettaglio e non c'รจ cod Impegno metto disabled... if (nome.Contains("Dettaglio")) { diff --git a/WebSCR/bin/SteamWare.dll b/WebSCR/bin/SteamWare.dll index aed2725..7a98f47 100644 Binary files a/WebSCR/bin/SteamWare.dll and b/WebSCR/bin/SteamWare.dll differ diff --git a/WebSCR/bin/WebSCR.dll b/WebSCR/bin/WebSCR.dll index 5067617..19faa47 100644 Binary files a/WebSCR/bin/WebSCR.dll and b/WebSCR/bin/WebSCR.dll differ diff --git a/WebSCR/bin/WebSCR_data.dll b/WebSCR/bin/WebSCR_data.dll index 2b8c634..20d1f57 100644 Binary files a/WebSCR/bin/WebSCR_data.dll and b/WebSCR/bin/WebSCR_data.dll differ diff --git a/WebSCR/logs/20150427.txt b/WebSCR/logs/20150427.txt index b72a1e9..03b4885 100644 --- a/WebSCR/logs/20150427.txt +++ b/WebSCR/logs/20150427.txt @@ -79,3 +79,48 @@ System.Threading.ThreadAbortException: Thread interrotto. in System.Web.HttpResponse.Redirect(String url, Boolean endResponse, Boolean permanent) in System.Web.HttpResponse.Redirect(String url) in WebSCR.WebUserControls.mod_elencoClienti.grView_SelectedIndexChanged(Object sender, EventArgs e) in c:\Users\samuele\Documents\Visual Studio 2012\Projects\WebSCR\WebSCR\WebUserControls\mod_elencoClienti.ascx.cs:riga 52 +16:17:03 5320 Errore in rimando clienti --> interventi: +System.Threading.ThreadAbortException: Thread interrotto. + in System.Threading.Thread.AbortInternal() + in System.Threading.Thread.Abort(Object stateInfo) + in System.Web.HttpResponse.AbortCurrentThread() + in System.Web.HttpResponse.End() + in System.Web.HttpResponse.Redirect(String url, Boolean endResponse, Boolean permanent) + in System.Web.HttpResponse.Redirect(String url) + in WebSCR.WebUserControls.mod_elencoClienti.grView_SelectedIndexChanged(Object sender, EventArgs e) in c:\Users\samuele\Documents\Visual Studio 2012\Projects\WebSCR\WebSCR\WebUserControls\mod_elencoClienti.ascx.cs:riga 52 +16:17:09 3534 Errore in rimando clienti --> interventi: +System.Threading.ThreadAbortException: Thread interrotto. + in System.Threading.Thread.AbortInternal() + in System.Threading.Thread.Abort(Object stateInfo) + in System.Web.HttpResponse.AbortCurrentThread() + in System.Web.HttpResponse.End() + in System.Web.HttpResponse.Redirect(String url, Boolean endResponse, Boolean permanent) + in System.Web.HttpResponse.Redirect(String url) + in WebSCR.WebUserControls.mod_elencoClienti.grView_SelectedIndexChanged(Object sender, EventArgs e) in c:\Users\samuele\Documents\Visual Studio 2012\Projects\WebSCR\WebSCR\WebUserControls\mod_elencoClienti.ascx.cs:riga 52 +16:17:21 1752 Errore in rimando clienti --> interventi: +System.Threading.ThreadAbortException: Thread interrotto. + in System.Threading.Thread.AbortInternal() + in System.Threading.Thread.Abort(Object stateInfo) + in System.Web.HttpResponse.AbortCurrentThread() + in System.Web.HttpResponse.End() + in System.Web.HttpResponse.Redirect(String url, Boolean endResponse, Boolean permanent) + in System.Web.HttpResponse.Redirect(String url) + in WebSCR.WebUserControls.mod_elencoClienti.grView_SelectedIndexChanged(Object sender, EventArgs e) in c:\Users\samuele\Documents\Visual Studio 2012\Projects\WebSCR\WebSCR\WebUserControls\mod_elencoClienti.ascx.cs:riga 52 +16:23:56 7457 Errore in rimando clienti --> interventi: +System.Threading.ThreadAbortException: Thread interrotto. + in System.Threading.Thread.AbortInternal() + in System.Threading.Thread.Abort(Object stateInfo) + in System.Web.HttpResponse.AbortCurrentThread() + in System.Web.HttpResponse.End() + in System.Web.HttpResponse.Redirect(String url, Boolean endResponse, Boolean permanent) + in System.Web.HttpResponse.Redirect(String url) + in WebSCR.WebUserControls.mod_elencoClienti.grView_SelectedIndexChanged(Object sender, EventArgs e) in c:\Users\samuele\Documents\Visual Studio 2012\Projects\WebSCR\WebSCR\WebUserControls\mod_elencoClienti.ascx.cs:riga 52 +16:23:59 6829 Errore in rimando clienti --> interventi: +System.Threading.ThreadAbortException: Thread interrotto. + in System.Threading.Thread.AbortInternal() + in System.Threading.Thread.Abort(Object stateInfo) + in System.Web.HttpResponse.AbortCurrentThread() + in System.Web.HttpResponse.End() + in System.Web.HttpResponse.Redirect(String url, Boolean endResponse, Boolean permanent) + in System.Web.HttpResponse.Redirect(String url) + in WebSCR.WebUserControls.mod_elencoClienti.grView_SelectedIndexChanged(Object sender, EventArgs e) in c:\Users\samuele\Documents\Visual Studio 2012\Projects\WebSCR\WebSCR\WebUserControls\mod_elencoClienti.ascx.cs:riga 52 diff --git a/WebSCR/obj/Debug/WebSCR.csprojResolveAssemblyReference.cache b/WebSCR/obj/Debug/WebSCR.csprojResolveAssemblyReference.cache index 8a2d1a1..53daf22 100644 Binary files a/WebSCR/obj/Debug/WebSCR.csprojResolveAssemblyReference.cache and b/WebSCR/obj/Debug/WebSCR.csprojResolveAssemblyReference.cache differ diff --git a/WebSCR/obj/Debug/WebSCR.dll b/WebSCR/obj/Debug/WebSCR.dll index 5067617..19faa47 100644 Binary files a/WebSCR/obj/Debug/WebSCR.dll and b/WebSCR/obj/Debug/WebSCR.dll differ diff --git a/WebSCR_data/bin/Debug/SteamWare.dll b/WebSCR_data/bin/Debug/SteamWare.dll index aed2725..7a98f47 100644 Binary files a/WebSCR_data/bin/Debug/SteamWare.dll and b/WebSCR_data/bin/Debug/SteamWare.dll differ diff --git a/WebSCR_data/bin/Debug/WebSCR_data.dll b/WebSCR_data/bin/Debug/WebSCR_data.dll index 2b8c634..20d1f57 100644 Binary files a/WebSCR_data/bin/Debug/WebSCR_data.dll and b/WebSCR_data/bin/Debug/WebSCR_data.dll differ diff --git a/WebSCR_data/obj/Debug/WebSCR_data.csprojResolveAssemblyReference.cache b/WebSCR_data/obj/Debug/WebSCR_data.csprojResolveAssemblyReference.cache index 660f37b..1363266 100644 Binary files a/WebSCR_data/obj/Debug/WebSCR_data.csprojResolveAssemblyReference.cache and b/WebSCR_data/obj/Debug/WebSCR_data.csprojResolveAssemblyReference.cache differ diff --git a/WebSCR_data/obj/Debug/WebSCR_data.dll b/WebSCR_data/obj/Debug/WebSCR_data.dll index 2b8c634..20d1f57 100644 Binary files a/WebSCR_data/obj/Debug/WebSCR_data.dll and b/WebSCR_data/obj/Debug/WebSCR_data.dll differ