diff --git a/.vs/WebSCR/v14/.suo b/.vs/WebSCR/v14/.suo index 7b76a53..6c56a4b 100644 Binary files a/.vs/WebSCR/v14/.suo and b/.vs/WebSCR/v14/.suo differ diff --git a/WebSCR/IntSquadra.aspx b/WebSCR/IntSquadra.aspx deleted file mode 100644 index 4ae4d64..0000000 --- a/WebSCR/IntSquadra.aspx +++ /dev/null @@ -1,6 +0,0 @@ -<%@ Page Title="" Language="C#" MasterPageFile="~/JQMob.Master" AutoEventWireup="true" CodeBehind="IntSquadra.aspx.cs" Inherits="WebSCR.IntSquadra" %> - - - - mettere interventi (semplificati...) - diff --git a/WebSCR/IntSquadra.aspx.cs b/WebSCR/IntSquadra.aspx.cs deleted file mode 100644 index cf2b30d..0000000 --- a/WebSCR/IntSquadra.aspx.cs +++ /dev/null @@ -1,17 +0,0 @@ -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 IntSquadra : System.Web.UI.Page - { - protected void Page_Load(object sender, EventArgs e) - { - - } - } -} \ No newline at end of file diff --git a/WebSCR/IntSquadra.aspx.designer.cs b/WebSCR/IntSquadra.aspx.designer.cs deleted file mode 100644 index e10d66e..0000000 --- a/WebSCR/IntSquadra.aspx.designer.cs +++ /dev/null @@ -1,17 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 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 IntSquadra - { - } -} diff --git a/WebSCR/IntSquadre.aspx b/WebSCR/IntSquadre.aspx new file mode 100644 index 0000000..07b0b13 --- /dev/null +++ b/WebSCR/IntSquadre.aspx @@ -0,0 +1,9 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/JQMob.Master" AutoEventWireup="true" CodeBehind="IntSquadre.aspx.cs" Inherits="WebSCR.IntSquadre" %> + +<%@ Register Src="~/WebUserControls/mod_Interventi.ascx" TagPrefix="uc1" TagName="mod_Interventi" %> + + + + + + diff --git a/WebSCR/IntSquadre.aspx.cs b/WebSCR/IntSquadre.aspx.cs new file mode 100644 index 0000000..91dae5d --- /dev/null +++ b/WebSCR/IntSquadre.aspx.cs @@ -0,0 +1,27 @@ +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 IntSquadre : System.Web.UI.Page + { + protected void Page_Load(object sender, EventArgs e) + { + if (!Page.IsPostBack) + { + // imposto a filtro suadre la squadra selezionata... + + string squadra = memLayer.ML.getCookieVal("CodSquadra"); + if (squadra != "") + { + memLayer.ML.setSessionVal("elencoSquadre", squadra); + } + } + } + } +} \ No newline at end of file diff --git a/WebSCR/IntSquadre.aspx.designer.cs b/WebSCR/IntSquadre.aspx.designer.cs new file mode 100644 index 0000000..38157e2 --- /dev/null +++ b/WebSCR/IntSquadre.aspx.designer.cs @@ -0,0 +1,24 @@ +//------------------------------------------------------------------------------ +// +// 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 IntSquadre { + + /// + /// mod_Interventi control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::WebSCR.WebUserControls.mod_Interventi mod_Interventi; + } +} diff --git a/WebSCR/Interventi.aspx b/WebSCR/Interventi.aspx index c17fe70..ee3b1df 100644 --- a/WebSCR/Interventi.aspx +++ b/WebSCR/Interventi.aspx @@ -5,7 +5,7 @@ - +
diff --git a/WebSCR/Squadra.aspx b/WebSCR/Squadra.aspx index 87a3357..5ea254e 100644 --- a/WebSCR/Squadra.aspx +++ b/WebSCR/Squadra.aspx @@ -3,7 +3,7 @@ <%@ Register Src="~/WebUserControls/mod_consegne.ascx" TagPrefix="uc1" TagName="mod_consegne" %> <%@ Register Src="~/WebUserControls/mod_dettInt.ascx" TagPrefix="uc1" TagName="mod_dettInt" %> <%@ Register Src="~/WebUserControls/mod_ImpegnoSmall.ascx" TagPrefix="uc1" TagName="mod_ImpegnoSmall" %> -<%@ Register Src="~/WebUserControls/mod_gestIntSquadra.ascx" TagPrefix="uc1" TagName="mod_gestIntSquadra" %> +<%@ Register Src="~/WebUserControls/mod_gestIntSquadre.ascx" TagPrefix="uc1" TagName="mod_gestIntSquadre" %> <%@ Register Src="~/WebUserControls/mod_fileUpload.ascx" TagPrefix="uc1" TagName="mod_fileUpload" %> <%@ Register Src="~/WebUserControls/mod_selData.ascx" TagPrefix="uc1" TagName="mod_selData" %> @@ -15,7 +15,7 @@
- +
diff --git a/WebSCR/Squadra.aspx.cs b/WebSCR/Squadra.aspx.cs index 51fd024..8d70290 100644 --- a/WebSCR/Squadra.aspx.cs +++ b/WebSCR/Squadra.aspx.cs @@ -13,7 +13,7 @@ namespace WebSCR protected void Page_Load(object sender, EventArgs e) { fixVisibility(); - mod_gestIntSquadra.eh_update += mod_gestIntSquadra_eh_update; + mod_gestIntSquadre.eh_update += mod_gestIntSquadre_eh_update; mod_selData.eh_update += Mod_selData_eh_update; } @@ -28,7 +28,7 @@ namespace WebSCR /// /// /// - void mod_gestIntSquadra_eh_update(object sender, EventArgs e) + void mod_gestIntSquadre_eh_update(object sender, EventArgs e) { mod_dettInt.doUpdate(); mod_ImpegnoSmall.doUpdate(); @@ -51,12 +51,12 @@ namespace WebSCR mod_dettInt.Visible = false; mod_ImpegnoSmall.Visible = false; divFile.Visible = false; - mod_gestIntSquadra.Visible = false; + mod_gestIntSquadre.Visible = false; if (qsVal("Data") != "") { if (qsVal("IdxImpegno") != "") { - mod_gestIntSquadra.Visible = true; + mod_gestIntSquadre.Visible = true; mod_ImpegnoSmall.Visible = true; mod_dettInt.Visible = true; divFile.Visible = true; diff --git a/WebSCR/Squadra.aspx.designer.cs b/WebSCR/Squadra.aspx.designer.cs index f14b4f3..fd967c0 100644 --- a/WebSCR/Squadra.aspx.designer.cs +++ b/WebSCR/Squadra.aspx.designer.cs @@ -31,13 +31,13 @@ namespace WebSCR { protected global::WebSCR.WebUserControls.mod_consegne mod_consegne; /// - /// mod_gestIntSquadra control. + /// mod_gestIntSquadre control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::WebSCR.WebUserControls.mod_gestIntSquadra mod_gestIntSquadra; + protected global::WebSCR.WebUserControls.mod_gestIntSquadre mod_gestIntSquadre; /// /// mod_ImpegnoSmall control. diff --git a/WebSCR/WebSCR.csproj b/WebSCR/WebSCR.csproj index 7d1c8bc..e859392 100644 --- a/WebSCR/WebSCR.csproj +++ b/WebSCR/WebSCR.csproj @@ -357,7 +357,7 @@ - + @@ -413,7 +413,7 @@ - + @@ -479,12 +479,12 @@ Interventi.aspx - - IntSquadra.aspx + + IntSquadre.aspx ASPXCodeBehind - - IntSquadra.aspx + + IntSquadre.aspx Menu.aspx @@ -735,12 +735,12 @@ mod_footer.ascx - - mod_gestIntSquadra.ascx + + mod_gestIntSquadre.ascx ASPXCodeBehind - - mod_gestIntSquadra.ascx + + mod_gestIntSquadre.ascx mod_giornata.ascx diff --git a/WebSCR/WebUserControls/mod_Interventi.ascx b/WebSCR/WebUserControls/mod_Interventi.ascx index f2d3fb1..583cda2 100644 --- a/WebSCR/WebUserControls/mod_Interventi.ascx +++ b/WebSCR/WebUserControls/mod_Interventi.ascx @@ -58,17 +58,6 @@
- <%--
- -
-
-
- - - -
- -
--%>
diff --git a/WebSCR/WebUserControls/mod_Interventi.ascx.cs b/WebSCR/WebUserControls/mod_Interventi.ascx.cs index ce16b6c..81215f9 100644 --- a/WebSCR/WebUserControls/mod_Interventi.ascx.cs +++ b/WebSCR/WebUserControls/mod_Interventi.ascx.cs @@ -112,8 +112,20 @@ namespace WebSCR.WebUserControls /// ultimo comando letto da link button /// public string lastCmd { get; set; } - - + /// + /// determina visibilità selettore squadre + /// + public bool showSelSquadre + { + get + { + return mod_selSquadre.Visible; + } + set + { + mod_selSquadre.Visible = value; + } + } /// /// aggiungo/tolgo all'intervallo selezione /// diff --git a/WebSCR/WebUserControls/mod_gestIntSquadra.ascx b/WebSCR/WebUserControls/mod_gestIntSquadre.ascx similarity index 95% rename from WebSCR/WebUserControls/mod_gestIntSquadra.ascx rename to WebSCR/WebUserControls/mod_gestIntSquadre.ascx index ea2e00b..84e3099 100644 --- a/WebSCR/WebUserControls/mod_gestIntSquadra.ascx +++ b/WebSCR/WebUserControls/mod_gestIntSquadre.ascx @@ -1,4 +1,4 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_gestIntSquadra.ascx.cs" Inherits="WebSCR.WebUserControls.mod_gestIntSquadra" %> +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_gestIntSquadre.ascx.cs" Inherits="WebSCR.WebUserControls.mod_gestIntSquadre" %> diff --git a/WebSCR/WebUserControls/mod_gestIntSquadra.ascx.cs b/WebSCR/WebUserControls/mod_gestIntSquadre.ascx.cs similarity index 98% rename from WebSCR/WebUserControls/mod_gestIntSquadra.ascx.cs rename to WebSCR/WebUserControls/mod_gestIntSquadre.ascx.cs index 2acbe93..8f106f9 100644 --- a/WebSCR/WebUserControls/mod_gestIntSquadra.ascx.cs +++ b/WebSCR/WebUserControls/mod_gestIntSquadre.ascx.cs @@ -9,7 +9,7 @@ using WebSCR_data; namespace WebSCR.WebUserControls { - public partial class mod_gestIntSquadra : System.Web.UI.UserControl + public partial class mod_gestIntSquadre : System.Web.UI.UserControl { public event EventHandler eh_update; /// diff --git a/WebSCR/WebUserControls/mod_gestIntSquadra.ascx.designer.cs b/WebSCR/WebUserControls/mod_gestIntSquadre.ascx.designer.cs similarity index 98% rename from WebSCR/WebUserControls/mod_gestIntSquadra.ascx.designer.cs rename to WebSCR/WebUserControls/mod_gestIntSquadre.ascx.designer.cs index e69be3f..2d9cc2e 100644 --- a/WebSCR/WebUserControls/mod_gestIntSquadra.ascx.designer.cs +++ b/WebSCR/WebUserControls/mod_gestIntSquadre.ascx.designer.cs @@ -10,7 +10,7 @@ namespace WebSCR.WebUserControls { - public partial class mod_gestIntSquadra { + public partial class mod_gestIntSquadre { /// /// hLat control. diff --git a/WebSCR/WebUserControls/mod_header.ascx b/WebSCR/WebUserControls/mod_header.ascx index d30138f..09af8d1 100644 --- a/WebSCR/WebUserControls/mod_header.ascx +++ b/WebSCR/WebUserControls/mod_header.ascx @@ -23,7 +23,7 @@ diff --git a/WebSCR/WebUserControls/mod_header.ascx.cs b/WebSCR/WebUserControls/mod_header.ascx.cs index 077049b..9f889f1 100644 --- a/WebSCR/WebUserControls/mod_header.ascx.cs +++ b/WebSCR/WebUserControls/mod_header.ascx.cs @@ -135,7 +135,7 @@ namespace WebSCR.WebUserControls ulSquadra.Visible = false; ulMagazzino.Visible = true; } - else if(devicesAuthProxy.pagCorrente == "Squadra" || devicesAuthProxy.pagCorrente == "IntSquadra" || devicesAuthProxy.pagCorrente == "Menu") + else if(devicesAuthProxy.pagCorrente == "Squadra" || devicesAuthProxy.pagCorrente == "IntSquadre" || devicesAuthProxy.pagCorrente == "Menu") { ulStd.Visible = false; ulSquadra.Visible = true; diff --git a/WebSCR/bin/WebSCR.dll b/WebSCR/bin/WebSCR.dll index 451c603..784e6df 100644 Binary files a/WebSCR/bin/WebSCR.dll and b/WebSCR/bin/WebSCR.dll differ