diff --git a/C-TRACK/App_Start/BundleConfig.cs b/C-TRACK/App_Start/BundleConfig.cs index 1aad376..f07494b 100644 --- a/C-TRACK/App_Start/BundleConfig.cs +++ b/C-TRACK/App_Start/BundleConfig.cs @@ -33,6 +33,19 @@ namespace C_TRACK // pronti per passare alla produzione, usare lo strumento di compilazione disponibile all'indirizzo https://modernizr.com per selezionare solo i test necessari bundles.Add(new ScriptBundle("~/bundles/modernizr").Include( "~/Scripts/modernizr-*")); + + + //bundles.Add(new ScriptBundle("~/bundles/modernizr").Include("~/Scripts/modernizr-*")); + bundles.Add(new ScriptBundle("~/bundles/jquery").Include( + "~/Scripts/jquery-{version}.js")); + bundles.Add(new ScriptBundle("~/bundles/jqueryui").Include( + "~/Scripts/jquery-ui-{version}.js")); + //bundles.Add(new ScriptBundle("~/bundles/BrowserWindowSize").Include("~/Scripts/BrowserWindowSize.js")); + bundles.Add(new ScriptBundle("~/bundles/bootstrap").Include( + "~/Scripts/bootstrap.bundle.js")); + + // abilito boundle "forzato"! + BundleTable.EnableOptimizations = true; } } } \ No newline at end of file diff --git a/C-TRACK/C-TRACK.csproj b/C-TRACK/C-TRACK.csproj index 5b34407..6f76805 100644 --- a/C-TRACK/C-TRACK.csproj +++ b/C-TRACK/C-TRACK.csproj @@ -253,6 +253,7 @@ + @@ -423,6 +424,13 @@ unauthorized.aspx + + update.aspx + ASPXCodeBehind + + + update.aspx + UserAdmin.aspx ASPXCodeBehind diff --git a/C-TRACK/Web.config b/C-TRACK/Web.config index dd4a1a4..df40b99 100644 --- a/C-TRACK/Web.config +++ b/C-TRACK/Web.config @@ -41,7 +41,7 @@ --> - + diff --git a/C-TRACK/WebUserControls/mod_menuTopCompact.ascx b/C-TRACK/WebUserControls/mod_menuTopCompact.ascx index e28bee1..0560e3a 100644 --- a/C-TRACK/WebUserControls/mod_menuTopCompact.ascx +++ b/C-TRACK/WebUserControls/mod_menuTopCompact.ascx @@ -1,14 +1,14 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_menuTopCompact.ascx.cs" Inherits="C_TRACK.WebUserControls.mod_menuTopCompact" %> -
+
Task -
-
+
+
- -
+ +
Postazioni
\ No newline at end of file diff --git a/C-TRACK/WebUserControls/mod_taskList.ascx b/C-TRACK/WebUserControls/mod_taskList.ascx index 0a284a8..4a45306 100644 --- a/C-TRACK/WebUserControls/mod_taskList.ascx +++ b/C-TRACK/WebUserControls/mod_taskList.ascx @@ -1,40 +1,51 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_taskList.ascx.cs" Inherits="C_TRACK.WebUserControls.mod_taskList" %> +<%@ Register Src="~/WebUserControls/mod_barcode.ascx" TagPrefix="uc1" TagName="mod_barcode" %> -
+ +
- Add New + <%: testoAddNew %>
- [1] Caricati + [1] Caricati
- [2] In Corso -
-
- [3] Conclusi + [2] In Corso
- [0] Tutti + [3] Conclusi +
+
+ [0] Tutti +
+
+
+
+ +
+
+
+
+ + + Nessun Risultato + + + + + + + + + + + + + + + + + +
- - - Nessun Risultato - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/C-TRACK/WebUserControls/mod_taskList.ascx.cs b/C-TRACK/WebUserControls/mod_taskList.ascx.cs index cad3b1f..d7ead46 100644 --- a/C-TRACK/WebUserControls/mod_taskList.ascx.cs +++ b/C-TRACK/WebUserControls/mod_taskList.ascx.cs @@ -1,9 +1,6 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; +using SteamWare; +using System; using System.Web.UI; -using System.Web.UI.WebControls; namespace C_TRACK.WebUserControls { @@ -11,7 +8,83 @@ namespace C_TRACK.WebUserControls { protected void Page_Load(object sender, EventArgs e) { + if (!Page.IsPostBack) + { + statusFiter = 0; + checkAddNew(); + divBCode.Visible = false; + } + mod_barcode.eh_comandoRegistrato += Mod_barcode_eh_comandoRegistrato; + } + private void Mod_barcode_eh_comandoRegistrato(object sender, EventArgs e) + { + // verifico cosa ho registrato.. + } + + /// + /// verifica utente x possibilità fare "add new" + /// + private void checkAddNew() + { + lbAddNew.Visible = devicesAuthProxy.stObj.userHasRight("CT_userStart"); + } + + public string testoAddNew + { + get + { + string answ = "Add New"; + if (divBCode.Visible) + { + answ = "Nascondi Add New"; + } + + return answ; + } + } + + /// + /// Filtro stato comemssa + /// + private int statusFiter + { + set + { + hfCurrStatus.Value = value.ToString(); + grView.DataBind(); + } + get + { + int answ = 0; + int.TryParse(hfCurrStatus.Value, out answ); + return answ; + } + } + + protected void lbCaricati_Click(object sender, EventArgs e) + { + statusFiter = 1; + } + + protected void lbInCorso_Click(object sender, EventArgs e) + { + statusFiter = 2; + } + + protected void lbConclusi_Click(object sender, EventArgs e) + { + statusFiter = 3; + } + + protected void lbTutti_Click(object sender, EventArgs e) + { + statusFiter = 0; + } + + protected void lbAddNew_Click(object sender, EventArgs e) + { + divBCode.Visible = !divBCode.Visible; } } } \ No newline at end of file diff --git a/C-TRACK/WebUserControls/mod_taskList.ascx.designer.cs b/C-TRACK/WebUserControls/mod_taskList.ascx.designer.cs index 54d4f20..d7245d1 100644 --- a/C-TRACK/WebUserControls/mod_taskList.ascx.designer.cs +++ b/C-TRACK/WebUserControls/mod_taskList.ascx.designer.cs @@ -49,13 +49,31 @@ namespace C_TRACK.WebUserControls { protected global::System.Web.UI.WebControls.LinkButton lbConclusi; /// - /// Controllo LinkButton1. + /// Controllo lbTutti. /// /// /// Campo generato automaticamente. /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// - protected global::System.Web.UI.WebControls.LinkButton LinkButton1; + protected global::System.Web.UI.WebControls.LinkButton lbTutti; + + /// + /// Controllo divBCode. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl divBCode; + + /// + /// Controllo mod_barcode. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::C_TRACK.WebUserControls.mod_barcode mod_barcode; /// /// Controllo grView. diff --git a/C-TRACK/update.aspx b/C-TRACK/update.aspx new file mode 100644 index 0000000..3a13e67 --- /dev/null +++ b/C-TRACK/update.aspx @@ -0,0 +1,16 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="update.aspx.cs" Inherits="C_TRACK.update" %> + + + + + + + + + +
+
+
+
+ + diff --git a/C-TRACK/update.aspx.cs b/C-TRACK/update.aspx.cs new file mode 100644 index 0000000..6708f3e --- /dev/null +++ b/C-TRACK/update.aspx.cs @@ -0,0 +1,20 @@ +using SteamWare; +using System; + +namespace C_TRACK +{ + public partial class update : System.Web.UI.Page + { + protected void Page_Load(object sender, EventArgs e) + { + // aggiorno vocabolario + DataWrap.DW.resetVocabolario(); + // reset dati in cache x DbConfig... + memLayer.ML.resetAppConf(); + // svuoto session e cache per rileggere i dati da Db + Session.RemoveAll(); + // ricarico + Response.Redirect("barcode"); + } + } +} \ No newline at end of file diff --git a/C-TRACK/update.aspx.designer.cs b/C-TRACK/update.aspx.designer.cs new file mode 100644 index 0000000..ef702ea --- /dev/null +++ b/C-TRACK/update.aspx.designer.cs @@ -0,0 +1,26 @@ +//------------------------------------------------------------------------------ +// +// Codice generato da uno strumento. +// +// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se +// il codice viene rigenerato. +// +//------------------------------------------------------------------------------ + +namespace C_TRACK +{ + + + public partial class update + { + + /// + /// Controllo form1. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + } +}