Ok grafici + log, updatepanel NON VA

This commit is contained in:
Samuele Locatelli
2021-10-05 19:15:39 +02:00
parent b401be828f
commit 52a5631675
5 changed files with 18 additions and 26 deletions
+11
View File
@@ -1,6 +1,8 @@
using AppData;
using NKC_SDK;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Globalization;
using System.Linq;
using System.Web;
@@ -57,8 +59,14 @@ namespace NKC_WF.Controllers
/// <returns></returns>
private List<chartJsTSerie> getDataFilt(string id, DateTime StartDate, DateTime EndDate, string PlotType)
{
// effettuo calcolo statistiche
Stopwatch stopWatchLap = new Stopwatch();
stopWatchLap.Start();
List<chartJsTSerie> answ = new List<chartJsTSerie>();
var tabDati = DLMan.taDayStats.GetData(StartDate, EndDate, id, true);
stopWatchLap.Stop();
Log.Instance.Info($"DayStats DB retrieve | machine: {id} | start: {StartDate} | end: {EndDate} | elapsed: {stopWatchLap.Elapsed.TotalMilliseconds} ms");
stopWatchLap.Restart();
DateTime startTime = DateTime.Now.AddYears(1);
// ciclo
foreach (var item in tabDati.OrderBy(x => x.DataOraRif))
@@ -90,6 +98,8 @@ namespace NKC_WF.Controllers
}
answ.Add(new chartJsTSerie() { x = item.DataOraRif, y = value });
}
stopWatchLap.Stop();
Log.Instance.Info($"DayStats data conversion | machine: {id} | start: {StartDate} | end: {EndDate} | elapsed: {stopWatchLap.Elapsed.TotalMilliseconds} ms");
// restituisco
return answ;
}
@@ -138,6 +148,7 @@ namespace NKC_WF.Controllers
List<chartJsTSerie> answ = new List<chartJsTSerie>();
answ = getDataFilt(id, dateStart, dateEnd, PlotType);
// restituisco oggetto!
return answ;
}
@@ -37,7 +37,7 @@
}],
},
animation: {
duration: 250
duration: 150
},
};
@@ -39,7 +39,7 @@
}],
},
animation: {
duration: 250
duration: 150
},
};
+5 -6
View File
@@ -29,18 +29,17 @@
</div>
</div>
</div>
<asp:UpdatePanel ID="upnlLoading" UpdateMode="Conditional" runat="server">
<%--<asp:UpdatePanel ID="upnlLoading" UpdateMode="Always" runat="server">
<ContentTemplate>
<asp:UpdateProgress ID="UpdateProgressDisplay" runat="server" DisplayAfter="5">
<asp:UpdateProgress ID="UpdateProgressDisplay" runat="server" DisplayAfter="1">
<ProgressTemplate>
<div class="alert alert-primary">
<i class="fa fa-download" aria-hidden="true"></i><i class="fa fa-circle-o-notch fa-spin" aria-hidden="true"></i>
<div class="progress-bar progress-bar-striped progress-bar-animated" style="width: 50%"></div>
<div class="alert alert-primary text-center">
<i class="fa fa-5x fa-circle-o-notch fa-spin" aria-hidden="true"></i>
</div>
</ProgressTemplate>
</asp:UpdateProgress>
</ContentTemplate>
</asp:UpdatePanel>
</asp:UpdatePanel>--%>
<uc1:cmp_SheetsStats runat="server" ID="cmp_SheetsStats" />
<uc1:cmp_BatchStatsList runat="server" id="cmp_BatchStatsList" />
<uc1:cmp_DailyStatsList runat="server" id="cmp_DailyStatsList" />
-18
View File
@@ -32,24 +32,6 @@ namespace NKC_WF.site
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblInstruction;
/// <summary>
/// upnlLoading control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.UpdatePanel upnlLoading;
/// <summary>
/// UpdateProgressDisplay control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.UpdateProgress UpdateProgressDisplay;
/// <summary>
/// cmp_SheetsStats control.
/// </summary>