diff --git a/MP-TAB/HwSwInfo.aspx b/MP-TAB/HwSwInfo.aspx new file mode 100644 index 00000000..15dd5526 --- /dev/null +++ b/MP-TAB/HwSwInfo.aspx @@ -0,0 +1,9 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/Bootstrap.Master" AutoEventWireup="true" CodeBehind="HwSwInfo.aspx.cs" Inherits="MoonProTablet.HwSwInfo" %> + +<%@ Register Src="~/WebUserControls/cmp_HwSwInfo.ascx" TagPrefix="uc1" TagName="cmp_HwSwInfo" %> + + + + + + diff --git a/MP-TAB/HwSwInfo.aspx.cs b/MP-TAB/HwSwInfo.aspx.cs new file mode 100644 index 00000000..57488ede --- /dev/null +++ b/MP-TAB/HwSwInfo.aspx.cs @@ -0,0 +1,17 @@ +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 HwSwInfo : System.Web.UI.Page + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/MP-TAB/HwSwInfo.aspx.designer.cs b/MP-TAB/HwSwInfo.aspx.designer.cs new file mode 100644 index 00000000..1e0b7193 --- /dev/null +++ b/MP-TAB/HwSwInfo.aspx.designer.cs @@ -0,0 +1,26 @@ +//------------------------------------------------------------------------------ +// +// 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 HwSwInfo + { + + /// + /// Controllo cmp_HwSwInfo. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::MoonProTablet.WebUserControls.cmp_HwSwInfo cmp_HwSwInfo; + } +} diff --git a/MP-TAB/MP-TAB.csproj b/MP-TAB/MP-TAB.csproj index 573ee7c8..abfbce41 100644 --- a/MP-TAB/MP-TAB.csproj +++ b/MP-TAB/MP-TAB.csproj @@ -152,6 +152,12 @@ ..\packages\NLog.4.6.8\lib\net45\NLog.dll + + ..\packages\PDFsharp.1.50.5147\lib\net20\PdfSharp.dll + + + ..\packages\PDFsharp.1.50.5147\lib\net20\PdfSharp.Charting.dll + ..\packages\Pipelines.Sockets.Unofficial.2.1.0\lib\net461\Pipelines.Sockets.Unofficial.dll @@ -164,8 +170,8 @@ ..\packages\StackExchange.Redis.2.0.601\lib\net461\StackExchange.Redis.dll - - ..\packages\SteamWare.3.4.1911.687\lib\net462\SteamWare.dll + + ..\packages\SteamWare.3.5.1911.698\lib\net462\SteamWare.dll ..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll @@ -419,6 +425,7 @@ + @@ -482,11 +489,11 @@ Always + + PreserveNewest - - Designer @@ -578,6 +585,7 @@ Web.config + @@ -686,6 +694,13 @@ Global.asax + + HwSwInfo.aspx + ASPXCodeBehind + + + HwSwInfo.aspx + IOB-info.aspx ASPXCodeBehind @@ -821,6 +836,13 @@ cmp_dettODL.ascx + + cmp_HwSwInfo.ascx + ASPXCodeBehind + + + cmp_HwSwInfo.ascx + cmp_newODL.ascx ASPXCodeBehind diff --git a/MP-TAB/NLog.xsd b/MP-TAB/NLog.xsd index 05684bd7..16d888c8 100644 --- a/MP-TAB/NLog.xsd +++ b/MP-TAB/NLog.xsd @@ -841,6 +841,7 @@ + @@ -883,6 +884,11 @@ Indicates whether to auto-flush after + + + Whether to enable batch writing using char[]-buffers, instead of using + + Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit @@ -1178,7 +1184,7 @@ - Optional entrytype. When not set, or when not convertible to then determined by + Optional entry type. When not set, or when not convertible to then determined by @@ -1374,7 +1380,7 @@ - Maximum number of log filenames that should be stored as existing. + Maximum number of log file names that should be stored as existing. @@ -2895,6 +2901,7 @@ + @@ -2936,6 +2943,11 @@ Option to suppress the extra spaces in the output json + + + Should forward slashes be escaped? If true, / will be converted to \/ + + @@ -2946,6 +2958,7 @@ + @@ -2972,6 +2985,11 @@ Whether an attribute with empty value should be included in the output + + + Should forward slashes be escaped? If true, / will be converted to \/ + + diff --git a/MP-TAB/WebUserControls/cmp_HwSwInfo.ascx b/MP-TAB/WebUserControls/cmp_HwSwInfo.ascx new file mode 100644 index 00000000..72988522 --- /dev/null +++ b/MP-TAB/WebUserControls/cmp_HwSwInfo.ascx @@ -0,0 +1,158 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_HwSwInfo.ascx.cs" Inherits="MoonProTablet.WebUserControls.cmp_HwSwInfo" %> +<%--

SteamWare's Hw & Sw Info Page

--%> +
+
+
+
+
+
+ +
+
+
+
+
+
+
+
Module
+
+

<%: SteamWare.memLayer.ML.confReadString("CodModulo") %>

+
+
+
+
.net framework
+
+

<%: SteamWare.HwSwInfo.man(System.Reflection.Assembly.GetExecutingAssembly()).runtimeImg %>

+
+
+
+
Main Assembly
+
+

<%: SteamWare.HwSwInfo.man(System.Reflection.Assembly.GetExecutingAssembly()).mainAssembly %>

+
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+
Server Stats
+
+

+

<%: SteamWare.HwSwInfo.man(System.Reflection.Assembly.GetExecutingAssembly()).ServerStats %>
+

+
+
+
+
IIS Stats
+
+

+

<%: SteamWare.HwSwInfo.man(System.Reflection.Assembly.GetExecutingAssembly()).IISStats %>
+

+
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+
Redis Servers Data
+
+

+

<%: SteamWare.HwSwInfo.man(System.Reflection.Assembly.GetExecutingAssembly()).redisServersData %>
+

+
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+
Browser size data
+
+

+

<%: SteamWare.HwSwInfo.man(System.Reflection.Assembly.GetExecutingAssembly()).paretoBrowserSize %>
+

+
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+
Elenco librerie
+ <%: SteamWare.HwSwInfo.man(System.Reflection.Assembly.GetExecutingAssembly()).numLibraries %> +
+

+

<%: SteamWare.HwSwInfo.man(System.Reflection.Assembly.GetExecutingAssembly()).librariesVers %>
+

+
+
+
+
+
+
+
+
+ +
+
+
+
+

+

+

+
+
+
+
+
+
\ No newline at end of file diff --git a/MP-TAB/WebUserControls/cmp_HwSwInfo.ascx.cs b/MP-TAB/WebUserControls/cmp_HwSwInfo.ascx.cs new file mode 100644 index 00000000..99fc5eca --- /dev/null +++ b/MP-TAB/WebUserControls/cmp_HwSwInfo.ascx.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace MoonProTablet.WebUserControls +{ + public partial class cmp_HwSwInfo : System.Web.UI.UserControl + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/MP-TAB/WebUserControls/cmp_HwSwInfo.ascx.designer.cs b/MP-TAB/WebUserControls/cmp_HwSwInfo.ascx.designer.cs new file mode 100644 index 00000000..a0aacef3 --- /dev/null +++ b/MP-TAB/WebUserControls/cmp_HwSwInfo.ascx.designer.cs @@ -0,0 +1,80 @@ +//------------------------------------------------------------------------------ +// +// 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.WebUserControls +{ + + + public partial class cmp_HwSwInfo + { + + /// + /// Controllo lbtGrp01. + /// + /// + /// 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.LinkButton lbtGrp01; + + /// + /// Controllo LinkButton1. + /// + /// + /// 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.LinkButton LinkButton1; + + /// + /// Controllo LinkButton2. + /// + /// + /// 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.LinkButton LinkButton2; + + /// + /// Controllo LinkButton3. + /// + /// + /// 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.LinkButton LinkButton3; + + /// + /// Controllo lbtGrp02. + /// + /// + /// 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.LinkButton lbtGrp02; + + /// + /// Controllo lbtGrp03. + /// + /// + /// 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.LinkButton lbtGrp03; + + /// + /// Controllo lblOut. + /// + /// + /// 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.Label lblOut; + } +} diff --git a/MP-TAB/packages.config b/MP-TAB/packages.config index 6bdf6447..f779a0e8 100644 --- a/MP-TAB/packages.config +++ b/MP-TAB/packages.config @@ -30,15 +30,16 @@ - - + + + - +