Merge branch 'release/PageMarginFix'

Completato porting conf tag win x test nuovi runners

.gitlab-ci.yml

@@ -88,30 +88,6 @@ test:
   script:
     - dotnet test -p:Configuration=Release GWMS.UI/GWMS.UI.csproj 
 
-# IIS01:deploy:
-#   stage: deploy
-#   only:
-#     - develop
-#   needs: ["test"]
-#   # before_script:
-#   #   - *nuget-fix
-#   #   - dotnet restore
-#   script: 
-#     - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true GWMS.UI/GWMS.UI.csproj
-
-
-# IIS02:deploy:
-#   stage: deploy
-#   only:
-#     - master
-#   needs: ["build"]
-#   # before_script:
-#   #   - *nuget-fix
-#   #   - dotnet restore
-#   script: 
-#     - dotnet publish -p:PublishProfile=IIS02.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true GWMS.UI/GWMS.UI.csproj
-#     - dotnet publish -p:PublishProfile=W2019-IIS-DEVProfile.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true GWMS.UI/GWMS.UI.csproj
-
 installer:
   stage: installer
   tags:

.vscode/launch.json

@@ -0,0 +1,35 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            // Use IntelliSense to find out which attributes exist for C# debugging
+            // Use hover for the description of the existing attributes
+            // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
+            "name": ".NET Core Launch (web)",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "build",
+            // If you have changed target frameworks, make sure to update the program path.
+            "program": "${workspaceFolder}/GWMS.UI/bin/Debug/net5.0/GWMS.UI.dll",
+            "args": [],
+            "cwd": "${workspaceFolder}/GWMS.UI",
+            "stopAtEntry": false,
+            // Enable launching a web browser when ASP.NET Core starts. For more information: https://aka.ms/VSCode-CS-LaunchJson-WebBrowser
+            "serverReadyAction": {
+                "action": "openExternally",
+                "pattern": "\\bNow listening on:\\s+(https?://\\S+)"
+            },
+            "env": {
+                "ASPNETCORE_ENVIRONMENT": "Development"
+            },
+            "sourceFileMap": {
+                "/Views": "${workspaceFolder}/Views"
+            }
+        },
+        {
+            "name": ".NET Core Attach",
+            "type": "coreclr",
+            "request": "attach"
+        }
+    ]
+}

.vscode/tasks.json

@@ -0,0 +1,42 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "build",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "build",
+                "${workspaceFolder}/GWMS.UI/GWMS.UI.csproj",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "publish",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "publish",
+                "${workspaceFolder}/GWMS.UI/GWMS.UI.csproj",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "watch",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "watch",
+                "run",
+                "${workspaceFolder}/GWMS.UI/GWMS.UI.csproj",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "problemMatcher": "$msCompile"
+        }
+    ]
+}

GWMS.Data/GWMSContext.cs

@@ -34,7 +34,9 @@ namespace GWMS.Data
                 Database.Migrate();
             }
             catch (Exception exc)
-            { }
+            {
+                Log.Error(exc, "Exception during context initialization 01");
+            }
         }
 
         public GWMSContext(DbContextOptions<GWMSContext> options) : base(options)
@@ -45,7 +47,9 @@ namespace GWMS.Data
                 Database.Migrate();
             }
             catch (Exception exc)
-            { }
+            {
+                Log.Error(exc, "Exception during context initialization 02");
+            }
         }
 
         #endregion Public Constructors

GWMS.UI/App.razor.bak

@@ -1,10 +0,0 @@
-<Router AppAssembly="@typeof(Program).Assembly" PreferExactMatches="@true">
-    <Found Context="routeData">
-        <RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
-    </Found>
-    <NotFound>
-        <LayoutView Layout="@typeof(MainLayout)">
-            <p>Sorry, there's nothing at this address.</p>
-        </LayoutView>
-    </NotFound>
-</Router>

GWMS.UI/GWMS.UI.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
-    <Version>1.0.2109.0211</Version>
+    <Version>1.0.2109.2218</Version>
     <UserSecretsId>95c9f021-52d1-4390-a670-5810b7b777b0</UserSecretsId>
     <EnableNETAnalyzers>true</EnableNETAnalyzers>
     <RunAnalyzersDuringBuild>true</RunAnalyzersDuringBuild>

GWMS.UI/Pages/Index.razor

@@ -24,22 +24,26 @@
         </div>
     </div>
 </div>
-<div class="row">
-    <div class="col-12 my-lg-5">
-        <SetupDiagnostics></SetupDiagnostics>
-    </div>
-    <div class="col-12 text-center">
-        <img class="img-fluid mb-3" src="./img/LogoPizzaferri.png" />
-        <h4>
-            Sistema di gestione e pianificazione logistica impianti distribuzione metano
-        </h4>
-    </div>
-    <div class="col-12 text-center mt-5">
-        <div class="col-4"></div>
-        <div class="col-4"></div>
-        <div class="col-4 badge badge-pill badge-dark">
-            <div class="px-1">
-                <a class="text-light" href="https://www.egalware.com/" target="_blank">powered by&nbsp;EgalWare <img width="24" class="img-fluid" src="img/LogoBlu.svg" /></a>
+<div class="card">
+    <div class="card-body">
+        <div class="row">
+            <div class="col-12 my-lg-5">
+                <SetupDiagnostics></SetupDiagnostics>
+            </div>
+            <div class="col-12 text-center">
+                <img class="img-fluid mb-3" src="./img/LogoPizzaferri.png" />
+                <h4>
+                    Sistema di gestione e pianificazione logistica impianti distribuzione metano
+                </h4>
+            </div>
+            <div class="col-12 text-center mt-5">
+                <div class="col-4"></div>
+                <div class="col-4"></div>
+                <div class="col-4 badge badge-pill badge-dark">
+                    <div class="px-1">
+                        <a class="text-light" href="https://www.egalware.com/" target="_blank">powered by&nbsp;EgalWare <img width="24" class="img-fluid" src="img/LogoBlu.svg" /></a>
+                    </div>
+                </div>
             </div>
         </div>
     </div>

GWMS.UI/Pages/PlantStatus.razor

@@ -2,7 +2,7 @@
 
 @using GWMS.UI.Components
 
-<div class="row">
+<div class="row mx-0">
     @if (ListRecords == null)
     {
         <div class="col-12">

GWMS.UI/Pages/UserAdmin.razor

@@ -141,9 +141,18 @@
                                 </button>
                             }
                         </td>
-                        <td>@user.Identity.Id.Substring(0, 4)...</td>
-                        @*<td>@user.UserName</td>*@
-                        <td><span class="badge badge-pill @checkSem(user.Identity.EmailConfirmed)" title="Email validata"><span class="oi oi-check" aria-hidden="true"></span></span> @user.Identity.Email</td>
+                        <td>@user.Identity.Id.Substring(0, 8)...</td>
+                        <td>
+                            @if (user.Identity.EmailConfirmed)
+                            {
+                                <span class="badge badge-pill badge-success" title="Email validata"><span class="oi oi-check" aria-hidden="true"></span></span>
+                            }
+                            else
+                            {
+                                <span class="badge badge-pill badge-danger" title="Email NON ancora validata!"><span class="oi oi-check" aria-hidden="true"></span></span>
+                            }
+                            &nbsp;@user.Identity.Email
+                        </td>
                         <td>
                             @ShowRoles(user.Roles)
                         </td>

GWMS.UI/Pages/UserAdmin.razor.cs

@@ -452,11 +452,6 @@ namespace GWMS.UI.Pages
 
         #region Public Methods
 
-        public string checkSem(bool valore)
-        {
-            return valore ? "badge-success" : "badge-danger";
-        }
-
         public void Dispose()
         {
             AppMService.EA_SearchUpdated -= OnSeachUpdated;

GWMS.UI/Shared/MainLayout.razor

@@ -2,6 +2,7 @@
 
 @using GWMS.UI.Data
 @using GWMS.UI.Components
+
 @inject MessageService MessageService
 @implements IDisposable
 

Resources/ChangeLog.html

@@ -1,6 +1,6 @@
 <body>
     <i>GWMS - Gas Warehouse Management System</i>
-    <h4>Versione: 1.0.2109.0211</h4>
+    <h4>Versione: 1.0.2109.2218</h4>
     <br /> Note di rilascio:
     <ul>
         <li>

Resources/VersNum.txt

@@ -1 +1 @@
-1.0.2109.0211
+1.0.2109.2218

Resources/manifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>1.0.2109.0211</version>
+  <version>1.0.2109.2218</version>
   <url>http://nexus.steamware.net/repository/SWS/GWMS/stable/0/GWMS.UI.zip</url>
   <changelog>http://nexus.steamware.net/repository/SWS/GWMS/stable/0/ChangeLog.html</changelog>
   <mandatory>false</mandatory>