diff --git a/.vs/WebSCR/v14/.suo b/.vs/WebSCR/v14/.suo index 5e0bf9f..07ee41e 100644 Binary files a/.vs/WebSCR/v14/.suo and b/.vs/WebSCR/v14/.suo differ diff --git a/VersGen/WebSC.cs b/VersGen/WebSC.cs index 43d1881..75df19a 100644 --- a/VersGen/WebSC.cs +++ b/VersGen/WebSC.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("2.0.099.314")] -[assembly: AssemblyFileVersion("2.0.099.314")] +[assembly: AssemblyVersion("2.0.101.315")] +[assembly: AssemblyFileVersion("2.0.101.315")] [assembly: AssemblyCopyright("Steamware © 2015-2016")] [assembly: AssemblyCompany("Steamware")] diff --git a/VersGen/WebSC.tt b/VersGen/WebSC.tt index 2b7ef6b..cb67160 100644 --- a/VersGen/WebSC.tt +++ b/VersGen/WebSC.tt @@ -6,8 +6,8 @@ using System.Reflection; -[assembly: AssemblyVersion("2.0.099.<#= this.RevisionNumber #>")] -[assembly: AssemblyFileVersion("2.0.099.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("2.0.101.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("2.0.101.<#= this.RevisionNumber #>")] [assembly: AssemblyCopyright("Steamware © 2015-<#= DateTime.Now.Year #>")] [assembly: AssemblyCompany("Steamware")] <#+ diff --git a/VersGen/bin/Release/VersGen.dll b/VersGen/bin/Release/VersGen.dll index 9655324..53e882e 100644 Binary files a/VersGen/bin/Release/VersGen.dll and b/VersGen/bin/Release/VersGen.dll differ diff --git a/VersGen/obj/Release/TempPE/WebSC.cs.dll b/VersGen/obj/Release/TempPE/WebSC.cs.dll index 883ab7f..b172d73 100644 Binary files a/VersGen/obj/Release/TempPE/WebSC.cs.dll and b/VersGen/obj/Release/TempPE/WebSC.cs.dll differ diff --git a/VersGen/obj/Release/VersGen.dll b/VersGen/obj/Release/VersGen.dll index 9655324..53e882e 100644 Binary files a/VersGen/obj/Release/VersGen.dll and b/VersGen/obj/Release/VersGen.dll differ diff --git a/WebSCR/Default.aspx.cs b/WebSCR/Default.aspx.cs index b800842..a8b9ec8 100644 --- a/WebSCR/Default.aspx.cs +++ b/WebSCR/Default.aspx.cs @@ -14,7 +14,8 @@ namespace WebSCR { // resetto i dati utente all'accesso alla pagina default... devicesAuthProxy.stObj.clearAllUserData(); - Response.Redirect("Pianificazione"); + Response.Redirect("LandingPage"); + //Response.Redirect("Pianificazione"); } } } \ No newline at end of file diff --git a/WebSCR/LandingPage.aspx b/WebSCR/LandingPage.aspx new file mode 100644 index 0000000..e732e7c --- /dev/null +++ b/WebSCR/LandingPage.aspx @@ -0,0 +1,13 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/JQMob.Master" AutoEventWireup="true" CodeBehind="LandingPage.aspx.cs" Inherits="WebSCR.LandingPage" %> + + + + +
+

PIANIFICATORE INTERVENTI

+
+ scegliere la sezione operativa dal menù in basso scegliendo tra
+

MAGAZZINO | UFFICI | SQUADRE

+
+
+ diff --git a/WebSCR/LandingPage.aspx.cs b/WebSCR/LandingPage.aspx.cs new file mode 100644 index 0000000..558a3ea --- /dev/null +++ b/WebSCR/LandingPage.aspx.cs @@ -0,0 +1,17 @@ +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 LandingPage : System.Web.UI.Page + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/WebSCR/LandingPage.aspx.designer.cs b/WebSCR/LandingPage.aspx.designer.cs new file mode 100644 index 0000000..3600a54 --- /dev/null +++ b/WebSCR/LandingPage.aspx.designer.cs @@ -0,0 +1,17 @@ +//------------------------------------------------------------------------------ +// +// 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 LandingPage + { + } +} diff --git a/WebSCR/WebSCR.csproj b/WebSCR/WebSCR.csproj index 7eeaa02..d443222 100644 --- a/WebSCR/WebSCR.csproj +++ b/WebSCR/WebSCR.csproj @@ -360,6 +360,7 @@ + @@ -501,6 +502,13 @@ IntSquadre.aspx + + LandingPage.aspx + ASPXCodeBehind + + + LandingPage.aspx + Menu.aspx ASPXCodeBehind diff --git a/WebSCR/WebUserControls/mod_header.ascx b/WebSCR/WebUserControls/mod_header.ascx index 8e1f741..a47c355 100644 --- a/WebSCR/WebUserControls/mod_header.ascx +++ b/WebSCR/WebUserControls/mod_header.ascx @@ -1,5 +1,5 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_header.ascx.cs" Inherits="WebSCR.WebUserControls.mod_header" %> - +
WSC - <%: titolo %> diff --git a/WebSCR/WebUserControls/mod_header.ascx.cs b/WebSCR/WebUserControls/mod_header.ascx.cs index eb6c0b2..cacf732 100644 --- a/WebSCR/WebUserControls/mod_header.ascx.cs +++ b/WebSCR/WebUserControls/mod_header.ascx.cs @@ -49,7 +49,7 @@ namespace WebSCR.WebUserControls get { string answ = "-"; - if (memLayer.ML.getCookieVal("SquadraCurr")!="") + if (memLayer.ML.getCookieVal("SquadraCurr") != "") { answ = memLayer.ML.getCookieVal("SquadraCurr"); } @@ -71,7 +71,7 @@ namespace WebSCR.WebUserControls return answ; } } - + /// /// caricamento pagina /// @@ -79,6 +79,12 @@ namespace WebSCR.WebUserControls /// protected void Page_Load(object sender, EventArgs e) { + // verifico se è cambiata pagina, nel qual caso incremento countdown... + if (devicesAuthProxy.pagCorrente != devicesAuthProxy.pagPrecedente) + { + countdown = 5; + devicesAuthProxy.pagPrecedente = devicesAuthProxy.pagCorrente; + } if (!memLayer.ML.isInSessionObject("USER_NAME")) { divHeaderMenu.Visible = false; @@ -134,12 +140,12 @@ namespace WebSCR.WebUserControls ulSquadra.Visible = false; ulMagazzino.Visible = true; } - else if(devicesAuthProxy.pagCorrente == "Squadra" || devicesAuthProxy.pagCorrente == "IntSquadre" || devicesAuthProxy.pagCorrente == "Menu") + else if (devicesAuthProxy.pagCorrente == "Squadra" || devicesAuthProxy.pagCorrente == "IntSquadre" || devicesAuthProxy.pagCorrente == "Menu") { ulStd.Visible = false; ulSquadra.Visible = true; ulMagazzino.Visible = false; - } + } else { ulStd.Visible = true; @@ -285,5 +291,32 @@ namespace WebSCR.WebUserControls #endif return answ; } + + protected int countdown + { + get + { + return memLayer.ML.IntSessionObj("countdownRedirectDefault"); + } + set + { + memLayer.ML.setSessionVal("countdownRedirectDefault", value); + } + } + + protected void Timer1_Tick(object sender, EventArgs e) + { + // verifico contatore prima di rimandare in pagina default... + if (countdown < 1) + { + // rimando a pagina default? + Response.Redirect("Default"); + } + else + { + countdown = countdown - 1; + + } + } } } \ No newline at end of file diff --git a/WebSCR/WebUserControls/mod_pianificazione.ascx.cs b/WebSCR/WebUserControls/mod_pianificazione.ascx.cs index 98382ee..5e7a79e 100644 --- a/WebSCR/WebUserControls/mod_pianificazione.ascx.cs +++ b/WebSCR/WebUserControls/mod_pianificazione.ascx.cs @@ -475,10 +475,13 @@ namespace WebSCR.WebUserControls /// protected void txtMatrOp_TextChanged(object sender, EventArgs e) { - if (txtMatrOp.Text.Trim() != "") + // riporto countdown a 5... COMUNQUE... + countdown = 5; + string newMatr = txtMatrOp.Text.Trim(); + if (newMatr != "") { - memLayer.ML.setSessionVal("matrOp", txtMatrOp.Text.Trim()); - errorMess = "Selezionato Operatore"; + memLayer.ML.setSessionVal("matrOp", newMatr); + errorMess = string.Format("Selezionato Operatore {0}", newMatr); lblWarning.Text = errorMess; } else @@ -499,5 +502,17 @@ namespace WebSCR.WebUserControls } + + protected int countdown + { + get + { + return memLayer.ML.IntSessionObj("countdownRedirectDefault"); + } + set + { + memLayer.ML.setSessionVal("countdownRedirectDefault", value); + } + } } } \ No newline at end of file diff --git a/WebSCR/bin/WebSCR.dll b/WebSCR/bin/WebSCR.dll index 6436609..bea001f 100644 Binary files a/WebSCR/bin/WebSCR.dll and b/WebSCR/bin/WebSCR.dll differ