From f71fecd01fa491551b0de7e9cb76e3c81f438ae1 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Thu, 28 Jun 2018 18:10:54 +0200
Subject: [PATCH] Aggiunta pagina dettaglio IOB x TAB

---
 Jenkinsfile                      |  2 +-
 MP-TAB/IOB-info.aspx             | 42 ++++++++++++++++++++
 MP-TAB/IOB-info.aspx.cs          | 66 ++++++++++++++++++++++++++++++++
 MP-TAB/IOB-info.aspx.designer.cs | 51 ++++++++++++++++++++++++
 MP-TAB/MP-TAB.csproj             |  8 ++++
 MP-TAB/User.aspx                 |  1 -
 MP-TAB/User.aspx.cs              | 24 ------------
 MapoDb/utility.cs                |  1 +
 8 files changed, 169 insertions(+), 26 deletions(-)
 create mode 100644 MP-TAB/IOB-info.aspx
 create mode 100644 MP-TAB/IOB-info.aspx.cs
 create mode 100644 MP-TAB/IOB-info.aspx.designer.cs

diff --git a/Jenkinsfile b/Jenkinsfile
index 66ae40c0..0c782084 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,7 +17,7 @@ pipeline {
 
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=789']) {
+        withEnv(['NEXT_BUILD_NUMBER=790']) {
           // env.versionNumber = VersionNumber(versionNumberString : '5.3.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
           env.versionNumber = VersionNumber(versionNumberString : '5.3.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
             env.APP_NAME = 'MAPO'
diff --git a/MP-TAB/IOB-info.aspx b/MP-TAB/IOB-info.aspx
new file mode 100644
index 00000000..74d7c7d4
--- /dev/null
+++ b/MP-TAB/IOB-info.aspx
@@ -0,0 +1,42 @@
+<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/Bootstrap.Master" AutoEventWireup="true" CodeBehind="IOB-info.aspx.cs" Inherits="MoonProTablet.IOB_info" %>
+
+<%@ Register Src="WebUserControls/mod_dettMacchina.ascx" TagName="mod_dettMacchina" TagPrefix="uc1" %>
+<%@ Register Src="~/WebUserControls/mod_directLinks.ascx" TagPrefix="uc1" TagName="mod_directLinks" %>
+
+<asp:Content ID="Content1" ContentPlaceHolderID="HeadContent" runat="server">
+</asp:Content>
+<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">  
+  <div class="container-flow m-3" role="main">
+    <div class="row">
+      <div class="col-12 col-md-8 col-lg-9 col-xl-10">
+        <div class="my-2">
+          <uc1:mod_dettMacchina ID="mod_dettMacchina1" runat="server" />
+        </div>
+        <div class="card text-dark ">
+          <div class="card-header">
+            <div class="text-center lead">
+              <div><i class="fa fa-microchip fa-3x"></i></div>
+              IOB DETAIL
+            </div>
+          </div>
+          <div class="card-body">
+            <ul class="list-group mb-5">   
+              <li class="list-group-item d-flex justify-content-between align-items-center">Machine Cod: <b><%: IdxMacchina %></b></li>                   
+              <li class="list-group-item d-flex justify-content-between align-items-center">IOB Type: <b><i class='<%: IobFeeder.typeCss %>'></i> <%: IobFeeder.iType %></b></li>   
+              <li class="list-group-item d-flex justify-content-between align-items-center">IOB Name: <b><%: IobFeeder.name %></b></li>
+              <li class="list-group-item d-flex justify-content-between align-items-center">IOB Addr: <b><%: IobFeeder.IP %></b></li>
+            </ul>
+          </div>
+          <div class="card-footer">
+            <asp:HyperLink runat="server" ID="hlAbout" CssClass="btn btn-lg btn-block btn-success" NavigateUrl="~/About.aspx"><i class="fa fa-gear"></i> ABOUT PAGE</asp:HyperLink>
+            <hr />
+            <asp:HyperLink runat="server" ID="hlLogout" CssClass="btn btn-lg btn-block btn-danger" NavigateUrl="~/Logout.aspx"><i class="fa fa-sign-out"></i> LOGOUT</asp:HyperLink>
+          </div>
+        </div>
+      </div>
+      <div class="col-12 col-md-4 col-lg-3 col-xl-2">
+        <uc1:mod_directLinks runat="server" ID="mod_directLinks" />
+      </div>
+    </div>
+  </div>
+</asp:Content>
diff --git a/MP-TAB/IOB-info.aspx.cs b/MP-TAB/IOB-info.aspx.cs
new file mode 100644
index 00000000..9db02ea4
--- /dev/null
+++ b/MP-TAB/IOB-info.aspx.cs
@@ -0,0 +1,66 @@
+using MapoDb;
+using Newtonsoft.Json;
+using SteamWare;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace MoonProTablet
+{
+  public partial class IOB_info : System.Web.UI.Page
+  {
+    protected IOB_data _IobFeeder;
+    protected void Page_Load(object sender, EventArgs e)
+    {
+      reloadIobData();
+    }
+    /// <summary>
+    /// Ricarica dati IOB
+    /// </summary>
+    private void reloadIobData()
+    {
+      // recupero da redis...  
+      string hM2IOB = DataLayer.hM2IOB(IdxMacchina);
+      string dataSer = memLayer.ML.getRSV(hM2IOB);
+      if (dataSer != "" && dataSer != null)
+      {
+        // restituisco jSon
+        _IobFeeder = JsonConvert.DeserializeObject<IOB_data>(dataSer);
+      }
+      else
+      {
+        // se non c'è genero oggetto vuoto
+        _IobFeeder = new IOB_data
+        {
+          name = "ND",
+          IP = "::1",
+          iType = IobType.ND,
+          typeCss = "fa fa-question-circle-o"
+        };
+      }
+    }
+    /// <summary>
+    /// Macchina corrente
+    /// </summary>
+    public string IdxMacchina
+    {
+      get
+      {
+        return memLayer.ML.StringSessionObj("IdxMacchina");
+      }
+    }
+    /// <summary>
+    /// Fornisce dati dell'IOB da cui è alimentato
+    /// </summary>
+    public IOB_data IobFeeder
+    {
+      get
+      {
+        return _IobFeeder;
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/MP-TAB/IOB-info.aspx.designer.cs b/MP-TAB/IOB-info.aspx.designer.cs
new file mode 100644
index 00000000..9cd6f132
--- /dev/null
+++ b/MP-TAB/IOB-info.aspx.designer.cs
@@ -0,0 +1,51 @@
+//------------------------------------------------------------------------------
+// <generato automaticamente>
+//     Codice generato da uno strumento.
+//
+//     Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
+//     il codice viene rigenerato. 
+// </generato automaticamente>
+//------------------------------------------------------------------------------
+
+namespace MoonProTablet {
+    
+    
+    public partial class IOB_info {
+        
+        /// <summary>
+        /// Controllo mod_dettMacchina1.
+        /// </summary>
+        /// <remarks>
+        /// Campo generato automaticamente.
+        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// </remarks>
+        protected global::MoonProTablet.WebUserControls.mod_dettMacchina mod_dettMacchina1;
+        
+        /// <summary>
+        /// Controllo hlAbout.
+        /// </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.HyperLink hlAbout;
+        
+        /// <summary>
+        /// Controllo hlLogout.
+        /// </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.HyperLink hlLogout;
+        
+        /// <summary>
+        /// Controllo mod_directLinks.
+        /// </summary>
+        /// <remarks>
+        /// Campo generato automaticamente.
+        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// </remarks>
+        protected global::MoonProTablet.WebUserControls.mod_directLinks mod_directLinks;
+    }
+}
diff --git a/MP-TAB/MP-TAB.csproj b/MP-TAB/MP-TAB.csproj
index f266182e..92206166 100644
--- a/MP-TAB/MP-TAB.csproj
+++ b/MP-TAB/MP-TAB.csproj
@@ -265,6 +265,7 @@
     <Content Include="images\logoTextSteamware.png" />
     <Content Include="images\logoSteamware.png" />
     <Content Include="images\macchine\empty.png" />
+    <Content Include="IOB-info.aspx" />
     <Content Include="jumper.aspx" />
     <Content Include="Logout.aspx" />
     <Content Include="MappaStato.aspx" />
@@ -593,6 +594,13 @@
     <Compile Include="Global.asax.cs">
       <DependentUpon>Global.asax</DependentUpon>
     </Compile>
+    <Compile Include="IOB-info.aspx.cs">
+      <DependentUpon>IOB-info.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="IOB-info.aspx.designer.cs">
+      <DependentUpon>IOB-info.aspx</DependentUpon>
+    </Compile>
     <Compile Include="jumper.aspx.cs">
       <DependentUpon>jumper.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
diff --git a/MP-TAB/User.aspx b/MP-TAB/User.aspx
index 656b6646..cd8a1380 100644
--- a/MP-TAB/User.aspx
+++ b/MP-TAB/User.aspx
@@ -17,7 +17,6 @@
           <li class="list-group-item d-flex justify-content-between align-items-center">Server Time: <b><%: DateTime.Now.ToString("dddd dd.MM.yyyy HH:mm.ss") %></b></li>
           <li class="list-group-item d-flex justify-content-between align-items-center">Curr IP: <b><%: Request.UserHostName %></b></li>
           <li class="list-group-item d-flex justify-content-between align-items-center">Browser size: <b><%: videoSize %></b></li>
-          <li class="list-group-item d-flex justify-content-between align-items-center">Data Feeder: <b><i class='<%: IobFeeder.typeCss %>'></i> <%: string.Format("{0} | {1} | {2}", IobFeeder.name, IobFeeder.iType,IobFeeder.IP) %></b></li>
         </ul>
       </div>
       <div class="card-footer">
diff --git a/MP-TAB/User.aspx.cs b/MP-TAB/User.aspx.cs
index 759e2c5f..a57c7b73 100644
--- a/MP-TAB/User.aspx.cs
+++ b/MP-TAB/User.aspx.cs
@@ -61,29 +61,5 @@ namespace MoonProTablet
         return swData;
       }
     }
-    /// <summary>
-    /// Fornisce dati dell'IOB da cui è alimentato
-    /// </summary>
-    public IOB_data IobFeeder
-    {
-      get
-      {
-        // cerco se è in REDIS (per una SINGOLA macchina il dato è piuttosto "stabile", da ricalcolare ogni 10 minuti...
-
-        // se non c'è recupero dati e salvo
-
-        // genero oggetto
-        IOB_data answ = new IOB_data
-        {
-          name = "ND",
-          IP = "::1",
-          iType = IobType.ND,
-          typeCss = "fa fa-question-circle-o"
-        };
-        return answ;
-      }
-    }
-
-
   }
 }
\ No newline at end of file
diff --git a/MapoDb/utility.cs b/MapoDb/utility.cs
index f331d90a..38092434 100644
--- a/MapoDb/utility.cs
+++ b/MapoDb/utility.cs
@@ -309,4 +309,5 @@ public class IOB_data
   public string IP;
   public IobType iType;
   public string typeCss;
+  public bool CNC_Counter;
 }