Egalware/MoonPro.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MP-LAND' into develop

Browse Source
This commit is contained in:
Samuele E. Locatelli
2019-11-27 18:55:43 +01:00
parent 094981e910 a3ff4bb496
commit bfd68805bb
7 changed files with 215 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-LAND/Controllers/HomeController.cs
+10
View File
@@ -67,6 +67,16 @@ namespace MP.Controllers
return View();
}
/// <summary>
/// System INFO
/// </summary>
/// <returns></returns>
public ActionResult System()
{
ViewBag.Title = "MAPO System Info";
ViewBag.Message = "HW & SW details";
return View();
}
/// <summary>
/// Gestione download aggiornamenti
/// </summary>
/// <param name="results"></param>
MP-LAND/MP-LAND.csproj
+9 -2
View File
@@ -93,6 +93,12 @@
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<HintPath>..\packages\NLog.4.6.8\lib\net45\NLog.dll</HintPath>
</Reference>
<Reference Include="PdfSharp, Version=1.50.5147.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
<HintPath>..\packages\PDFsharp.1.50.5147\lib\net20\PdfSharp.dll</HintPath>
</Reference>
<Reference Include="PdfSharp.Charting, Version=1.50.5147.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
<HintPath>..\packages\PDFsharp.1.50.5147\lib\net20\PdfSharp.Charting.dll</HintPath>
</Reference>
<Reference Include="Pipelines.Sockets.Unofficial, Version=1.0.0.0, Culture=neutral, PublicKeyToken=42ea0a778e13fbe2, processorArchitecture=MSIL">
<HintPath>..\packages\Pipelines.Sockets.Unofficial.2.1.0\lib\net461\Pipelines.Sockets.Unofficial.dll</HintPath>
</Reference>
@@ -105,8 +111,8 @@
<Reference Include="StackExchange.Redis, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c219ff1ca8c2ce46, processorArchitecture=MSIL">
<HintPath>..\packages\StackExchange.Redis.2.0.601\lib\net461\StackExchange.Redis.dll</HintPath>
</Reference>
<Reference Include="SteamWare, Version=3.4.1911.687, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.3.4.1911.687\lib\net462\SteamWare.dll</HintPath>
<Reference Include="SteamWare, Version=3.5.1911.698, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.3.5.1911.698\lib\net462\SteamWare.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
@@ -389,6 +395,7 @@
<Content Include="Scripts\popper-utils.min.js.map" />
<Content Include="Scripts\popper-utils.js.map" />
<Content Include="Views\Home\ConfigMan.cshtml" />
<Content Include="Views\Home\System.cshtml" />
<None Include="Views\Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</None>
MP-LAND/Views/Home/About.cshtml
+8 -2
View File
@@ -2,10 +2,16 @@
<div class="row">
<div class="col-10 offset-1">
<div class="card">
<div class="card-header">
<div class="card-header text-center">
<h2>@ViewBag.Title</h2>
</div>
<img src="~/images/LogoMapoFull.png" class="img-fluid p-3" />
<div class="row">
<div class="col-3"></div>
<div class="col-6">
<img src="~/images/LogoMapoFull.png" class="img-fluid p-3" />
</div>
<div class="col-3"></div>
</div>
<div class="card-body px-3">
<h4 class="card-title">@ViewBag.Message</h4>
<p>MoonPro / MAPO sono una suite di applicazioni e dispositivi hw dedicati per l'IOT,l'industry 4.0 e la gestione automatizzata dei processi produttivi.</p>
MP-LAND/Views/Home/Contact.cshtml
+8 -2
View File
@@ -2,10 +2,16 @@
<div class="row">
<div class="col-10 offset-1">
<div class="card">
<div class="card-header">
<div class="card-header text-center">
<h2>@ViewBag.Title</h2>
</div>
<img src="~/images/LogoMapoFull.png" class="img-fluid p-3" />
<div class="row">
<div class="col-3"></div>
<div class="col-6">
<img src="~/images/LogoMapoFull.png" class="img-fluid p-3" />
</div>
<div class="col-3"></div>
</div>
<div class="card-body px-3">
<h4 class="card-title">@ViewBag.Message</h4>
MP-LAND/Views/Home/System.cshtml
+174
View File
@@ -0,0 +1,174 @@
<div class="container mt-4">
<div class="row">
<div class="col-10 offset-1">
<div class="card">
<div class="card-header text-center">
<h2>@ViewBag.Title</h2>
</div>
<div class="card-body px-3">
<h4 class="card-title">@ViewBag.Message</h4>
<div class="row">
<div class="col">
<div id="accordion">
<div class="card">
<div class="card-header text-uppercase" id="heading04">
<h5 class="mb-0">
<asp:LinkButton runat="server" ID="lbtGrp01" class="btn btn-link collapsed" data-toggle="collapse" data-target="#collapse04" aria-expanded="true" aria-controls="collapse04">
Global data
</asp:LinkButton>
</h5>
</div>
<div id="collapse04" class="collapse" aria-labelledby="headingOne" data-parent="#accordion">
<div class="card-body">
<div class="list-group">
<div class="list-group-item">
<div class="d-flex w-100 justify-content-between">
<h5 class="mb-1">Module</h5>
</div>
<p class="mb-1">@SteamWare.memLayer.ML.confReadString("CodModulo")</p>
</div>
<div class="list-group-item">
<div class="d-flex w-100 justify-content-between">
<h5 class="mb-1">.net framework</h5>
</div>
<p class="mb-1">@SteamWare.HwSwInfo.man(System.Reflection.Assembly.GetExecutingAssembly()).runtimeImg</p>
</div>
<div class="list-group-item">
<div class="d-flex w-100 justify-content-between">
<h5 class="mb-1">Main Assembly</h5>
</div>
<p class="mb-1">@SteamWare.HwSwInfo.man(System.Reflection.Assembly.GetExecutingAssembly()).mainAssembly</p>
</div>
</div>
</div>
</div>
</div>
<div class="card">
<div class="card-header text-uppercase" id="heading01">
<h5 class="mb-0">
<asp:LinkButton runat="server" ID="LinkButton1" class="btn btn-link collapsed" data-toggle="collapse" data-target="#collapse01" aria-expanded="true" aria-controls="collapse01">
Stats (Server, IIS, APP)
</asp:LinkButton>
</h5>
</div>
<div id="collapse01" class="collapse" aria-labelledby="heading01" data-parent="#accordion">
<div class="card-body">
<div class="list-group">
<div class="list-group-item">
<div class="d-flex w-100 justify-content-between">
<h5 class="mb-1">Server Stats</h5>
</div>
<p class="mb-1">
<pre>@SteamWare.HwSwInfo.man(System.Reflection.Assembly.GetExecutingAssembly()).ServerStats</pre>
</p>
</div>
<div class="list-group-item">
<div class="d-flex w-100 justify-content-between">
<h5 class="mb-1">IIS Stats</h5>
</div>
<p class="mb-1">
<pre>@SteamWare.HwSwInfo.man(System.Reflection.Assembly.GetExecutingAssembly()).IISStats</pre>
</p>
</div>
</div>
</div>
</div>
</div>
<div class="card">
<div class="card-header text-uppercase" id="heading02">
<h5 class="mb-0">
<asp:LinkButton runat="server" ID="LinkButton2" class="btn btn-link collapsed" data-toggle="collapse" data-target="#collapse02" aria-expanded="true" aria-controls="collapse02">
Redis Server data
</asp:LinkButton>
</h5>
</div>
<div id="collapse02" class="collapse" aria-labelledby="heading01" data-parent="#accordion">
<div class="card-body">
<div class="list-group">
<div class="list-group-item">
<div class="d-flex w-100 justify-content-between">
<h5 class="mb-1">Redis Servers Data</h5>
</div>
<p class="mb-1">
<pre>@SteamWare.HwSwInfo.man(System.Reflection.Assembly.GetExecutingAssembly()).redisServersData</pre>
</p>
</div>
</div>
</div>
</div>
</div>
<div class="card">
<div class="card-header text-uppercase" id="heading03">
<h5 class="mb-0">
<asp:LinkButton runat="server" ID="LinkButton3" class="btn btn-link collapsed" data-toggle="collapse" data-target="#collapse03" aria-expanded="true" aria-controls="collapse03">
Browser data
</asp:LinkButton>
</h5>
</div>
<div id="collapse03" class="collapse" aria-labelledby="heading01" data-parent="#accordion">
<div class="card-body">
<div class="list-group">
<div class="list-group-item">
<div class="d-flex w-100 justify-content-between">
<h5 class="mb-1">Browser size data</h5>
</div>
<p class="mb-1">
<pre>@SteamWare.HwSwInfo.man(System.Reflection.Assembly.GetExecutingAssembly()).paretoBrowserSize</pre>
</p>
</div>
</div>
</div>
</div>
</div>
<div class="card">
<div class="card-header text-uppercase" id="heading05">
<h5 class="mb-0">
<asp:LinkButton runat="server" ID="lbtGrp02" class="btn btn-link collapsed" data-toggle="collapse" data-target="#collapse05" aria-expanded="false" aria-controls="collapse05">
Other Libraries
</asp:LinkButton>
</h5>
</div>
<div id="collapse05" class="collapse" aria-labelledby="headingTwo" data-parent="#accordion">
<div class="card-body">
<div class="list-group">
<div class="list-group-item">
<div class="d-flex w-100 justify-content-between">
<h5 class="mb-1">Elenco librerie</h5>
<span>@SteamWare.HwSwInfo.man(System.Reflection.Assembly.GetExecutingAssembly()).numLibraries</span>
</div>
<p class="mb-1">
<pre style="width: 100%; white-space: pre-wrap;">@SteamWare.HwSwInfo.man(System.Reflection.Assembly.GetExecutingAssembly()).librariesVers</pre>
</p>
</div>
</div>
</div>
</div>
</div>
@*<div class="card">
<div class="card-header text-uppercase" id="heading06">
<h5 class="mb-0">
<asp:LinkButton runat="server" ID="lbtGrp03" class="btn btn-link collapsed" data-toggle="collapse" data-target="#collapse06" aria-expanded="false" aria-controls="collapse06">
Reset Results
</asp:LinkButton>
</h5>
</div>
<div id="collapse06" class="collapse" aria-labelledby="headingThree" data-parent="#accordion">
<div class="card-body">
<p class="mb-1">
<pre style="width: 100%; white-space: pre-wrap;"><asp:Label ID="lblOut" runat="server" /></pre>
</p>
</div>
</div>
</div>*@
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
MP-LAND/Views/Shared/_Layout.cshtml
+1
View File
@@ -22,6 +22,7 @@
<li class="nav-item btn btn-outline-info btn-sm mx-1">@Html.ActionLink("web.config import", "ConfigMan", new { controller = "Home" }, new { @class = "nav-link" })</li>
<li class="nav-item btn btn-outline-secondary btn-sm mx-1">@Html.ActionLink("About", "About", new { controller = "Home" }, new { @class = "nav-link" })</li>
<li class="nav-item btn btn-outline-secondary btn-sm mx-1">@Html.ActionLink("Contact", "Contact", new { controller = "Home" }, new { @class = "nav-link" })</li>
<li class="nav-item btn btn-outline-warning btn-sm mx-1">@Html.ActionLink("System Data", "System", new { controller = "Home" }, new { @class = "nav-link" })</li>
</ul>
</div>
</div>
MP-LAND/packages.config
+5 -1
View File
@@ -11,10 +11,13 @@
<package id="jQuery" version="3.4.1" targetFramework="net462" />
<package id="jQuery.Validation" version="1.17.0" targetFramework="net462" />
<package id="Microsoft.AspNet.Mvc" version="5.2.7" targetFramework="net462" />
<package id="Microsoft.AspNet.Mvc.it" version="5.2.7" targetFramework="net462" />
<package id="Microsoft.AspNet.Razor" version="3.2.7" targetFramework="net462" />
<package id="Microsoft.AspNet.Razor.it" version="3.2.7" targetFramework="net462" />
<package id="Microsoft.AspNet.SessionState.SessionStateModule" version="1.1.0" targetFramework="net462" />
<package id="Microsoft.AspNet.Web.Optimization" version="1.1.3" targetFramework="net462" />
<package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net462" />
<package id="Microsoft.AspNet.WebPages.it" version="3.2.7" targetFramework="net462" />
<package id="Microsoft.jQuery.Unobtrusive.Validation" version="3.2.11" targetFramework="net462" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net462" />
<package id="Microsoft.Web.RedisSessionStateProvider" version="4.0.1" targetFramework="net462" />
@@ -24,6 +27,7 @@
<package id="MongoDB.Driver.Core" version="2.9.3" targetFramework="net462" />
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net462" />
<package id="NLog" version="4.6.8" targetFramework="net462" />
<package id="PDFsharp" version="1.50.5147" targetFramework="net462" />
<package id="Pipelines.Sockets.Unofficial" version="2.1.0" targetFramework="net462" />
<package id="popper.js" version="1.14.3" targetFramework="net462" />
<package id="Respond" version="1.4.2" targetFramework="net462" />
@@ -31,7 +35,7 @@
<package id="SharpZipLib" version="1.2.0" targetFramework="net462" />
<package id="Snappy.NET" version="1.1.1.8" targetFramework="net462" />
<package id="StackExchange.Redis" version="2.0.601" targetFramework="net462" />
<package id="SteamWare" version="3.4.1911.687" targetFramework="net462" />
<package id="SteamWare" version="3.5.1911.698" targetFramework="net462" />
<package id="System.Buffers" version="4.5.0" targetFramework="net462" />
<package id="System.Diagnostics.PerformanceCounter" version="4.6.0" targetFramework="net462" />
<package id="System.IO.Pipelines" version="4.6.0" targetFramework="net462" />