From d1aba07561bdceabd932d707be68357e95186c10 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Fri, 11 Oct 2019 17:26:56 +0200
Subject: [PATCH] Continuo cona ssegnazione TAGS

---
 C-TRACK/WebUserControls/mod_barcode.ascx | 12 ++++++------
 C-TRACK/WebUserControls/mod_selTag.ascx  | 14 ++++++++------
 C-TRACK/barcode.aspx.cs                  |  4 ++--
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/C-TRACK/WebUserControls/mod_barcode.ascx b/C-TRACK/WebUserControls/mod_barcode.ascx
index c125fbf..45adbe9 100644
--- a/C-TRACK/WebUserControls/mod_barcode.ascx
+++ b/C-TRACK/WebUserControls/mod_barcode.ascx
@@ -21,16 +21,16 @@
     <asp:LinkButton ID="lbtCerca" runat="server" CssClass="btn text-truncate btn-warning btn-lg btn-block text-uppercase"><i class="fa fa-search"></i> cerca</asp:LinkButton>
   </div>
 </div>
-<div style="text-align: center; font-size: 20pt;">
-  <div class="ui-grid-solo">
-    <asp:Panel runat="server" ID="pnlBarcodeBox" CssClass="">
-      <div style="background-color: #FFE800; padding: 8px; margin: 1px;">
+<div class="row text-center" style="font-size: 2.5em;">
+  <div class="col">
+    <asp:Panel runat="server" ID="pnlBarcodeBox" CssClass="w-100">
+      <div class="py-1" style="background-color: #FFE800;">
         <asp:Label runat="server" ID="lblInput" Text="" />
       </div>
-      <div style="background-color: #FFC500; padding: 8px; margin: 1px;">
+      <div class="py-1" style="background-color: #FFC500;">
         <asp:Label runat="server" ID="lblValore" Text="" />
       </div>
-      <div style="background-color: #FF7700; padding: 8px; margin: 1px;">
+      <div class="py-1" style="background-color: #FF7700;">
         <asp:Label runat="server" ID="lblRichiesta" Text="" Font-Bold="true" />
       </div>
       <asp:Label ID="lblBrowser" runat="server" />
diff --git a/C-TRACK/WebUserControls/mod_selTag.ascx b/C-TRACK/WebUserControls/mod_selTag.ascx
index be53154..89e3957 100644
--- a/C-TRACK/WebUserControls/mod_selTag.ascx
+++ b/C-TRACK/WebUserControls/mod_selTag.ascx
@@ -1,9 +1,10 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_selTag.ascx.cs" Inherits="C_TRACK.WebUserControls.mod_selTag" %>
 
-<div class="row">
-  <div class="col text-center">
-    <h3>Selezione TAGS</h3>
-    <asp:DropDownList runat="server" ID="ddlTag" CssClass="form-control" DataSourceID="odsTags" DataTextField="label" DataValueField="value">
+<div class="row text-center">
+  <div class="col">
+    <div class="py-1 px-2 table-info small">
+    <%--<h5>Selezione TAGS</h5>--%>
+    <asp:DropDownList runat="server" ID="ddlTag" CssClass="custom-select custom-select-sm" DataSourceID="odsTags" DataTextField="label" DataValueField="value">
       <%--<asp:ListItem Selected="True">Nessuno</asp:ListItem>
       <asp:ListItem>TAG 1</asp:ListItem>
       <asp:ListItem>TAG 2</asp:ListItem>
@@ -13,9 +14,10 @@
    
     <asp:ObjectDataSource ID="odsTags" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByTask" TypeName="AppData.DS_UtilityTableAdapters.v_selTagTableAdapter">
       <SelectParameters>
-        <asp:SessionParameter Name="NumTask" SessionField="currNumTask" Type="String" DefaultValue="*" />
+        <asp:SessionParameter Name="NumTask" SessionField="CurrNumTask" Type="String" DefaultValue="" />
       </SelectParameters>
     </asp:ObjectDataSource>
-    <i> OPZIONALE, da config, se indicato permette di scegliere TRA I TAG assocaiti al NumTask 1 SOLO,e  POI lo tiene in memoria x poterlo inserire come registrazione...</i>
+    <i>OPZIONALE: permette di scegliere 1 SOLO TRA I TAG associati alla commessa cui assegnare la registrazione...</i>
   </div>
+    </div>
 </div>
diff --git a/C-TRACK/barcode.aspx.cs b/C-TRACK/barcode.aspx.cs
index 450eaeb..9d5a258 100644
--- a/C-TRACK/barcode.aspx.cs
+++ b/C-TRACK/barcode.aspx.cs
@@ -152,8 +152,8 @@ namespace C_TRACK
     {
       mod_barcode1.Visible = memLayer.ML.CRB("OptUseBCode");
       mod_selTask.Visible = memLayer.ML.CRB("OptUseSelTask");
-      // per i tags NON DEVE essere una post multi...
-      mod_selTag.Visible = memLayer.ML.CRB("OptUseSelTag") && !mUtils.postIsMulti;
+      // per i tags NON DEVE essere una post multi e DEVE esserci una comemssa...
+      mod_selTag.Visible = memLayer.ML.CRB("OptUseSelTag") && !mUtils.postIsMulti && CurrNumTask != "";
     }
 
     /// <summary>