aggiunto primo set pagine x gestione programma

This commit is contained in:
Samuele E. Locatelli
2015-04-17 10:47:00 +02:00
parent ad2a6302b9
commit fa1c824629
29 changed files with 2412 additions and 23 deletions
BIN
View File
Binary file not shown.
+1 -1
View File
@@ -14,7 +14,7 @@ namespace WebSCR
{
// resetto i dati utente all'accesso alla pagina default...
devicesAuthProxy.stObj.clearAllUserData();
Response.Redirect("ElencoImpegni");
Response.Redirect("Pianificazione");
}
}
}
@@ -1,4 +1,4 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/JQMob.Master" AutoEventWireup="true" CodeBehind="ElencoImpegni.aspx.cs" Inherits="WebSCR.ElencoImpegni" %>
<%@ Page Title="" Language="C#" MasterPageFile="~/JQMob.Master" AutoEventWireup="true" CodeBehind="Dettaglio.aspx.cs" Inherits="WebSCR.Dettaglio" %>
<asp:Content ID="Content1" ContentPlaceHolderID="head" runat="server">
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder1" runat="server">
@@ -7,7 +7,7 @@ using System.Web.UI.WebControls;
namespace WebSCR
{
public partial class ElencoImpegni : System.Web.UI.Page
public partial class Dettaglio : System.Web.UI.Page
{
protected void Page_Load(object sender, EventArgs e)
{
@@ -11,7 +11,7 @@ namespace WebSCR
{
public partial class ElencoImpegni
public partial class Dettaglio
{
}
}
+5
View File
@@ -0,0 +1,5 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/JQMob.Master" AutoEventWireup="true" CodeBehind="InCorso.aspx.cs" Inherits="WebSCR.InCorso" %>
<asp:Content ID="Content1" ContentPlaceHolderID="head" runat="server">
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder1" runat="server">
</asp:Content>
+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 InCorso : System.Web.UI.Page
{
protected void Page_Load(object sender, EventArgs e)
{
}
}
}
+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 InCorso
{
}
}
+7
View File
@@ -0,0 +1,7 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/JQMob.Master" AutoEventWireup="true" CodeBehind="Pianificazione.aspx.cs" Inherits="WebSCR.Pianificazione" %>
<asp:Content ID="Content1" ContentPlaceHolderID="head" runat="server">
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder1" runat="server">
<p>
Pianificazione</p>
</asp:Content>
+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 Pianificazione : System.Web.UI.Page
{
protected void Page_Load(object sender, EventArgs e)
{
}
}
}
+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 Pianificazione
{
}
}
+5
View File
@@ -0,0 +1,5 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/JQMob.Master" AutoEventWireup="true" CodeBehind="Setup.aspx.cs" Inherits="WebSCR.Setup" %>
<asp:Content ID="Content1" ContentPlaceHolderID="head" runat="server">
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder1" runat="server">
</asp:Content>
+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 Setup : System.Web.UI.Page
{
protected void Page_Load(object sender, EventArgs e)
{
}
}
}
+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 Setup
{
}
}
+29 -5
View File
@@ -318,7 +318,9 @@
<Content Include="Content\jquery.mobile.theme-1.4.5.css" />
<Content Include="Content\jquery.mobile.theme-1.4.5.min.css" />
<Content Include="Default.aspx" />
<Content Include="ElencoImpegni.aspx" />
<Content Include="Dettaglio.aspx" />
<Content Include="InCorso.aspx" />
<Content Include="Pianificazione.aspx" />
<Content Include="fonts\fontawesome-webfont.svg" />
<Content Include="Global.asax" />
<Content Include="jumper.aspx" />
@@ -332,6 +334,7 @@
<Content Include="Content\WebSCR.less" />
<Content Include="Content\Style.less" />
<Content Include="Scripts\jSteamware.js" />
<Content Include="Setup.aspx" />
<Content Include="Squadre.aspx" />
<Content Include="UserAdmin.aspx" />
<Content Include="WebUserControls\mod_elencoRichResetUtenti.ascx" />
@@ -362,12 +365,26 @@
<Compile Include="Default.aspx.designer.cs">
<DependentUpon>Default.aspx</DependentUpon>
</Compile>
<Compile Include="ElencoImpegni.aspx.cs">
<DependentUpon>ElencoImpegni.aspx</DependentUpon>
<Compile Include="Dettaglio.aspx.cs">
<DependentUpon>Dettaglio.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="ElencoImpegni.aspx.designer.cs">
<DependentUpon>ElencoImpegni.aspx</DependentUpon>
<Compile Include="Dettaglio.aspx.designer.cs">
<DependentUpon>Dettaglio.aspx</DependentUpon>
</Compile>
<Compile Include="InCorso.aspx.cs">
<DependentUpon>InCorso.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="InCorso.aspx.designer.cs">
<DependentUpon>InCorso.aspx</DependentUpon>
</Compile>
<Compile Include="Pianificazione.aspx.cs">
<DependentUpon>Pianificazione.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Pianificazione.aspx.designer.cs">
<DependentUpon>Pianificazione.aspx</DependentUpon>
</Compile>
<Compile Include="Global.asax.cs">
<DependentUpon>Global.asax</DependentUpon>
@@ -394,6 +411,13 @@
<DependentUpon>NuovoImpegno.aspx</DependentUpon>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Setup.aspx.cs">
<DependentUpon>Setup.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Setup.aspx.designer.cs">
<DependentUpon>Setup.aspx</DependentUpon>
</Compile>
<Compile Include="Site.Mobile.Master.cs">
<DependentUpon>Site.Mobile.Master</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
+5 -3
View File
@@ -1,8 +1,10 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_footer.ascx.cs" Inherits="WebSCR.WebUserControls.mod_footer" %>
<div id="divFooterMenu" runat="server" data-role="navbar">
<ul>
<li><a href="ElencoImpegni" data-icon="grid" class='<%: liClass("ElencoImpegni") %>'>ElencoImpegni</a></li>
<li><a href="Visite" data-icon="star" class='<%: liClass("Visite") %>'>Visite</a></li>
<li><a href="Attivita" data-icon="gear" class='<%: liClass("Attivita") %>'>Files</a></li>
<li><a href="InCorso" data-icon="star" class='<%: liClass("InCorso") %>'>In Corso</a></li>
<li><a href="Pianificazione" data-icon="grid" class='<%: liClass("Pianificazione") %>'>Pianificazione</a></li>
<li><a href="Dettaglio" data-icon="gear" class='<%: liClass("Dettaglio") %>'>Dettaglio</a></li>
<li><a href="Setup" data-icon="gear" class='<%: liClass("Setup") %>'>Setup</a></li>
<%--<li><a href="Attivita" data-icon="gear" class='<%: liClass("Files") %>'>Files</a></li>--%>
</ul>
</div>
+4 -4
View File
@@ -27,10 +27,10 @@ namespace WebSCR.WebUserControls
string answ = "";
string nome = nomeElem.ToString();
if (Request.Url.ToString().Contains(nome)) answ = "ui-btn-active";
// se NON E' ElencoImpegni e non c'è paziente metto disabled...
if (!nome.Contains("ElencoImpegni"))
// se E' Dettaglio e non c'è cod Impegno metto disabled...
if (nome.Contains("Dettaglio"))
{
if (!memLayer.ML.isInSessionObject("Paziente"))
if (!memLayer.ML.isInSessionObject("Impegno"))
{
answ += " ui-state-disabled";
}
@@ -46,7 +46,7 @@ namespace WebSCR.WebUserControls
get
{
bool answ = false;
if (memLayer.ML.isInSessionObject("Paziente"))
if (memLayer.ML.isInSessionObject("Impegno"))
{
answ = true;
}
+7 -7
View File
@@ -19,9 +19,9 @@ namespace WebSCR.WebUserControls
get
{
string answ = "-";
if (memLayer.ML.isInSessionObject("Paziente"))
if (memLayer.ML.isInSessionObject("Impegno"))
{
answ = memLayer.ML.StringSessionObj("Paziente");
answ = memLayer.ML.StringSessionObj("Impegno");
}
return answ;
}
@@ -42,7 +42,7 @@ namespace WebSCR.WebUserControls
if (devicesAuthProxy.pagPrecedente != titolo)
{
devicesAuthProxy.pagPrecedente = devicesAuthProxy.pagCorrente;
}
}
// salvo apgina corrente
devicesAuthProxy.pagCorrente = titolo; // devicesAuthProxy.getCurrPage(Request.Url);
// update valori
@@ -66,7 +66,7 @@ namespace WebSCR.WebUserControls
}
else
{
Response.Redirect("ElencoImpegni");
Response.Redirect("Pianificazione");
}
}
}
@@ -84,8 +84,8 @@ namespace WebSCR.WebUserControls
private bool checkPageIsAuth()
{
bool allOk = false;
bool pageSafe = (memLayer.ML.confReadString("PageNoIndex").IndexOf(titolo)>=0);
bool pageAuth=devicesAuthProxy.stObj.isPageEnabled(titolo);
bool pageSafe = (memLayer.ML.confReadString("PageNoIndex").IndexOf(titolo) >= 0);
bool pageAuth = devicesAuthProxy.stObj.isPageEnabled(titolo);
allOk = (pageSafe || pageAuth);
return allOk;
}
@@ -146,7 +146,7 @@ namespace WebSCR.WebUserControls
device = devicesAuthProxy.stObj.taAnagDev.getByDeviceSecret(devSecret)[0];
email = device.USER_NAME;
}
catch(Exception exc)
catch (Exception exc)
{
logger.lg.scriviLog(string.Format("Errore in auth cookie: {0}", exc), tipoLog.EXCEPTION);
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large Load Diff
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.