diff --git a/VersGen/bin/Debug/VersGen.dll b/VersGen/bin/Debug/VersGen.dll index 03fcdd9..0f11291 100644 Binary files a/VersGen/bin/Debug/VersGen.dll and b/VersGen/bin/Debug/VersGen.dll differ diff --git a/VersGen/obj/Debug/TempPE/WebSC.cs.dll b/VersGen/obj/Debug/TempPE/WebSC.cs.dll index 808f90b..ca34596 100644 Binary files a/VersGen/obj/Debug/TempPE/WebSC.cs.dll and b/VersGen/obj/Debug/TempPE/WebSC.cs.dll differ diff --git a/VersGen/obj/Debug/VersGen.dll b/VersGen/obj/Debug/VersGen.dll index 03fcdd9..0f11291 100644 Binary files a/VersGen/obj/Debug/VersGen.dll and b/VersGen/obj/Debug/VersGen.dll differ diff --git a/WebSCR.v11.suo b/WebSCR.v11.suo index 8bf132a..a416ccf 100644 Binary files a/WebSCR.v11.suo and b/WebSCR.v11.suo differ diff --git a/WebSCR/ResetSquadra.aspx b/WebSCR/ResetSquadra.aspx new file mode 100644 index 0000000..aecbfb4 --- /dev/null +++ b/WebSCR/ResetSquadra.aspx @@ -0,0 +1,16 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ResetSquadra.aspx.cs" Inherits="WebSCR.ResetSquadra" %> + + + + + + + + +
+
+ +
+
+ + diff --git a/WebSCR/ResetSquadra.aspx.cs b/WebSCR/ResetSquadra.aspx.cs new file mode 100644 index 0000000..66cb3c0 --- /dev/null +++ b/WebSCR/ResetSquadra.aspx.cs @@ -0,0 +1,29 @@ +using SteamWare; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace WebSCR +{ + public partial class ResetSquadra : System.Web.UI.Page + { + protected void Page_Load(object sender, EventArgs e) + { + // resetto dati squadra e rimando a squadra! + memLayer.ML.emptyCookieVal("colorSquadraCurr"); + memLayer.ML.emptyCookieVal("SquadraCurr"); + memLayer.ML.emptyCookieVal("CodSquadra"); + memLayer.ML.emptyCookieVal("DataRif"); + memLayer.ML.emptyCookieVal("NumGg"); + memLayer.ML.emptyCookieVal("Data"); + memLayer.ML.emptyCookieVal("IdxImpegno"); + memLayer.ML.emptyCookieVal("CodCliente"); + memLayer.ML.emptyCookieVal("Indir"); + memLayer.ML.emptySessionVal("Cliente"); + Response.Redirect("Squadra"); + } + } +} \ No newline at end of file diff --git a/WebSCR/ResetSquadra.aspx.designer.cs b/WebSCR/ResetSquadra.aspx.designer.cs new file mode 100644 index 0000000..ed52f10 --- /dev/null +++ b/WebSCR/ResetSquadra.aspx.designer.cs @@ -0,0 +1,26 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace WebSCR +{ + + + public partial class ResetSquadra + { + + /// + /// form1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + } +} diff --git a/WebSCR/WebSCR.csproj b/WebSCR/WebSCR.csproj index 7e6e476..eceed2c 100644 --- a/WebSCR/WebSCR.csproj +++ b/WebSCR/WebSCR.csproj @@ -335,6 +335,7 @@ + @@ -444,6 +445,13 @@ NuovoImpegno.aspx + + ResetSquadra.aspx + ASPXCodeBehind + + + ResetSquadra.aspx + Setup.aspx ASPXCodeBehind diff --git a/WebSCR/WebUserControls/mod_footer.ascx b/WebSCR/WebUserControls/mod_footer.ascx index 3a5e617..75d0173 100644 --- a/WebSCR/WebUserControls/mod_footer.ascx +++ b/WebSCR/WebUserControls/mod_footer.ascx @@ -1,10 +1,15 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_footer.ascx.cs" Inherits="WebSCR.WebUserControls.mod_footer" %> + + \ No newline at end of file diff --git a/WebSCR/WebUserControls/mod_footer.ascx.cs b/WebSCR/WebUserControls/mod_footer.ascx.cs index d5670d8..38c553e 100644 --- a/WebSCR/WebUserControls/mod_footer.ascx.cs +++ b/WebSCR/WebUserControls/mod_footer.ascx.cs @@ -16,6 +16,14 @@ namespace WebSCR.WebUserControls { divFooterMenu.Visible = false; } + bool showMenuSquadra = false; + // in base alla pagina corrente decido cosa mostrare in footer... + if (devicesAuthProxy.pagCorrente == "Squadra") + { + showMenuSquadra = true; + } + ulStd.Visible = !showMenuSquadra; + ulSquadra.Visible = showMenuSquadra; } /// /// restituisce stato active se pagina corrente... diff --git a/WebSCR/WebUserControls/mod_footer.ascx.designer.cs b/WebSCR/WebUserControls/mod_footer.ascx.designer.cs index 661c1df..f29ac73 100644 --- a/WebSCR/WebUserControls/mod_footer.ascx.designer.cs +++ b/WebSCR/WebUserControls/mod_footer.ascx.designer.cs @@ -20,5 +20,23 @@ namespace WebSCR.WebUserControls { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.HtmlControls.HtmlGenericControl divFooterMenu; + + /// + /// ulStd control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl ulStd; + + /// + /// ulSquadra control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl ulSquadra; } } diff --git a/WebSCR/WebUserControls/mod_header.ascx b/WebSCR/WebUserControls/mod_header.ascx index 70334de..e878505 100644 --- a/WebSCR/WebUserControls/mod_header.ascx +++ b/WebSCR/WebUserControls/mod_header.ascx @@ -6,8 +6,8 @@
- - User Admin + <%----%> +  
diff --git a/WebSCR/WebUserControls/mod_header.ascx.cs b/WebSCR/WebUserControls/mod_header.ascx.cs index fdae356..c77f850 100644 --- a/WebSCR/WebUserControls/mod_header.ascx.cs +++ b/WebSCR/WebUserControls/mod_header.ascx.cs @@ -129,7 +129,9 @@ namespace WebSCR.WebUserControls // se c'è e non è expired showSel = false; } - lbtResetSquadra.Visible = !showSel; +#if false + lbtResetSquadra.Visible = !showSel; +#endif } /// /// verifica che la pagina sia tra quelle autorizzate x l'utente @@ -244,6 +246,7 @@ namespace WebSCR.WebUserControls memLayer.ML.setCookieVal(memLayer.ML.confReadString("AuthCookieName"), ""); memLayer.ML.emptyCookieVal(memLayer.ML.confReadString("AuthCookieName")); } +#if false /// /// in caso di richiesta reset elimina cookie delal squadra selezionata /// @@ -262,6 +265,7 @@ namespace WebSCR.WebUserControls memLayer.ML.emptyCookieVal("Indir"); memLayer.ML.emptySessionVal("Cliente"); Response.Redirect(devicesAuthProxy.pagCorrente); - } + } +#endif } } \ No newline at end of file diff --git a/WebSCR/WebUserControls/mod_header.ascx.designer.cs b/WebSCR/WebUserControls/mod_header.ascx.designer.cs index 078d05f..6ce35d2 100644 --- a/WebSCR/WebUserControls/mod_header.ascx.designer.cs +++ b/WebSCR/WebUserControls/mod_header.ascx.designer.cs @@ -29,14 +29,5 @@ namespace WebSCR.WebUserControls { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Label lblVers; - - /// - /// lbtResetSquadra control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.LinkButton lbtResetSquadra; } } diff --git a/WebSCR/bin/SteamWare.dll b/WebSCR/bin/SteamWare.dll index ba4b6ba..c6a7daf 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 8523865..a09ba4c 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 5a2aac6..809ed75 100644 Binary files a/WebSCR/bin/WebSCR_data.dll and b/WebSCR/bin/WebSCR_data.dll differ diff --git a/WebSCR/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/WebSCR/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index fde4aff..9d9482e 100644 Binary files a/WebSCR/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/WebSCR/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/WebSCR/obj/Debug/WebSCR.csprojResolveAssemblyReference.cache b/WebSCR/obj/Debug/WebSCR.csprojResolveAssemblyReference.cache index a2c8a1e..c18e74a 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 e84f8d6..a09ba4c 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 f3b4304..c6a7daf 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 429b5e7..809ed75 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/DesignTimeResolveAssemblyReferencesInput.cache b/WebSCR_data/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index d893c05..711333a 100644 Binary files a/WebSCR_data/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/WebSCR_data/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/WebSCR_data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll b/WebSCR_data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll index 8f20893..f0f2262 100644 Binary files a/WebSCR_data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll and b/WebSCR_data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll differ diff --git a/WebSCR_data/obj/Debug/WebSCR_data.csprojResolveAssemblyReference.cache b/WebSCR_data/obj/Debug/WebSCR_data.csprojResolveAssemblyReference.cache index b06aba2..92eabc8 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 429b5e7..809ed75 100644 Binary files a/WebSCR_data/obj/Debug/WebSCR_data.dll and b/WebSCR_data/obj/Debug/WebSCR_data.dll differ