Merge branch 'master' into develop

2022-10-05 11:04:42 +02:00
parent 2807bd9edc c929e3cf65
commit 9515906e20
8 changed files with 24 additions and 9 deletions
@@ -3,10 +3,20 @@
        
    </div>

-    <div class="px-0 col-6">
+    <div class="px-0 col-8">
        <div class="">
            <div class="px-0 py-1">
-                <div class="px-2 input-group" id="basic-addon1">
+                <div class="px-2 input-group">
+
+                    <label class="input-group-text" for="maxRecord" title="Selezionare il numero massimo di record da visualizzare"><i class="fa-solid fa-list-ol"></i></label>
+                    <select @bind="@selMaxRecord" class="form-select" id="maxRecord" title="Selezionare il numero massimo di record da visualizzare">
+                        <option value="10">10</option>
+                        <option value="25">25</option>
+                        <option value="50">50</option>
+                        <option value="100">100</option>
+                        <option value="250">250</option>
+                        <option value="500">500</option>
+                    </select>
                    <label class="input-group-text" for="macchina" title="Selezionare la macchina"><i class="fa-solid fa-hard-drive"></i></label>
                    <select @bind="@selMacchina" class="form-select" id="macchina" title="Selezionare la macchina">
                        <option value="*">--- Tutti ---</option>
@@ -323,7 +323,7 @@ namespace MP.SPEC.Data
            Stopwatch stopWatch = new Stopwatch();
            stopWatch.Start();
            string readType = "DB";
-            string currKey = $"{redisDossByMac}:{IdxMacchina}";
+            string currKey = $"{redisDossByMac}:{IdxMacchina}:{DtRef:yyyy/MM/dd HH:mm:ss}:{MaxRec}";
            // cerco in redis dato valore sel macchina...
            RedisValue rawData = redisDb.StringGet(currKey);
            if (rawData.HasValue)
@@ -17,7 +17,7 @@

        public string IdxMacchina { get; set; } = "*";

-        public int MaxRecord { get; set; } = 100;
+        public int MaxRecord { get; set; } = 10;

        #endregion Public Properties

@@ -5,7 +5,7 @@
    <Nullable>enable</Nullable>
    <ImplicitUsings>enable</ImplicitUsings>
    <RootNamespace>MP.SPEC</RootNamespace>
-    <Version>6.16.2210.510</Version>
+    <Version>6.16.2210.511</Version>
  </PropertyGroup>

  <ItemGroup>
@@ -11,14 +11,19 @@ namespace MP.SPEC.Pages
        {
            await Task.Delay(1);
            await MDService.FlushRedisCache();
+            // rimando a home
+            NavManager.NavigateTo("", true);
        }

+        [Inject]
+        private NavigationManager NavManager { get; set; } = null!;
+
        #endregion Public Methods

        #region Protected Properties

        [Inject]
-        protected MpDataService MDService { get; set; }
+        protected MpDataService MDService { get; set; } = null!;

        #endregion Protected Properties
    }
@@ -1,6 +1,6 @@
 <body>
    <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2210.510</h4>
+    <h4>Versione: 6.16.2210.511</h4>
    <br /> Note di rilascio:
    <ul>
        <li>
@@ -1 +1 @@
-6.16.2210.510
+6.16.2210.511
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2210.510</version>
+  <version>6.16.2210.511</version>
  <url>https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/MP.SPEC.zip</url>
  <changelog>https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/ChangeLog.html</changelog>
  <mandatory>false</mandatory>