test menu laterale

MP-Tablet/WebUserControls/mod_dettMacchina.ascx

@@ -1,6 +1,6 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_dettMacchina.ascx.cs" Inherits="MoonProTablet.WebUserControls.mod_dettMacchina" %>
 <%--Riporto dettaglio singola macchina--%>
-<asp:UpdatePanel ID="UpdatePanel1" runat="server" UpdateMode="Always">
+<asp:UpdatePanel ID="UpdatePanel1" runat="server" UpdateMode="Always" >
   <ContentTemplate>
     <asp:Panel runat="server" ID="pnlFullDet">
       <div class="row">

MP-Tablet/WebUserControls/mod_dettMacchina.ascx.cs

@@ -85,5 +85,19 @@ namespace MoonProTablet.WebUserControls
       pnlFullDet.Visible = full;
       pnlLessDet.Visible = !full;
     }
+    /// <summary>
+    /// Determina se il refresh (via timer) sia o meno abilitato
+    /// </summary>
+    public bool refreshEnabled
+    {
+      get
+      {
+        return dmTimer.Enabled;
+      }
+      set
+      {
+        dmTimer.Enabled = value;
+      }
+    }
   }
 }

MP-Tablet/WebUserControls/mod_title.ascx

@@ -1,57 +1,90 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_title.ascx.cs" Inherits="MoonProTablet.WebUserControls.mod_title" %>
 
 
-<div class="modal fade text-dark" id="elencoMacchine" tabindex="-1" role="dialog" aria-labelledby="elencoMacchine" aria-hidden="true">
+<div class="modal fade text-dark" id="MainSideMenu" tabindex="-1" role="dialog" aria-labelledby="MainSideMenu" aria-hidden="true">
   <div class="modal-dialog modal-dialog-slideout modal-sm" role="document">
     <div class="modal-content">
       <div class="modal-header">
-        <h5 class="modal-title">Steamware MPTAB</h5><br />
-        <small>Main Menu</small>
+        <div class="d-flex flex-row">
+          <div class="p-0">
+            <asp:Image ID="logo" ImageUrl="../images/logoSteamware.png" runat="server" Height="40px" CssClass="img-fluid" />
+          </div>
+          <div class="p-0 pl-1">
+            <div class="flex-row">
+              <h5 class="modal-title">Steamware MPTAB</h5>
+            </div>
+            <div class="flex-row">
+              <small>Main Menu</small>
+            </div>
+          </div>
+        </div>
         <button type="button" class="close" data-dismiss="modal" aria-label="Close">
           <span aria-hidden="true">×</span>
         </button>
       </div>
       <div class="modal-body">
-        ...
-     
+        <div class="d-flex">
+          <div class="flex-row">
+            <div class="p-2">
+              Mappa Stato
+            </div>
+            <div class="p-2">
+              <div class="btn-group">
+                <button type="button" class="btn btn-danger dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                  ELENCO IMPIANTI
+                </button>
+                <div class="dropdown-menu">
+                  <a class="dropdown-item" href="#">Action</a>
+                  <a class="dropdown-item" href="#">Another action</a>
+                  <a class="dropdown-item" href="#">Something else here</a>
+                  <div class="dropdown-divider"></div>
+                  <a class="dropdown-item" href="#">Separated link</a>
+                </div>
+              </div>
+            </div>
+            <div class="p-2">
+              Dettaglio macchina
+              <div class="p-2">
+                Produzione
+              </div>
+              <div class="p-2">
+                ODL / Attrezzaggio
+              </div>
+              <div class="p-2">
+                Gest Turni
+              </div>
+              <div class="p-2">
+                Fermate
+              </div>
+              <div class="p-2">
+                Commenti
+              </div>
+              <div class="p-2">
+                Controlli
+              </div>
+            </div>
+            <div class="p-2">
+              Storico TC
+            </div>
+            <div class="p-2">
+              Utente
+            </div>
+          </div>
+        </div>
       </div>
       <div class="modal-footer">
-        <button type="button" class="btn btn-secondary" data-dismiss="modal">Chiudi</button>
+        <button type="button" class="btn btn-secondary btn-block" data-dismiss="modal">Chiudi</button>
       </div>
     </div>
   </div>
 </div>
 
-<div class="modal fade" id="exampleModal2" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel2" aria-hidden="true">
-  <div class="modal-dialog modal-dialog-slideout modal-sm" role="document">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title" id="exampleModalLabel">Modal sideout small</h5>
-        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-          <span aria-hidden="true">×</span>
-        </button>
-      </div>
-      <div class="modal-body">
-        ...
-     
-      </div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-secondary btn-block" data-dismiss="modal">Close</button>
-        <button type="button" class="btn btn-primary">Save changes</button>
-      </div>
-    </div>
-  </div>
-</div>
 
-<nav class="navbar navbar-expand fixed-top navbar-dark bg-black my-0 py-0 text-light px-2 titleBlock">
-  <a class="navbar-brand p-0 align-text-bottom" href="."  data-toggle="modal" data-target="#elencoMacchine">
-    <asp:Image ID="logoSW" ImageUrl="../images/logoSteamware.png" runat="server" Height="40px" CssClass="img-fluid" />
+<nav class="navbar navbar-expand-md fixed-top navbar-dark bg-black my-0 py-0 text-light px-2 titleBlock">
+  <a class="navbar-brand p-0 align-text-bottom" href="." data-toggle="modal" data-target="#MainSideMenu">
+    <asp:Image ID="logoSW" ImageUrl="../images/logoSteamware.png" runat="server" Height="32px" CssClass="img-fluid" />
     <strong>MPTAB</strong>
   </a>
-<%--  <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#exampleModal2">
-          DEMO
-           
-        </button>--%>
   <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarText" aria-controls="navbarText" aria-expanded="false" aria-label="Toggle navigation">
     <span class="navbar-toggler-icon"></span>
   </button>
@@ -60,7 +93,7 @@
       <asp:Repeater ID="repLI" runat="server" DataSourceID="ods">
         <ItemTemplate>
           <li class='nav-item btn px-2 py-0 <%# checkPage(Eval("NavigateUrl")) %>' style="min-width: 4em;">
-            <asp:HyperLink runat="server" ID="btnTimbra" CssClass="nav-link px-0 py-1" NavigateUrl='<%# Eval("NavigateUrl") %>'><i class='fa fa-lg <%# Eval("icona") %>'></i><br /><%# Eval("Testo") %> </asp:HyperLink>
+            <asp:HyperLink runat="server" ID="btnTimbra" CssClass="nav-link px-0 py-1" NavigateUrl='<%# Eval("NavigateUrl") %>'><i class='fa fa-lg <%# Eval("icona") %>'></i><br /><%# Eval("Testo") %></asp:HyperLink>
           </li>
         </ItemTemplate>
       </asp:Repeater>
@@ -84,6 +117,5 @@
     </div>
   </div>
 </nav>
-<div class="mb-3">&nbsp;</div>
-<div class="mb-3">&nbsp;</div>
+<div class="mb-sm-4">&nbsp;</div>
 

MP-Tablet/WebUserControls/mod_title.ascx.cs

@@ -2,6 +2,7 @@
 using SteamWare;
 using System;
 using System.Web;
+using System.Web.UI;
 
 namespace MoonProTablet.WebUserControls
 {
@@ -32,6 +33,11 @@ namespace MoonProTablet.WebUserControls
     /// <param name="e"></param>
     protected void Page_Load(object sender, EventArgs e)
     {
+      // prima apertura registro NO popup = refresh enabled
+      if(!Page.IsPostBack)
+      {
+        memLayer.ML.setSessionVal("refreshEnabled", true);
+      }
       // se ho user/dominio e matricola in sessione NON controllo coockie
       if (user_std.UtSn.utente == "" || user_std.UtSn.dominio == "" || DataLayer.MatrOpr == 0)
       {
@@ -193,5 +199,6 @@ namespace MoonProTablet.WebUserControls
         return devicesAuthProxy.getPage(Request.Url);
       }
     }
+
   }
 }

MP-Tablet/WebUserControls/mod_title.ascx.designer.cs

@@ -12,6 +12,15 @@ namespace MoonProTablet.WebUserControls {
     
     public partial class mod_title {
         
+        /// <summary>
+        /// Controllo logo.
+        /// </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.Image logo;
+        
         /// <summary>
         /// Controllo logoSW.
         /// </summary>