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" %>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ - Machine Cod: <%: IdxMacchina %>
+ - IOB Type: <%: IobFeeder.iType %>
+ - IOB Name: <%: IobFeeder.name %>
+ - IOB Addr: <%: IobFeeder.IP %>
+
+
+
+
+
+
+
+
+
+
+
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();
+ }
+ ///
+ /// Ricarica dati IOB
+ ///
+ 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(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"
+ };
+ }
+ }
+ ///
+ /// Macchina corrente
+ ///
+ public string IdxMacchina
+ {
+ get
+ {
+ return memLayer.ML.StringSessionObj("IdxMacchina");
+ }
+ }
+ ///
+ /// Fornisce dati dell'IOB da cui è alimentato
+ ///
+ 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 @@
+//------------------------------------------------------------------------------
+//
+// Codice generato da uno strumento.
+//
+// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
+// il codice viene rigenerato.
+//
+//------------------------------------------------------------------------------
+
+namespace MoonProTablet {
+
+
+ public partial class IOB_info {
+
+ ///
+ /// Controllo mod_dettMacchina1.
+ ///
+ ///
+ /// Campo generato automaticamente.
+ /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+ ///
+ protected global::MoonProTablet.WebUserControls.mod_dettMacchina mod_dettMacchina1;
+
+ ///
+ /// Controllo hlAbout.
+ ///
+ ///
+ /// Campo generato automaticamente.
+ /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+ ///
+ protected global::System.Web.UI.WebControls.HyperLink hlAbout;
+
+ ///
+ /// Controllo hlLogout.
+ ///
+ ///
+ /// Campo generato automaticamente.
+ /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+ ///
+ protected global::System.Web.UI.WebControls.HyperLink hlLogout;
+
+ ///
+ /// Controllo mod_directLinks.
+ ///
+ ///
+ /// Campo generato automaticamente.
+ /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+ ///
+ 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 @@
+
@@ -593,6 +594,13 @@
Global.asax
+
+ IOB-info.aspx
+ ASPXCodeBehind
+
+
+ IOB-info.aspx
+
jumper.aspx
ASPXCodeBehind
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 @@
Server Time: <%: DateTime.Now.ToString("dddd dd.MM.yyyy HH:mm.ss") %>
Curr IP: <%: Request.UserHostName %>
Browser size: <%: videoSize %>
- Data Feeder: <%: string.Format("{0} | {1} | {2}", IobFeeder.name, IobFeeder.iType,IobFeeder.IP) %>