From 90dcb9b9cf1a7a83685de23f5d8d2fafeda9fedd Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Fri, 21 Sep 2018 23:00:45 +0200
Subject: [PATCH] =?UTF-8?q?condizionato=20visibilit=C3=A0=20task=20a=20ruo?=
 =?UTF-8?q?lo=20utente?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 C-TRACK/WebUserControls/mod_menuTopCompact.ascx    | 8 ++++----
 C-TRACK/WebUserControls/mod_menuTopCompact.ascx.cs | 5 +++--
 Jenkinsfile                                        | 2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/C-TRACK/WebUserControls/mod_menuTopCompact.ascx b/C-TRACK/WebUserControls/mod_menuTopCompact.ascx
index 0c3ca3d..8818f5f 100644
--- a/C-TRACK/WebUserControls/mod_menuTopCompact.ascx
+++ b/C-TRACK/WebUserControls/mod_menuTopCompact.ascx
@@ -1,7 +1,7 @@
 <%@ 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="col-4 col-md-3 my-2 text-left">
-    <asp:HyperLink runat="server" ID="hlTask" NavigateUrl="~/task" CssClass="btn btn-block btn-primary text-truncate"> <i class="fas fa-tasks"></i> Task</asp:HyperLink>
+    <asp:HyperLink runat="server" ID="hlTask" NavigateUrl="~/task" CssClass="btn btn-block btn-primary text-truncate"> <i class="fas fa-tasks"></i> Commesse</asp:HyperLink>
   </div>
   <div class="col-4 col-md-6 my-0 text-center">
     <asp:HyperLink runat="server" ID="hlBarcode" NavigateUrl="~/barcode" CssClass="btn btn-block btn-light text-truncate"> <asp:Label ID="lblTitolo" runat="server" Text="" CssClass="font-weight-bold" />
@@ -12,13 +12,13 @@
   </div>
 </div>
 <div class="row text-uppercase align-items-center w-100 mx-0 px-0">
-  <div class="col-4 text-left text-truncate">
+  <div class="col-4 text-left text-truncate text-warning">
     <%: NomeOpr %>        
   </div>
-  <div class="col-4 text-center text-truncate"> 
+  <div class="col-4 text-center text-truncate text-info"> 
     <%: CurrNumTask %>
   </div>
-  <div class="col-4 text-right text-truncate">  
+  <div class="col-4 text-right text-truncate text-warning">  
     <%: DescPost %>
   </div>
 </div>
diff --git a/C-TRACK/WebUserControls/mod_menuTopCompact.ascx.cs b/C-TRACK/WebUserControls/mod_menuTopCompact.ascx.cs
index ec70240..8ba1478 100644
--- a/C-TRACK/WebUserControls/mod_menuTopCompact.ascx.cs
+++ b/C-TRACK/WebUserControls/mod_menuTopCompact.ascx.cs
@@ -13,13 +13,14 @@ namespace C_TRACK.WebUserControls
       string lastPage = Request.Url.LocalPath.Split('/').Last();
       if (!Page.IsPostBack)
       {
+        // fix visibilità TASK
+        hlTask.Visible = devicesAuthProxy.stObj.userHasRight("CT_userStart");
         // se l'utente NON c'è torno a login...
         if (!devicesAuthProxy.stObj.isAuth)
         {
           if (lastPage != "" && lastPage != "login")
           {
-            Session["nextPage"] = lastPage;
-            //}
+            Session["nextPage"] = lastPage;      
           }
           // SE non sono in "safe page"
           if (memLayer.ML.CRS("_loginPages").IndexOf(lastPage) < 0)
diff --git a/Jenkinsfile b/Jenkinsfile
index f7e712f..def8f5a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,7 +17,7 @@ pipeline {
 
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=59']) {
+        withEnv(['NEXT_BUILD_NUMBER=60']) {
           // env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2018-01-01', skipFailedBuilds: true)
           env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2018-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
             env.APP_NAME = 'C.TRACK'