Merge branch 'release/RC2'

Rilascio vers produzione con fix QR, fix search user, fix graph

GWMS.UI/Components/CmpFooter.razor

@@ -1,4 +1,4 @@
-<div class="row px-1 text-light">
+<div class="form-row text-light">
     <div class="col-5 pr-0 text-left">
         GWMS <span class="small">v.@version</span>
     </div>

GWMS.UI/Components/CmpTop.razor

@@ -6,14 +6,14 @@
 @inject MessageService AppMessages
 @inject AuthenticationStateProvider AuthenticationStateProvider
 
-<div class="row pt-3">
-    <div class="col-6 col-sm-6 col-lg-4 col-xl-3">
+<div class="form-row pt-3">
+    <div class="col-7 col-md-6 col-lg-4 col-xl-3">
         <LoginDisplay></LoginDisplay>
     </div>
     <div class="col-12 col-lg-4 col-xl-6 d-none d-lg-block text-center h4 text-truncate">
         <span class="@PageIcon" aria-hidden="true"></span> @PageName
     </div>
-    <div class="col-6 col-sm-6 col-lg-4 col-xl-3 text-right">
+    <div class="col-5 col-md-6 col-lg-4 col-xl-3 text-right">
         @if (ShowSearch)
         {
             <SearchMod></SearchMod>

GWMS.UI/Components/LoginDisplay.razor

@@ -8,8 +8,13 @@
             <div class="input-group-prepend">
                 <a title="LogOut" href="Identity/Account/LogOut" class="btn btn-sm btn-danger"><i class="fas fa-sign-out-alt"></i></a>
             </div>
-            <a title="Manage" href="Identity/Account/Manage" class="btn btn-sm btn-outline-dark mx-0 px-1">
-                <i class="fas fa-user-alt"></i>&nbsp;@userName.Substring(0, 10)&nbsp;...
+            <a title="Gestione account @userName" href="Identity/Account/Manage" class="btn btn-sm btn-outline-dark mx-0 px-1">
+                <div class="d-none d-sm-block">
+                    <i class="fas fa-user-alt"></i> @StringLim(userName, 30)
+                </div>
+                <div class="d-block d-sm-none">
+                    <i class="fas fa-user-alt"></i> @StringLim(userName, 15)
+                </div>
             </a>
         </div>
     </Authorized>
@@ -48,4 +53,9 @@
         }
     }
 
+    protected string StringLim(string original, int maxLen)
+    {
+        return original.Length <= maxLen ? original : $"{original.Substring(0, maxLen - 3)}...";
+    }
+
 }

GWMS.UI/GWMS.UI.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
-    <Version>1.0.2108.2618</Version>
+    <Version>1.0.2108.2619</Version>
     <UserSecretsId>95c9f021-52d1-4390-a670-5810b7b777b0</UserSecretsId>
   </PropertyGroup>
 

GWMS.UI/Pages/Transporters.razor

@@ -8,15 +8,15 @@
         <div class="row">
             <div class="col-12">
                 <div class="row">
-                    <div class="col-6 pr-0 col-lg-8 h3">
+                    <div class="col-6 pr-0 col-lg-8 h3 mb-0">
                         Consegne
                     </div>
                     <div class="col-6 col-lg-4">
                         <div class="row">
-                            <div class="col-6 px-1">
+                            <div class="col-6">
                                 <button class="btn btn-sm btn-block btn-secondary" @onclick="() => ToggleFiltPeriod()"><i class="far fa-calendar-alt"></i> <i class="@icnFiltTime"></i></button>
                             </div>
-                            <div class="col-6 px-1">
+                            <div class="col-6">
                                 <button class="btn btn-sm btn-block btn-secondary" @onclick="() => ToggleFiltDest()"><i class="fas fa-gas-pump"></i> <i class="@icnFiltDest"></i></button>
                             </div>
                         </div>
@@ -87,7 +87,7 @@
             </div>
         </div>
     </div>
-    <div class="card-body p-1">
+    <div class="card-body">
         @if (currRecord != null)
         {
             <OrderTranspEditor currItem="@currRecord" DataReset="ResetData" DataUpdated="UpdateData" SupplierId="@currRecord.SupplierId"></OrderTranspEditor>

GWMS.UI/Shared/MainLayout.razor

@@ -11,11 +11,11 @@
     </div>
 
     <CascadingValue Name="ShowSearch" Value=@ShowSearch>
-        <div class="main">
-            <div class="top-row px-0">
+        <div class="main mr-1">
+            <div class="top-row">
                 <CmpTop></CmpTop>
             </div>
-            <div class="content pt-1 pt-lg-2 px-2 mb-5">
+            <div class="content pt-1 pt-lg-2 mb-5">
                 @Body
             </div>
             <div class="fixed-bottom bottom-row">

GWMS.UI/Shared/MainLayout.razor.css

@@ -16,9 +16,9 @@
     background-color: #f7f7f7;
     border-bottom: 1px solid #d6d5d5;
     height: 3.5rem;
+    align-items: center;
     /*justify-content: space-evenly;
     display: flex;*/
-    align-items: center;
 }
 
     .top-row ::deep a, .top-row .btn-link {
@@ -34,37 +34,10 @@
 .bottom-row {
     color: #dedede;
     background-color: #000000;
-    /*border-bottom: 1px solid #313131;*/
-    /*justify-content: flex-end;*/
     height: 2rem;
-    /*display: flex;*/
     align-items: center;
 }
 
-    .bottom-row ::deep a, .top-row .btn-link {
-        white-space: nowrap;
-        margin-left: 1.5rem;
-    }
-
-    .bottom-row a:first-child {
-        overflow: hidden;
-        text-overflow: ellipsis;
-    }
-/*
-@media (max-width: 640.98px) {
-    .top-row:not(.auth) {
-        display: none;
-    }
-
-    .top-row.auth {
-        justify-content: space-between;
-    }
-
-    .top-row a, .top-row .btn-link {
-        margin-left: 0;
-}
-}*/
-
 @media (min-width: 641px) {
     .page {
         flex-direction: row;

Resources/ChangeLog.html

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

Resources/VersNum.txt

@@ -1 +1 @@
-1.0.2108.2618
+1.0.2108.2619

Resources/manifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>1.0.2108.2618</version>
+  <version>1.0.2108.2619</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>