fix bundles jquery + proseguo gestione ins commessa

2018-09-03 09:27:02 +02:00
parent f7b4180b36
commit eb24ccc755
10 changed files with 227 additions and 42 deletions
@@ -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;
    }
  }
 }
@@ -253,6 +253,7 @@
    <Content Include="Scripts\v4-shims.min.js" />
    <Content Include="task.aspx" />
    <Content Include="unauthorized.aspx" />
+    <Content Include="update.aspx" />
    <Content Include="UserAdmin.aspx" />
    <Content Include="webfonts\fa-brands-400.svg" />
    <Content Include="webfonts\fa-regular-400.svg" />
@@ -423,6 +424,13 @@
    <Compile Include="unauthorized.aspx.designer.cs">
      <DependentUpon>unauthorized.aspx</DependentUpon>
    </Compile>
+    <Compile Include="update.aspx.cs">
+      <DependentUpon>update.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="update.aspx.designer.cs">
+      <DependentUpon>update.aspx</DependentUpon>
+    </Compile>
    <Compile Include="UserAdmin.aspx.cs">
      <DependentUpon>UserAdmin.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
@@ -41,7 +41,7 @@
  </system.web.extensions>-->
  <appSettings>
    <add key="serializeSession" value="true" />
-    <add key="CodModulo" value="C.TRACKS" />
+    <add key="CodModulo" value="C.TRACK" />
    <add key="_navMaxChar" value="20" />
    <!--Sito-->
    <add key="currSite" value="http://IIS02/C.TRACK/" />
@@ -1,14 +1,14 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_menuTopCompact.ascx.cs" Inherits="C_TRACK.WebUserControls.mod_menuTopCompact" %>
-<div class="row text-uppercase align-items-center w-100 mx-0 px-0">    
+<div class="row text-uppercase align-items-center w-100 mx-0 px-0">
  <div class="col-12 col-sm-4 col-md-3 my-2 text-left">
    <asp:HyperLink runat="server" ID="hlTask" NavigateUrl="~/task" CssClass="btn btn-lg btn-block btn-primary">
                     <i class="fas fa-tasks"></i> Task
    </asp:HyperLink>
-  </div>            
-  <div class="col-12 col-sm-4 col-md-6 my-0 text-center">    
+  </div>
+  <div class="col-12 col-sm-4 col-md-6 my-0 text-center">
    <asp:HyperLink runat="server" ID="hlBarcode" NavigateUrl="~/barcode" CssClass="btn btn-lg btn-block btn-light">
-    <asp:Label ID="lblTitolo" runat="server" Text="" CssClass="font-weight-bold" />
-      </asp:HyperLink></div><div class="col-12 col-sm-4 col-md-3 my-2 text-right">
+      <asp:Label ID="lblTitolo" runat="server" Text="" CssClass="font-weight-bold" />
+    </asp:HyperLink></div><div class="col-12 col-sm-4 col-md-3 my-2 text-right">
    <asp:HyperLink runat="server" ID="hlPostazioni" NavigateUrl="~/postazioni" CssClass="btn btn-lg btn-block btn-primary">
                     <i class="fas fa-industry"></i> Postazioni
    </asp:HyperLink></div></div>
@@ -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" %>

-<div class="row text-uppercase">   
+
+<div class="row text-uppercase">
  <div class="col">
-    <asp:LinkButton runat="server" ID="lbAddNew" CssClass="btn btn-lg btn-outline-success btn-block">Add New</asp:LinkButton>
+    <asp:LinkButton runat="server" ID="lbAddNew" CssClass="btn btn-lg btn-outline-success btn-block" OnClick="lbAddNew_Click"><%: testoAddNew %></asp:LinkButton>
  </div>
  <div class="col">
-    <asp:LinkButton runat="server" ID="lbCaricati" CssClass="btn btn-lg btn-success btn-block">[1] Caricati</asp:LinkButton>
+    <asp:LinkButton runat="server" ID="lbCaricati" CssClass="btn btn-lg btn-success btn-block" OnClick="lbCaricati_Click">[1] Caricati</asp:LinkButton>
  </div>
  <div class="col">
-    <asp:LinkButton runat="server" ID="lbInCorso" CssClass="btn btn-lg btn-warning btn-block">[2] In Corso</asp:LinkButton>
-  </div>  
-  <div class="col">
-    <asp:LinkButton runat="server" ID="lbConclusi" CssClass="btn btn-lg btn-secondary btn-block">[3] Conclusi</asp:LinkButton>
+    <asp:LinkButton runat="server" ID="lbInCorso" CssClass="btn btn-lg btn-warning btn-block" OnClick="lbInCorso_Click">[2] In Corso</asp:LinkButton>
  </div>
  <div class="col">
-    <asp:LinkButton runat="server" ID="LinkButton1" CssClass="btn btn-lg btn-outline-info btn-block">[0] Tutti</asp:LinkButton>
+    <asp:LinkButton runat="server" ID="lbConclusi" CssClass="btn btn-lg btn-secondary btn-block" OnClick="lbConclusi_Click">[3] Conclusi</asp:LinkButton>
+  </div>
+  <div class="col">
+    <asp:LinkButton runat="server" ID="lbTutti" CssClass="btn btn-lg btn-outline-info btn-block" OnClick="lbTutti_Click">[0] Tutti</asp:LinkButton>
+  </div>
+</div>
+<div class="row my-2" runat="server" id="divBCode">
+  <div class="col-12">
+    <uc1:mod_barcode runat="server" ID="mod_barcode" />
+  </div>
+</div>
+<div class="row">
+  <div class="col-12">
+    <asp:GridView ID="grView" runat="server" AutoGenerateColumns="False" DataKeyNames="NumTask" DataSourceID="ods" CssClass="table table-striped table-condensed">
+      <EmptyDataTemplate>
+        Nessun Risultato
+      </EmptyDataTemplate>
+      <Columns>
+        <asp:BoundField DataField="NumTask" HeaderText="NumTask" ReadOnly="True" SortExpression="NumTask" />
+        <asp:BoundField DataField="CodArt" HeaderText="CodArt" SortExpression="CodArt" />
+        <asp:BoundField DataField="QtaRic" HeaderText="QtaRic" SortExpression="QtaRic" />
+        <asp:BoundField DataField="Prior" HeaderText="Prior" SortExpression="Prior" />
+        <asp:CheckBoxField DataField="Concluso" HeaderText="Concluso" SortExpression="Concluso" />
+        <asp:BoundField DataField="DataIns" HeaderText="DataIns" SortExpression="DataIns" />
+        <asp:BoundField DataField="DataStart" HeaderText="DataStart" SortExpression="DataStart" />
+        <asp:BoundField DataField="CurrStatus" HeaderText="CurrStatus" ReadOnly="True" SortExpression="CurrStatus" />
+      </Columns>
+    </asp:GridView>
+    <asp:HiddenField runat="server" ID="hfCurrStatus" />
+    <asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByCurrStatus" TypeName="AppData.DS_AppTableAdapters.TaskListTableAdapter">
+      <SelectParameters>
+        <asp:ControlParameter ControlID="hfCurrStatus" DefaultValue="0" Name="CurrStatus" PropertyName="Value" Type="Int32" />
+      </SelectParameters>
+    </asp:ObjectDataSource>
  </div>
 </div>
-<asp:GridView ID="grView" runat="server" AutoGenerateColumns="False" DataKeyNames="NumTask" DataSourceID="ods" CssClass="table table-striped table-condensed">
-  <EmptyDataTemplate>
-    Nessun Risultato
-  </EmptyDataTemplate>
-  <Columns>
-    <asp:BoundField DataField="NumTask" HeaderText="NumTask" ReadOnly="True" SortExpression="NumTask" />
-    <asp:BoundField DataField="CodArt" HeaderText="CodArt" SortExpression="CodArt" />
-    <asp:BoundField DataField="QtaRic" HeaderText="QtaRic" SortExpression="QtaRic" />
-    <asp:BoundField DataField="Prior" HeaderText="Prior" SortExpression="Prior" />
-    <asp:CheckBoxField DataField="Concluso" HeaderText="Concluso" SortExpression="Concluso" />
-    <asp:BoundField DataField="DataIns" HeaderText="DataIns" SortExpression="DataIns" />
-    <asp:BoundField DataField="DataStart" HeaderText="DataStart" SortExpression="DataStart" />
-    <asp:BoundField DataField="CurrStatus" HeaderText="CurrStatus" ReadOnly="True" SortExpression="CurrStatus" />
-  </Columns>
-</asp:GridView>
-<asp:HiddenField runat="server" ID="hfCurrStatus" />
-<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByCurrStatus" TypeName="AppData.DS_AppTableAdapters.TaskListTableAdapter">
-  <SelectParameters>
-    <asp:ControlParameter ControlID="hfCurrStatus" DefaultValue="0" Name="CurrStatus" PropertyName="Value" Type="Int32" />
-  </SelectParameters>
-</asp:ObjectDataSource>
@@ -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..
+    }
+
+    /// <summary>
+    /// verifica utente x possibilità fare "add new"
+    /// </summary>
+    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;
+      }
+    }
+
+    /// <summary>
+    /// Filtro stato comemssa
+    /// </summary>
+    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;
    }
  }
 }
@@ -49,13 +49,31 @@ namespace C_TRACK.WebUserControls {
        protected global::System.Web.UI.WebControls.LinkButton lbConclusi;
        
        /// <summary>
-        /// Controllo LinkButton1.
+        /// Controllo lbTutti.
        /// </summary>
        /// <remarks>
        /// Campo generato automaticamente.
        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
        /// </remarks>
-        protected global::System.Web.UI.WebControls.LinkButton LinkButton1;
+        protected global::System.Web.UI.WebControls.LinkButton lbTutti;
+        
+        /// <summary>
+        /// Controllo divBCode.
+        /// </summary>
+        /// <remarks>
+        /// Campo generato automaticamente.
+        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl divBCode;
+        
+        /// <summary>
+        /// Controllo mod_barcode.
+        /// </summary>
+        /// <remarks>
+        /// Campo generato automaticamente.
+        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// </remarks>
+        protected global::C_TRACK.WebUserControls.mod_barcode mod_barcode;
        
        /// <summary>
        /// Controllo grView.
@@ -0,0 +1,16 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="update.aspx.cs" Inherits="C_TRACK.update" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title></title>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <div>
+        </div>
+    </form>
+</body>
+</html>
@@ -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");
+    }
+  }
+}
@@ -0,0 +1,26 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     Codice generato da uno strumento.
+//
+//     Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
+//     il codice viene rigenerato.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace C_TRACK
+{
+
+
+  public partial class update
+  {
+
+    /// <summary>
+    /// Controllo form1.
+    /// </summary>
+    /// <remarks>
+    /// Campo generato automaticamente.
+    /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+    /// </remarks>
+    protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+  }
+}