Merge branch 'Release/LandFixDownload01'

2024-11-02 11:37:21 +01:00
parent 9bba40c80e ec24aa68c1
commit f65e914093
7 changed files with 23 additions and 8 deletions
@@ -1,5 +1,13 @@
 {
  "version": 1,
  "isRoot": true,
-  "tools": {}
+  "tools": {
+    "dotnet-ef": {
+      "version": "8.0.10",
+      "commands": [
+        "dotnet-ef"
+      ],
+      "rollForward": false
+    }
+  }
 }
@@ -3,7 +3,7 @@
    <PropertyGroup>
        <TargetFramework>net6.0</TargetFramework>
        <RootNamespace>MP.Land</RootNamespace>
-        <Version>6.16.2410.3111</Version>
+        <Version>6.16.2411.0211</Version>
        <Configurations>Debug;Release;Debug_LiManDebug</Configurations>
    </PropertyGroup>

@@ -18,7 +18,7 @@
            <div class="h2">
                ALL Packages
            </div>
-            <button class="btn btn-success w-100" @onclick="() => DownloadAll()"> <i class="fas fa-download"></i> Download ALL Latest <i class="fas fa-download"></i></button>
+            <button class="btn btn-success w-100" @onclick="DownloadAll"> <i class="fas fa-download"></i> Download ALL Latest <i class="fas fa-download"></i></button>
        </div>
    </div>
 </div>
@@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.Configuration;
+using Microsoft.JSInterop;
 using MP.AppAuth;
 using MP.AppAuth.Services;
 using MP.Land.Data;
@@ -104,19 +105,25 @@ namespace MP.Land.Pages
            showUpdate = false;
        }

+        [Inject]
+        protected IJSRuntime JSRuntime { get; set; } = null!;
+
        /// <summary>
        /// Cicla su tutti i record ed effettua il download
        /// </summary>
        protected async Task DownloadAll()
        {
+            if (!await JSRuntime.InvokeAsync<bool>("confirm", "Confermi di voler scaricare tutti gli update? L'operazione potrebbe richiedere alcuni minuti."))
+                return;
+
            // init progress...
            showProgress = true;
            showUpdate = true;
            outMessages = $"Iniziato download per {numSteps} packages";
-            await InvokeAsync(StateHasChanged);
            percLoading = 0;
            TotalMb = 0;
            numApp = 0;
+            await InvokeAsync(StateHasChanged);
            Stopwatch stopWatch = new Stopwatch();
            stopWatch.Start();
            // ciclo su tutti quelli con licenza valida...
@@ -188,8 +195,8 @@ namespace MP.Land.Pages
            showProgress = true;
            showUpdate = true;
            outMessages = $"Inizio preparazione per upload configurazioni di {numSteps} packages";
-            Log.Info(outMessages);
            await InvokeAsync(StateHasChanged);
+            Log.Info(outMessages);
            percLoading = 0;
            TotalMb = 0;
            numApp = 0;
@@ -1,6 +1,6 @@
 <body>
    <i>Modulo Tablet MAPO - DotNet6</i>
-    <h4>Versione: 6.16.2410.3111</h4>
+    <h4>Versione: 6.16.2411.0211</h4>
    <br />
    Note di rilascio:
    <ul>
@@ -1 +1 @@
-6.16.2410.3111
+6.16.2411.0211
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2410.3111</version>
+  <version>6.16.2411.0211</version>
  <url>https://nexus.steamware.net/repository/SWS/MP-LAND/stable/LAST/MP.Land.zip</url>
  <changelog>https://nexus.steamware.net/repository/SWS/MP-LAND/stable/LAST/ChangeLog.html</changelog>
  <mandatory>false</mandatory>