diff --git a/WebSCR.v11.suo b/WebSCR.v11.suo index a416ccf..4e24041 100644 Binary files a/WebSCR.v11.suo and b/WebSCR.v11.suo differ diff --git a/WebSCR/JQMob.Master b/WebSCR/JQMob.Master index d5f2188..4b870ec 100644 --- a/WebSCR/JQMob.Master +++ b/WebSCR/JQMob.Master @@ -55,7 +55,7 @@
-
+
diff --git a/WebSCR/Menu.aspx b/WebSCR/Menu.aspx new file mode 100644 index 0000000..cb0c507 --- /dev/null +++ b/WebSCR/Menu.aspx @@ -0,0 +1,16 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/JQMob.Master" AutoEventWireup="true" CodeBehind="Menu.aspx.cs" Inherits="WebSCR.Menu" %> + +<%@ Register Src="~/WebUserControls/mod_squadre.ascx" TagPrefix="uc1" TagName="mod_squadre" %> + + + + +
+ +
+ + + +
+
+ diff --git a/WebSCR/ResetSquadra.aspx.cs b/WebSCR/Menu.aspx.cs similarity index 56% rename from WebSCR/ResetSquadra.aspx.cs rename to WebSCR/Menu.aspx.cs index 66cb3c0..8425e18 100644 --- a/WebSCR/ResetSquadra.aspx.cs +++ b/WebSCR/Menu.aspx.cs @@ -8,11 +8,25 @@ using System.Web.UI.WebControls; namespace WebSCR { - public partial class ResetSquadra : System.Web.UI.Page + public partial class Menu : System.Web.UI.Page { protected void Page_Load(object sender, EventArgs e) { - // resetto dati squadra e rimando a squadra! + if (!Page.IsPostBack) + { + mod_squadre.Visible = false; + } + } + + protected void lbSetSquadra_Click(object sender, EventArgs e) + { + // mostra select squadre... + mod_squadre.Visible = true; + } + + protected void lbResetSquadra_Click(object sender, EventArgs e) + { + // reset valori squadra... memLayer.ML.emptyCookieVal("colorSquadraCurr"); memLayer.ML.emptyCookieVal("SquadraCurr"); memLayer.ML.emptyCookieVal("CodSquadra"); @@ -23,7 +37,12 @@ namespace WebSCR memLayer.ML.emptyCookieVal("CodCliente"); memLayer.ML.emptyCookieVal("Indir"); memLayer.ML.emptySessionVal("Cliente"); - Response.Redirect("Squadra"); + Response.Redirect(devicesAuthProxy.pagCorrente); + } + + protected void lbComponiSquadra_Click(object sender, EventArgs e) + { + } } } \ No newline at end of file diff --git a/WebSCR/Menu.aspx.designer.cs b/WebSCR/Menu.aspx.designer.cs new file mode 100644 index 0000000..a4a106b --- /dev/null +++ b/WebSCR/Menu.aspx.designer.cs @@ -0,0 +1,51 @@ +//------------------------------------------------------------------------------ +// +// 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 Menu { + + /// + /// mod_squadre control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::WebSCR.WebUserControls.mod_squadre mod_squadre; + + /// + /// lbSetSquadra control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton lbSetSquadra; + + /// + /// lbResetSquadra control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton lbResetSquadra; + + /// + /// lbComponiSquadra control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton lbComponiSquadra; + } +} diff --git a/WebSCR/ResetSquadra.aspx b/WebSCR/ResetSquadra.aspx deleted file mode 100644 index aecbfb4..0000000 --- a/WebSCR/ResetSquadra.aspx +++ /dev/null @@ -1,16 +0,0 @@ -<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ResetSquadra.aspx.cs" Inherits="WebSCR.ResetSquadra" %> - - - - - - - - -
-
- -
-
- - diff --git a/WebSCR/ResetSquadra.aspx.designer.cs b/WebSCR/ResetSquadra.aspx.designer.cs deleted file mode 100644 index ed52f10..0000000 --- a/WebSCR/ResetSquadra.aspx.designer.cs +++ /dev/null @@ -1,26 +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 ResetSquadra - { - - /// - /// form1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.HtmlControls.HtmlForm form1; - } -} diff --git a/WebSCR/Squadra.aspx b/WebSCR/Squadra.aspx index 3d55306..6097bd8 100644 --- a/WebSCR/Squadra.aspx +++ b/WebSCR/Squadra.aspx @@ -1,20 +1,15 @@ <%@ Page Title="" Language="C#" MasterPageFile="~/JQMob.Master" AutoEventWireup="true" CodeBehind="Squadra.aspx.cs" Inherits="WebSCR.Squadra" %> <%@ Register Src="~/WebUserControls/mod_consegne.ascx" TagPrefix="uc1" TagName="mod_consegne" %> -<%@ Register Src="~/WebUserControls/mod_squadre.ascx" TagPrefix="uc1" TagName="mod_squadre" %> -<%@ Register Src="~/WebUserControls/mod_impegno.ascx" TagPrefix="uc1" TagName="mod_impegno" %> <%@ Register Src="~/WebUserControls/mod_dettInt.ascx" TagPrefix="uc1" TagName="mod_dettInt" %> - - - +<%@ Register Src="~/WebUserControls/mod_ImpegnoSmall.ascx" TagPrefix="uc1" TagName="mod_ImpegnoSmall" %> -
- +
- +
diff --git a/WebSCR/Squadra.aspx.cs b/WebSCR/Squadra.aspx.cs index 6313d98..0c4c176 100644 --- a/WebSCR/Squadra.aspx.cs +++ b/WebSCR/Squadra.aspx.cs @@ -30,12 +30,12 @@ namespace WebSCR { mod_consegne.Visible = true; mod_dettInt.Visible = false; - mod_impegno.Visible = false; + mod_ImpegnoSmall.Visible = false; if (qsVal("Data") != "") { if (qsVal("IdxImpegno") != "") { - mod_impegno.Visible = true; + mod_ImpegnoSmall.Visible = true; mod_dettInt.Visible = true; mod_consegne.Visible = false; } diff --git a/WebSCR/Squadra.aspx.designer.cs b/WebSCR/Squadra.aspx.designer.cs index 26498fe..63521ae 100644 --- a/WebSCR/Squadra.aspx.designer.cs +++ b/WebSCR/Squadra.aspx.designer.cs @@ -12,15 +12,6 @@ namespace WebSCR { public partial class Squadra { - /// - /// mod_squadre control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::WebSCR.WebUserControls.mod_squadre mod_squadre; - /// /// mod_consegne control. /// @@ -31,13 +22,13 @@ namespace WebSCR { protected global::WebSCR.WebUserControls.mod_consegne mod_consegne; /// - /// mod_impegno control. + /// mod_ImpegnoSmall control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::WebSCR.WebUserControls.mod_impegno mod_impegno; + protected global::WebSCR.WebUserControls.mod_ImpegnoSmall mod_ImpegnoSmall; /// /// mod_dettInt control. diff --git a/WebSCR/WebSCR.csproj b/WebSCR/WebSCR.csproj index eceed2c..47997ef 100644 --- a/WebSCR/WebSCR.csproj +++ b/WebSCR/WebSCR.csproj @@ -330,12 +330,12 @@ + - @@ -367,6 +367,7 @@ + @@ -413,6 +414,13 @@ Interventi.aspx + + Menu.aspx + ASPXCodeBehind + + + Menu.aspx + Pianificazione.aspx ASPXCodeBehind @@ -445,13 +453,6 @@ NuovoImpegno.aspx - - ResetSquadra.aspx - ASPXCodeBehind - - - ResetSquadra.aspx - Setup.aspx ASPXCodeBehind @@ -620,6 +621,13 @@ mod_impegno.ascx + + mod_ImpegnoSmall.ascx + ASPXCodeBehind + + + mod_ImpegnoSmall.ascx + mod_Interventi.ascx ASPXCodeBehind diff --git a/WebSCR/WebUserControls/mod_ImpegnoSmall.ascx b/WebSCR/WebUserControls/mod_ImpegnoSmall.ascx new file mode 100644 index 0000000..9d71fc2 --- /dev/null +++ b/WebSCR/WebUserControls/mod_ImpegnoSmall.ascx @@ -0,0 +1,47 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_ImpegnoSmall.ascx.cs" Inherits="WebSCR.WebUserControls.mod_ImpegnoSmall" %> + +
+ + +
+
+ + +
+
+ ' + ' + | + + +
+
+
+
+
+
+ +
+
+ +
+
+
+
+ + + | + +
+
+ +
+
+ + + + + + + +
diff --git a/WebSCR/WebUserControls/mod_ImpegnoSmall.ascx.cs b/WebSCR/WebUserControls/mod_ImpegnoSmall.ascx.cs new file mode 100644 index 0000000..9e1050c --- /dev/null +++ b/WebSCR/WebUserControls/mod_ImpegnoSmall.ascx.cs @@ -0,0 +1,33 @@ +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_ImpegnoSmall : System.Web.UI.UserControl + { + protected void Page_Load(object sender, EventArgs e) + { + + } + /// + /// verifica se valore passato è NON NULLO + /// + /// + /// + public bool notNull(object dataInizio) + { + bool answ = false; + try + { + answ = dataInizio.ToString() != ""; + } + catch + { } + return answ; + } + } +} \ No newline at end of file diff --git a/WebSCR/WebUserControls/mod_ImpegnoSmall.ascx.designer.cs b/WebSCR/WebUserControls/mod_ImpegnoSmall.ascx.designer.cs new file mode 100644 index 0000000..875ae31 --- /dev/null +++ b/WebSCR/WebUserControls/mod_ImpegnoSmall.ascx.designer.cs @@ -0,0 +1,33 @@ +//------------------------------------------------------------------------------ +// +// 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_ImpegnoSmall { + + /// + /// frmViewImpegni control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.FormView frmViewImpegni; + + /// + /// odsImpegni control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ObjectDataSource odsImpegni; + } +} diff --git a/WebSCR/WebUserControls/mod_dettInt.ascx b/WebSCR/WebUserControls/mod_dettInt.ascx index af58c9a..ada35d1 100644 --- a/WebSCR/WebUserControls/mod_dettInt.ascx +++ b/WebSCR/WebUserControls/mod_dettInt.ascx @@ -1,5 +1,5 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_dettInt.ascx.cs" Inherits="WebSCR.WebUserControls.mod_dettInt" %> -
+
diff --git a/WebSCR/WebUserControls/mod_dettInt.ascx.cs b/WebSCR/WebUserControls/mod_dettInt.ascx.cs index b9a1559..f39e980 100644 --- a/WebSCR/WebUserControls/mod_dettInt.ascx.cs +++ b/WebSCR/WebUserControls/mod_dettInt.ascx.cs @@ -42,6 +42,22 @@ namespace WebSCR.WebUserControls } } /// + /// determina altezza visibile + /// + public string visHeight + { + get + { + string answ = "1em"; + if (disableEdit) + { + answ = "0px"; + } + return answ; + } + + } + /// /// impegno corrente /// public int idxImpegno diff --git a/WebSCR/WebUserControls/mod_footer.ascx b/WebSCR/WebUserControls/mod_footer.ascx index 75d0173..2834127 100644 --- a/WebSCR/WebUserControls/mod_footer.ascx +++ b/WebSCR/WebUserControls/mod_footer.ascx @@ -8,8 +8,7 @@
  • Setup
    • \ No newline at end of file diff --git a/WebSCR/WebUserControls/mod_header.ascx b/WebSCR/WebUserControls/mod_header.ascx index e878505..eb73a40 100644 --- a/WebSCR/WebUserControls/mod_header.ascx +++ b/WebSCR/WebUserControls/mod_header.ascx @@ -1,15 +1,19 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_header.ascx.cs" Inherits="WebSCR.WebUserControls.mod_header" %> -
    - WebSCR - <%: titolo %> +
    +
    + WSC - <%: titolo %> +
    +
    + + +
    +
    +   +
    - - -
    - <%----%> -   -
    -
    + +
    <%: CognomeNome %>
    diff --git a/WebSCR/WebUserControls/mod_header.ascx.cs b/WebSCR/WebUserControls/mod_header.ascx.cs index c77f850..a39491b 100644 --- a/WebSCR/WebUserControls/mod_header.ascx.cs +++ b/WebSCR/WebUserControls/mod_header.ascx.cs @@ -129,9 +129,6 @@ namespace WebSCR.WebUserControls // se c'è e non è expired showSel = false; } -#if false - lbtResetSquadra.Visible = !showSel; -#endif } /// /// verifica che la pagina sia tra quelle autorizzate x l'utente @@ -246,26 +243,5 @@ namespace WebSCR.WebUserControls memLayer.ML.setCookieVal(memLayer.ML.confReadString("AuthCookieName"), ""); memLayer.ML.emptyCookieVal(memLayer.ML.confReadString("AuthCookieName")); } -#if false - /// - /// in caso di richiesta reset elimina cookie delal squadra selezionata - /// - /// - /// - protected void lbtResetSquadra_Click(object sender, EventArgs e) - { - memLayer.ML.emptyCookieVal("colorSquadraCurr"); - memLayer.ML.emptyCookieVal("SquadraCurr"); - memLayer.ML.emptyCookieVal("CodSquadra"); - memLayer.ML.emptyCookieVal("DataRif"); - memLayer.ML.emptyCookieVal("NumGg"); - memLayer.ML.emptyCookieVal("Data"); - memLayer.ML.emptyCookieVal("IdxImpegno"); - memLayer.ML.emptyCookieVal("CodCliente"); - memLayer.ML.emptyCookieVal("Indir"); - memLayer.ML.emptySessionVal("Cliente"); - Response.Redirect(devicesAuthProxy.pagCorrente); - } -#endif } } \ No newline at end of file diff --git a/WebSCR/bin/SteamWare.dll b/WebSCR/bin/SteamWare.dll index c6a7daf..8cee741 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 a09ba4c..86e2c91 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 809ed75..1ba5cd0 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 9d9482e..7f52589 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 c18e74a..2174973 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 a09ba4c..86e2c91 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 c6a7daf..8cee741 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 809ed75..1ba5cd0 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 92eabc8..98f699a 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 809ed75..1ba5cd0 100644 Binary files a/WebSCR_data/obj/Debug/WebSCR_data.dll and b/WebSCR_data/obj/Debug/WebSCR_data.dll differ