Egalware/WebSCR
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fatto refresh su landing page x non dover continuamente chiudere/riaprire pagine browser - dovrebeb tornare a pagina SENZA Jscript e quindi non "incastrarsi" di codice...

Browse Source
This commit is contained in:
Samuele E. Locatelli
2016-02-10 18:09:24 +01:00
parent 7f9acb69a2
commit 8d8b52cc41
15 changed files with 117 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.vs/WebSCR/v14/.suo
BIN
View File
Binary file not shown.
VersGen/WebSC.cs
+2 -2
View File
@@ -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")]
VersGen/WebSC.tt
+2 -2
View File
@@ -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")]
<#+
VersGen/bin/Release/VersGen.dll
BIN
View File
Binary file not shown.
VersGen/obj/Release/TempPE/WebSC.cs.dll
BIN
View File
Binary file not shown.
VersGen/obj/Release/VersGen.dll
BIN
View File
Binary file not shown.
WebSCR/Default.aspx.cs
+2 -1
View File
@@ -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");
}
}
}
WebSCR/LandingPage.aspx
+13
View File
@@ -0,0 +1,13 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/JQMob.Master" AutoEventWireup="true" CodeBehind="LandingPage.aspx.cs" Inherits="WebSCR.LandingPage" %>
<asp:Content ID="Content1" ContentPlaceHolderID="head" runat="server">
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder1" runat="server">
<div class="ui-grid-solo noShadows text-center">
<h1>PIANIFICATORE INTERVENTI</h1>
<div class="ui-grid-b ui-mini text-center">
scegliere la sezione operativa dal menù in basso scegliendo tra <br />
<h3>MAGAZZINO | UFFICI | SQUADRE</h3>
</div>
</div>
</asp:Content>
WebSCR/LandingPage.aspx.cs
+17
View File
@@ -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)
{
}
}
}
WebSCR/LandingPage.aspx.designer.cs
Generated
+17
View File
@@ -0,0 +1,17 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace WebSCR
{
public partial class LandingPage
{
}
}
WebSCR/WebSCR.csproj
+8
View File
@@ -360,6 +360,7 @@
<Content Include="images\LogoSteamware.png" />
<Content Include="Interventi.aspx" />
<Content Include="IntSquadre.aspx" />
<Content Include="LandingPage.aspx" />
<Content Include="Menu.aspx" />
<Content Include="OrdiniPerData.aspx" />
<Content Include="Pianificazione.aspx" />
@@ -501,6 +502,13 @@
<Compile Include="IntSquadre.aspx.designer.cs">
<DependentUpon>IntSquadre.aspx</DependentUpon>
</Compile>
<Compile Include="LandingPage.aspx.cs">
<DependentUpon>LandingPage.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="LandingPage.aspx.designer.cs">
<DependentUpon>LandingPage.aspx</DependentUpon>
</Compile>
<Compile Include="Menu.aspx.cs">
<DependentUpon>Menu.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
WebSCR/WebUserControls/mod_header.ascx
+1 -1
View File
@@ -1,5 +1,5 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_header.ascx.cs" Inherits="WebSCR.WebUserControls.mod_header" %>
<asp:Timer ID="Timer1" runat="server"></asp:Timer>
<asp:Timer ID="Timer1" runat="server" OnTick="Timer1_Tick"></asp:Timer>
<div style="background-color: <%: colorSquadraCurr %>; min-height: 2.6em;">
<div style="font-size: 1.1em; text-align: center; margin: auto;">
WSC - <%: titolo %>
WebSCR/WebUserControls/mod_header.ascx.cs
+37 -4
View File
@@ -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;
}
}
/// <summary>
/// caricamento pagina
/// </summary>
@@ -79,6 +79,12 @@ namespace WebSCR.WebUserControls
/// <param name="e"></param>
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;
}
}
}
}
WebSCR/WebUserControls/mod_pianificazione.ascx.cs
+18 -3
View File
@@ -475,10 +475,13 @@ namespace WebSCR.WebUserControls
/// <param name="e"></param>
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);
}
}
}
}
WebSCR/bin/WebSCR.dll
BIN
View File
Binary file not shown.