diff --git a/WebSCR.v11.suo b/WebSCR.v11.suo index c7dda2e..d7fc3a3 100644 Binary files a/WebSCR.v11.suo and b/WebSCR.v11.suo differ diff --git a/WebSCR/Setup.aspx b/WebSCR/Setup.aspx index bd308b5..0fb0057 100644 --- a/WebSCR/Setup.aspx +++ b/WebSCR/Setup.aspx @@ -1,5 +1,26 @@ <%@ Page Title="" Language="C#" MasterPageFile="~/JQMob.Master" AutoEventWireup="true" CodeBehind="Setup.aspx.cs" Inherits="WebSCR.Setup" %> + +<%@ Register Src="~/WebUserControls/mod_elencoDisp.ascx" TagPrefix="uc1" TagName="mod_elencoDisp" %> +<%@ Register Src="~/WebUserControls/mod_elencoSquadre.ascx" TagPrefix="uc1" TagName="mod_elencoSquadre" %> +<%@ Register Src="~/WebUserControls/mod_elencoTipoInt.ascx" TagPrefix="uc1" TagName="mod_elencoTipoInt" %> +<%@ Register Src="~/WebUserControls/mod_elencoZone.ascx" TagPrefix="uc1" TagName="mod_elencoZone" %> + + + + + + +
+ Squadre + Tipo Intervento + Zone + Calendario +
+ + + + diff --git a/WebSCR/Setup.aspx.cs b/WebSCR/Setup.aspx.cs index f6def9a..b8f9ee3 100644 --- a/WebSCR/Setup.aspx.cs +++ b/WebSCR/Setup.aspx.cs @@ -11,7 +11,59 @@ namespace WebSCR { protected void Page_Load(object sender, EventArgs e) { - + if (!Page.IsPostBack) + { + showDetail("none"); + } + } + /// + /// sistemazione visualizzaizone dettagli (moduli) secondo richiesta + /// + /// + private void showDetail(string dettaglio) + { + switch (dettaglio) + { + case "calendario": + mod_elencoDisp.Visible = true; + mod_elencoSquadre.Visible = false; + mod_elencoTipoInt.Visible = false; + mod_elencoZone.Visible = false; + break; + case "squadre": + mod_elencoDisp.Visible = false; + mod_elencoSquadre.Visible = true; + mod_elencoTipoInt.Visible = false; + mod_elencoZone.Visible = false; + break; + case "tipoInt": + mod_elencoDisp.Visible = false; + mod_elencoSquadre.Visible = false; + mod_elencoTipoInt.Visible = true; + mod_elencoZone.Visible = false; + break; + case "zone": + mod_elencoDisp.Visible = false; + mod_elencoSquadre.Visible = false; + mod_elencoTipoInt.Visible = false; + mod_elencoZone.Visible = true; + break; + default: + mod_elencoDisp.Visible = false; + mod_elencoSquadre.Visible = false; + mod_elencoTipoInt.Visible = false; + mod_elencoZone.Visible = false; + break; + } + } + /// + /// seleziona e mostra corretto tipo di anagrafica + /// + /// + /// + protected void btnElenco_Click(object sender, EventArgs e) + { + showDetail(((LinkButton)sender).CommandArgument); } } } \ No newline at end of file diff --git a/WebSCR/Setup.aspx.designer.cs b/WebSCR/Setup.aspx.designer.cs index 6cbe391..43a8d10 100644 --- a/WebSCR/Setup.aspx.designer.cs +++ b/WebSCR/Setup.aspx.designer.cs @@ -3,15 +3,85 @@ // This code was generated by a tool. // // Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// the code is regenerated. // //------------------------------------------------------------------------------ -namespace WebSCR -{ - - - public partial class Setup - { +namespace WebSCR { + + + public partial class Setup { + + /// + /// btnSquadre control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton btnSquadre; + + /// + /// btnTipoInt control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton btnTipoInt; + + /// + /// btnZone control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton btnZone; + + /// + /// btnCalendario control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton btnCalendario; + + /// + /// mod_elencoDisp control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::WebSCR.WebUserControls.mod_elencoDisp mod_elencoDisp; + + /// + /// mod_elencoSquadre control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::WebSCR.WebUserControls.mod_elencoSquadre mod_elencoSquadre; + + /// + /// mod_elencoTipoInt control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::WebSCR.WebUserControls.mod_elencoTipoInt mod_elencoTipoInt; + + /// + /// mod_elencoZone control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::WebSCR.WebUserControls.mod_elencoZone mod_elencoZone; } } diff --git a/WebSCR/WebSCR.csproj b/WebSCR/WebSCR.csproj index a3ff225..7e6dfb1 100644 --- a/WebSCR/WebSCR.csproj +++ b/WebSCR/WebSCR.csproj @@ -337,7 +337,11 @@ + + + + @@ -446,6 +450,13 @@ ViewSwitcher.ascx + + mod_elencoDisp.ascx + ASPXCodeBehind + + + mod_elencoDisp.ascx + mod_elencoRichResetUtenti.ascx ASPXCodeBehind @@ -453,6 +464,27 @@ mod_elencoRichResetUtenti.ascx + + mod_elencoSquadre.ascx + ASPXCodeBehind + + + mod_elencoSquadre.ascx + + + mod_elencoTipoInt.ascx + ASPXCodeBehind + + + mod_elencoTipoInt.ascx + + + mod_elencoZone.ascx + ASPXCodeBehind + + + mod_elencoZone.ascx + mod_enrollByAuthKey.ascx ASPXCodeBehind diff --git a/WebSCR/WebUserControls/mod_elencoDisp.ascx b/WebSCR/WebUserControls/mod_elencoDisp.ascx new file mode 100644 index 0000000..edfec6b --- /dev/null +++ b/WebSCR/WebUserControls/mod_elencoDisp.ascx @@ -0,0 +1,2 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_elencoDisp.ascx.cs" Inherits="WebSCR.WebUserControls.mod_elencoDisp" %> +elenco disponibilità \ No newline at end of file diff --git a/WebSCR/WebUserControls/mod_elencoDisp.ascx.cs b/WebSCR/WebUserControls/mod_elencoDisp.ascx.cs new file mode 100644 index 0000000..7d7ef1b --- /dev/null +++ b/WebSCR/WebUserControls/mod_elencoDisp.ascx.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.WebUserControls +{ + public partial class mod_elencoDisp : System.Web.UI.UserControl + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/WebSCR/WebUserControls/mod_elencoDisp.ascx.designer.cs b/WebSCR/WebUserControls/mod_elencoDisp.ascx.designer.cs new file mode 100644 index 0000000..ce23d81 --- /dev/null +++ b/WebSCR/WebUserControls/mod_elencoDisp.ascx.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.WebUserControls +{ + + + public partial class mod_elencoDisp + { + } +} diff --git a/WebSCR/WebUserControls/mod_elencoSquadre.ascx b/WebSCR/WebUserControls/mod_elencoSquadre.ascx new file mode 100644 index 0000000..c75d1d0 --- /dev/null +++ b/WebSCR/WebUserControls/mod_elencoSquadre.ascx @@ -0,0 +1,2 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_elencoSquadre.ascx.cs" Inherits="WebSCR.WebUserControls.mod_elencoSquadre" %> +elenco squadre \ No newline at end of file diff --git a/WebSCR/WebUserControls/mod_elencoSquadre.ascx.cs b/WebSCR/WebUserControls/mod_elencoSquadre.ascx.cs new file mode 100644 index 0000000..23ad313 --- /dev/null +++ b/WebSCR/WebUserControls/mod_elencoSquadre.ascx.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.WebUserControls +{ + public partial class mod_elencoSquadre : System.Web.UI.UserControl + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/WebSCR/WebUserControls/mod_elencoSquadre.ascx.designer.cs b/WebSCR/WebUserControls/mod_elencoSquadre.ascx.designer.cs new file mode 100644 index 0000000..68d4c7e --- /dev/null +++ b/WebSCR/WebUserControls/mod_elencoSquadre.ascx.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.WebUserControls +{ + + + public partial class mod_elencoSquadre + { + } +} diff --git a/WebSCR/WebUserControls/mod_elencoTipoInt.ascx b/WebSCR/WebUserControls/mod_elencoTipoInt.ascx new file mode 100644 index 0000000..bede4b4 --- /dev/null +++ b/WebSCR/WebUserControls/mod_elencoTipoInt.ascx @@ -0,0 +1,2 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_elencoTipoInt.ascx.cs" Inherits="WebSCR.WebUserControls.mod_elencoTipoInt" %> +tipo intervento \ No newline at end of file diff --git a/WebSCR/WebUserControls/mod_elencoTipoInt.ascx.cs b/WebSCR/WebUserControls/mod_elencoTipoInt.ascx.cs new file mode 100644 index 0000000..91db4ca --- /dev/null +++ b/WebSCR/WebUserControls/mod_elencoTipoInt.ascx.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.WebUserControls +{ + public partial class mod_elencoTipoInt : System.Web.UI.UserControl + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/WebSCR/WebUserControls/mod_elencoTipoInt.ascx.designer.cs b/WebSCR/WebUserControls/mod_elencoTipoInt.ascx.designer.cs new file mode 100644 index 0000000..3f7441c --- /dev/null +++ b/WebSCR/WebUserControls/mod_elencoTipoInt.ascx.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.WebUserControls +{ + + + public partial class mod_elencoTipoInt + { + } +} diff --git a/WebSCR/WebUserControls/mod_elencoZone.ascx b/WebSCR/WebUserControls/mod_elencoZone.ascx new file mode 100644 index 0000000..36d68d1 --- /dev/null +++ b/WebSCR/WebUserControls/mod_elencoZone.ascx @@ -0,0 +1,2 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_elencoZone.ascx.cs" Inherits="WebSCR.WebUserControls.mod_elencoZone" %> +zone \ No newline at end of file diff --git a/WebSCR/WebUserControls/mod_elencoZone.ascx.cs b/WebSCR/WebUserControls/mod_elencoZone.ascx.cs new file mode 100644 index 0000000..51699d4 --- /dev/null +++ b/WebSCR/WebUserControls/mod_elencoZone.ascx.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.WebUserControls +{ + public partial class mod_elencoZone : System.Web.UI.UserControl + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/WebSCR/WebUserControls/mod_elencoZone.ascx.designer.cs b/WebSCR/WebUserControls/mod_elencoZone.ascx.designer.cs new file mode 100644 index 0000000..814152a --- /dev/null +++ b/WebSCR/WebUserControls/mod_elencoZone.ascx.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.WebUserControls +{ + + + public partial class mod_elencoZone + { + } +} diff --git a/WebSCR/WebUserControls/mod_header.ascx b/WebSCR/WebUserControls/mod_header.ascx index 0d89f4a..ea7ea60 100644 --- a/WebSCR/WebUserControls/mod_header.ascx +++ b/WebSCR/WebUserControls/mod_header.ascx @@ -12,6 +12,6 @@ <%: DateTime.Now.ToString("ddd dd/MM/yyyy HH:mm:ss") %>
- <%: pazienteSel %> + <%: ImpegnoSel %> | <%: ClienteSel %>
diff --git a/WebSCR/WebUserControls/mod_header.ascx.cs b/WebSCR/WebUserControls/mod_header.ascx.cs index 314a9d7..c9830fc 100644 --- a/WebSCR/WebUserControls/mod_header.ascx.cs +++ b/WebSCR/WebUserControls/mod_header.ascx.cs @@ -12,9 +12,9 @@ namespace WebSCR.WebUserControls public partial class mod_header : SteamWare.UserControl { /// - /// stringa del paziente selezionato + /// codice Impegno selezionato /// - public string pazienteSel + public string ImpegnoSel { get { @@ -26,6 +26,22 @@ namespace WebSCR.WebUserControls return answ; } } + /// + /// codice Cliente selezionato (dall'impegno) + /// + public string ClienteSel + { + get + { + string answ = "-"; + if (memLayer.ML.isInSessionObject("Cliente")) + { + answ = memLayer.ML.StringSessionObj("Cliente"); + } + return answ; + } + } + /// /// caricamento pagina /// diff --git a/WebSCR/bin/SteamWare.dll b/WebSCR/bin/SteamWare.dll index 27e0580..f98cf5f 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 f51263b..5c19af5 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 bfd3f5c..bd4921f 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 0fecd3c..fec2aa9 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 1d1e462..b16a8b0 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 f51263b..5c19af5 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 27e0580..f98cf5f 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 bfd3f5c..bd4921f 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 339c95b..f65c405 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 bfd3f5c..bd4921f 100644 Binary files a/WebSCR_data/obj/Debug/WebSCR_data.dll and b/WebSCR_data/obj/Debug/WebSCR_data.dll differ