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

correzione gestioen statistiche browser

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-03-07 17:11:40 +01:00
parent da9b663a4a
commit ea58dc30c8
3 changed files with 40 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -17,7 +17,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=675']) {
withEnv(['NEXT_BUILD_NUMBER=676']) {
// env.versionNumber = VersionNumber(versionNumberString : '4.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '4.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO'
MP-Tablet/About.aspx
+38 -39
View File
@@ -3,20 +3,19 @@
<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
<div class="container my-3">
<h3 class="card-title text-uppercase">SteamWare's stats page</h3>
<div id="accordion">
<div class="card bg-dark">
<div class="card-header" 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
<p class="mb-0">
<asp:LinkButton runat="server" ID="lbtGrp01" class="btn btn-link collapsed p-0" data-toggle="collapse" data-target="#collapse04" aria-expanded="true" aria-controls="collapse04">
<b>Global data</b>
</asp:LinkButton>
</h5>
</p>
</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="list-group-item bg-secondary">
<div class="d-flex w-100 justify-content-between">
<h5 class="mb-1">Module</h5>
<%--<small>3 days ago</small>--%>
@@ -24,7 +23,7 @@
<p class="mb-1"><%: SteamWare.memLayer.ML.confReadString("CodModulo") %></p>
<%--<small>Altro.</small>--%>
</div>
<div class="list-group-item">
<div class="list-group-item bg-secondary">
<div class="d-flex w-100 justify-content-between">
<h5 class="mb-1">.net framework</h5>
<%--<small>3 days ago</small>--%>
@@ -32,7 +31,7 @@
<p class="mb-1"><%: runtimeImg %></p>
<%--<small>Donec id elit non mi porta.</small>--%>
</div>
<div class="list-group-item">
<div class="list-group-item bg-secondary">
<div class="d-flex w-100 justify-content-between">
<h5 class="mb-1">Main Assembly</h5>
<%--<small>3 days ago</small>--%>
@@ -46,32 +45,32 @@
</div>
<div class="card bg-dark">
<div class="card-header" 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)
<p class="mb-0">
<asp:LinkButton runat="server" ID="LinkButton1" class="btn btn-link collapsed p-0" data-toggle="collapse" data-target="#collapse01" aria-expanded="true" aria-controls="collapse01">
<b>Stats (Server, IIS, APP)</b>
</asp:LinkButton>
</h5>
</p>
</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="list-group-item bg-secondary">
<div class="d-flex w-100 justify-content-between">
<h5 class="mb-1">Server Stats</h5>
<%--<small>3 days ago</small>--%>
</div>
<p class="mb-1">
<pre><%: ServerStats %></pre>
<pre class="bg-secondary text-warning"><%: ServerStats %></pre>
</p>
<%--<small>Donec id elit non mi porta.</small>--%>
</div>
<div class="list-group-item">
<div class="list-group-item bg-secondary">
<div class="d-flex w-100 justify-content-between">
<h5 class="mb-1">IIS Stats</h5>
<%--<small>3 days ago</small>--%>
</div>
<p class="mb-1">
<pre><%: IISStats %></pre>
<pre class="bg-secondary text-warning"><%: IISStats %></pre>
</p>
<%--<small>Donec id elit non mi porta.</small>--%>
</div>
@@ -81,22 +80,22 @@
</div>
<div class="card bg-dark">
<div class="card-header" 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
<p class="mb-0">
<asp:LinkButton runat="server" ID="LinkButton2" class="btn btn-link collapsed p-0" data-toggle="collapse" data-target="#collapse02" aria-expanded="true" aria-controls="collapse02">
<b>Redis Server data</b>
</asp:LinkButton>
</h5>
</p>
</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="list-group-item bg-secondary">
<div class="d-flex w-100 justify-content-between">
<h5 class="mb-1">Redis Servers Data</h5>
<%--<small>3 days ago</small>--%>
</div>
<p class="mb-1">
<pre><%: redisServersData %></pre>
<pre class="bg-secondary text-warning"><%: redisServersData %></pre>
</p>
<%--<small>Donec id elit non mi porta.</small>--%>
</div>
@@ -106,22 +105,22 @@
</div>
<div class="card bg-dark">
<div class="card-header" 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
<p class="mb-0">
<asp:LinkButton runat="server" ID="LinkButton3" class="btn btn-link collapsed p-0" data-toggle="collapse" data-target="#collapse03" aria-expanded="true" aria-controls="collapse03">
<b>Browser data</b>
</asp:LinkButton>
</h5>
</p>
</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="list-group-item bg-secondary">
<div class="d-flex w-100 justify-content-between">
<h5 class="mb-1">Browser size data</h5>
<%--<small>3 days ago</small>--%>
</div>
<p class="mb-1">
<pre><%: paretoBrowserSize %></pre>
<pre class="bg-secondary text-warning"><%: paretoBrowserSize %></pre>
</p>
<%--<small>Donec id elit non mi porta.</small>--%>
</div>
@@ -131,22 +130,22 @@
</div>
<div class="card bg-dark">
<div class="card-header" 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
<p class="mb-0">
<asp:LinkButton runat="server" ID="lbtGrp02" class="btn btn-link collapsed p-0" data-toggle="collapse" data-target="#collapse05" aria-expanded="false" aria-controls="collapse05">
<b>Other Libraries</b>
</asp:LinkButton>
</h5>
</p>
</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="list-group-item bg-secondary">
<div class="d-flex w-100 justify-content-between">
<h5 class="mb-1">Elenco librerie</h5>
<span><%: numLibraries %></span>
</div>
<p class="mb-1">
<pre style="width: 100%; white-space: pre-wrap;"><%: librariesVers %></pre>
<pre class="bg-secondary text-warning"><%: librariesVers %></pre>
</p>
<%--<small>Altro.</small>--%>
</div>
@@ -156,16 +155,16 @@
</div>
<div class="card bg-dark">
<div class="card-header" 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
<p class="mb-0">
<asp:LinkButton runat="server" ID="lbtGrp03" class="btn btn-link collapsed p-0" data-toggle="collapse" data-target="#collapse06" aria-expanded="false" aria-controls="collapse06">
<b>Reset Results</b>
</asp:LinkButton>
</h5>
</p>
</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>
<pre class="bg-secondary text-warning"><asp:Label ID="lblOut" runat="server" /></pre>
</p>
</div>
</div>
MP-Tablet/windowSize.ashx.cs
+1 -1
View File
@@ -27,7 +27,7 @@ namespace MoonProTablet
context.Session["BrowserWidth"] = context.Request.QueryString["Width"];
context.Session["BrowserHeight"] = context.Request.QueryString["Height"];
// salva in REDIS come conteggio INCREMENTALE...
if (memLayer.ML.CRB("SC_RedEnab"))
if (memLayer.ML.CRB("RedEnab"))
{
string memName = string.Format("COUNT:wh:{0}x{1}", context.Request.QueryString["Width"], context.Request.QueryString["Height"]);
// conto +1 x la size nel contatore REDIS