Egalware/NKC
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix display riga udpate molesta, refresh packs

Browse Source
This commit is contained in:
Samuele Locatelli
2022-02-05 10:52:38 +01:00
parent b4be07e07b
commit 4dd0f37e3d
8 changed files with 69 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AppData/AppData.csproj
-3
View File
@@ -42,9 +42,6 @@
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="AegisImplicitMail, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\AIM.1.1.0\lib\netstandard2.0\AegisImplicitMail.dll</HintPath>
</Reference>
<Reference Include="AjaxControlToolkit, Version=20.1.0.0, Culture=neutral, PublicKeyToken=28f01b0e84b6d53e, processorArchitecture=MSIL">
<HintPath>..\packages\AjaxControlToolkit.20.1.0\lib\net40\AjaxControlToolkit.dll</HintPath>
</Reference>
AppData/packages.config
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="AIM" version="1.1.0" targetFramework="net462" />
<package id="AIM" version="1.1.1" targetFramework="net462" />
<package id="AjaxControlToolkit" version="20.1.0" targetFramework="net462" />
<package id="Crc32C.NET" version="1.0.5.0" targetFramework="net462" />
<package id="DnsClient" version="1.6.0" targetFramework="net462" />
NKC_WF/Site.Master
-9
View File
@@ -49,15 +49,6 @@
</Scripts>
</asp:ScriptManager>
<uc1:cmp_menuTop runat="server" ID="cmp_menuTop" />
<%--<asp:UpdateProgress ID="UpdateProgressDisplay" runat="server" DisplayAfter="3">
<ProgressTemplate>
<div class=" mx-3">
<div class="progress">
<div class="progress-bar bg-success progress-bar-striped progress-bar-animated" style="width: 70%"></div>
</div>
</div>
</ProgressTemplate>
</asp:UpdateProgress>--%>
<div class="container-flow">
<asp:ContentPlaceHolder ID="MainContent" runat="server">
</asp:ContentPlaceHolder>
NKC_WF/WebUserControls/cmp_footer.ascx
+1 -1
View File
@@ -14,7 +14,7 @@
<asp:Label runat="server" ID="lblApp" Text="." />
</div>
<div class="px-1">
<asp:UpdateProgress ID="UpdateProgressDisplay" runat="server" DisplayAfter="0">
<asp:UpdateProgress ID="UpdateProgressDisplay" runat="server" DisplayAfter="100">
<ProgressTemplate>
<i class="fa fa-circle-o-notch fa-spin fa-fw" aria-hidden="true"></i>
<i class="fa fa-circle-o-notch fa-spin fa-fw" aria-hidden="true"></i>
NKC_WF/WebUserControls/cmp_menuTop.ascx.designer.cs
Generated
+9
View File
@@ -41,6 +41,15 @@ namespace NKC_WF.WebUserControls
/// </remarks>
protected global::System.Web.UI.WebControls.XmlDataSource XmlMenu;
/// <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>
/// divSearch control.
/// </summary>
NKC_WF/site/PlannerReports.aspx
+39 -28
View File
@@ -6,38 +6,49 @@
<%@ Register Src="~/WebUserControls/cmp_DailyStatsList.ascx" TagPrefix="uc1" TagName="cmp_DailyStatsList" %>
<asp:Content ID="Content1" ContentPlaceHolderID="MainContent" runat="server">
<div class="my-2 mx-3">
<div class="row">
<div class="col-12">
<div class="card">
<div class="card-header">
<div class="row">
<div class="col-2">
<h3>Reports</h3>
</div>
<div class="col-9">
<uc1:cmp_reportSelector runat="server" ID="cmp_reportSelector" />
</div>
<div class="col-1">
<asp:LinkButton runat="server" ID="lbtRefreshData" CssClass="btn btn-success" OnClick="lbtRefreshData_Click"><i class="fa fa-refresh" aria-hidden="true"></i> Reload</asp:LinkButton>
</div>
</div>
</div>
<div class="card-body">
<div class="row">
<div class="col-3"></div>
<div class="col-9">
<div class="text-info text-center">
<asp:Label runat="server" ID="lblInstruction" CssClass="alert alert-primary"><i class="fa fa-arrow-up" aria-hidden="true"></i> <%# traduci("PleaseSelectReportType") %><i class="fa fa-arrow-up" aria-hidden="true"></i></asp:Label>
<asp:UpdatePanel runat="server" ID="uplBody">
<ContentTemplate>
<div class="my-2 mx-3">
<div class="row">
<div class="col-12">
<div class="card">
<div class="card-header">
<div class="row">
<div class="col-2">
<h3>Reports</h3>
</div>
<div class="col-9">
<uc1:cmp_reportSelector runat="server" ID="cmp_reportSelector" />
<asp:UpdateProgress ID="UpdateProgressDisplay" runat="server" DisplayAfter="100">
<ProgressTemplate>
<div class="progress">
<div class="progress-bar bg-success progress-bar-striped progress-bar-animated" style="width: 70%"></div>
</div>
</ProgressTemplate>
</asp:UpdateProgress>
</div>
<div class="col-1">
<asp:LinkButton runat="server" ID="lbtRefreshData" CssClass="btn btn-success" OnClick="lbtRefreshData_Click"><i class="fa fa-refresh" aria-hidden="true"></i> Reload</asp:LinkButton>
</div>
</div>
</div>
<div class="card-body">
<div class="row">
<div class="col-3"></div>
<div class="col-9">
<div class="text-info text-center">
<asp:Label runat="server" ID="lblInstruction" CssClass="alert alert-primary"><i class="fa fa-arrow-up" aria-hidden="true"></i> <%# traduci("PleaseSelectReportType") %><i class="fa fa-arrow-up" aria-hidden="true"></i></asp:Label>
</div>
</div>
</div>
<uc1:cmp_SheetsStats runat="server" ID="cmp_SheetsStats" />
<uc1:cmp_BatchStatsList runat="server" ID="cmp_BatchStatsList" />
<uc1:cmp_DailyStatsList runat="server" ID="cmp_DailyStatsList" />
</div>
</div>
<uc1:cmp_SheetsStats runat="server" ID="cmp_SheetsStats" />
<uc1:cmp_BatchStatsList runat="server" ID="cmp_BatchStatsList" />
<uc1:cmp_DailyStatsList runat="server" ID="cmp_DailyStatsList" />
</div>
</div>
</div>
</div>
</div>
</ContentTemplate>
</asp:UpdatePanel>
</asp:Content>
NKC_WF/site/PlannerReports.aspx.cs
+1 -1
View File
@@ -75,7 +75,7 @@ namespace NKC_WF.site
private void TryUpdateModel()
{
Thread.Sleep(10);
Thread.Sleep(50);
DateTime oggi = DateTime.Today;
// verifica se ci sia VETO x update da redis
string rawVal = memLayer.ML.getRSV(ComLib.redVetoDayStats);
NKC_WF/site/PlannerReports.aspx.designer.cs
Generated
+18
View File
@@ -14,6 +14,15 @@ namespace NKC_WF.site
public partial class PlannerReports
{
/// <summary>
/// uplBody 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 uplBody;
/// <summary>
/// cmp_reportSelector control.
/// </summary>
@@ -23,6 +32,15 @@ namespace NKC_WF.site
/// </remarks>
protected global::NKC_WF.WebUserControls.cmp_reportSelector cmp_reportSelector;
/// <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>
/// lbtRefreshData control.
/// </summary>