From 4dd0f37e3dcbadc26441f69a116d9cc5d7e138e2 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Sat, 5 Feb 2022 10:52:38 +0100 Subject: [PATCH] Fix display riga udpate molesta, refresh packs --- AppData/AppData.csproj | 3 - AppData/packages.config | 2 +- NKC_WF/Site.Master | 9 --- NKC_WF/WebUserControls/cmp_footer.ascx | 2 +- .../cmp_menuTop.ascx.designer.cs | 9 +++ NKC_WF/site/PlannerReports.aspx | 67 +++++++++++-------- NKC_WF/site/PlannerReports.aspx.cs | 2 +- NKC_WF/site/PlannerReports.aspx.designer.cs | 18 +++++ 8 files changed, 69 insertions(+), 43 deletions(-) diff --git a/AppData/AppData.csproj b/AppData/AppData.csproj index 61caf92..493604d 100644 --- a/AppData/AppData.csproj +++ b/AppData/AppData.csproj @@ -42,9 +42,6 @@ MinimumRecommendedRules.ruleset - - ..\packages\AIM.1.1.0\lib\netstandard2.0\AegisImplicitMail.dll - ..\packages\AjaxControlToolkit.20.1.0\lib\net40\AjaxControlToolkit.dll diff --git a/AppData/packages.config b/AppData/packages.config index 9029809..df0d29c 100644 --- a/AppData/packages.config +++ b/AppData/packages.config @@ -1,6 +1,6 @@  - + diff --git a/NKC_WF/Site.Master b/NKC_WF/Site.Master index 5cac412..4811a9e 100644 --- a/NKC_WF/Site.Master +++ b/NKC_WF/Site.Master @@ -49,15 +49,6 @@ - <%-- - -
-
-
-
-
-
-
--%>
diff --git a/NKC_WF/WebUserControls/cmp_footer.ascx b/NKC_WF/WebUserControls/cmp_footer.ascx index 8f003c2..802af75 100644 --- a/NKC_WF/WebUserControls/cmp_footer.ascx +++ b/NKC_WF/WebUserControls/cmp_footer.ascx @@ -14,7 +14,7 @@
- + diff --git a/NKC_WF/WebUserControls/cmp_menuTop.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_menuTop.ascx.designer.cs index d112da0..b9e4460 100644 --- a/NKC_WF/WebUserControls/cmp_menuTop.ascx.designer.cs +++ b/NKC_WF/WebUserControls/cmp_menuTop.ascx.designer.cs @@ -41,6 +41,15 @@ namespace NKC_WF.WebUserControls /// protected global::System.Web.UI.WebControls.XmlDataSource XmlMenu; + /// + /// UpdateProgressDisplay control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.UpdateProgress UpdateProgressDisplay; + /// /// divSearch control. /// diff --git a/NKC_WF/site/PlannerReports.aspx b/NKC_WF/site/PlannerReports.aspx index d835932..f58476d 100644 --- a/NKC_WF/site/PlannerReports.aspx +++ b/NKC_WF/site/PlannerReports.aspx @@ -6,38 +6,49 @@ <%@ Register Src="~/WebUserControls/cmp_DailyStatsList.ascx" TagPrefix="uc1" TagName="cmp_DailyStatsList" %> -
-
-
-
-
-
-
-

Reports

-
-
- -
-
- Reload -
-
-
-
-
-
-
-
- <%# traduci("PleaseSelectReportType") %> + + +
+
+
+
+
+
+
+

Reports

+
+
+ + + +
+
+
+
+
+
+
+ Reload +
+
+
+
+
+
+ <%# traduci("PleaseSelectReportType") %> +
+
+
+ + + +
- - -
-
-
+ + diff --git a/NKC_WF/site/PlannerReports.aspx.cs b/NKC_WF/site/PlannerReports.aspx.cs index 9d8ff88..2baa2a7 100644 --- a/NKC_WF/site/PlannerReports.aspx.cs +++ b/NKC_WF/site/PlannerReports.aspx.cs @@ -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); diff --git a/NKC_WF/site/PlannerReports.aspx.designer.cs b/NKC_WF/site/PlannerReports.aspx.designer.cs index 58148b8..637eaca 100644 --- a/NKC_WF/site/PlannerReports.aspx.designer.cs +++ b/NKC_WF/site/PlannerReports.aspx.designer.cs @@ -14,6 +14,15 @@ namespace NKC_WF.site public partial class PlannerReports { + /// + /// uplBody control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.UpdatePanel uplBody; + /// /// cmp_reportSelector control. /// @@ -23,6 +32,15 @@ namespace NKC_WF.site /// protected global::NKC_WF.WebUserControls.cmp_reportSelector cmp_reportSelector; + /// + /// UpdateProgressDisplay control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.UpdateProgress UpdateProgressDisplay; + /// /// lbtRefreshData control. ///