diff --git a/GWMS.UI/GWMS.UI.csproj b/GWMS.UI/GWMS.UI.csproj index feb5e1d..4e95372 100644 --- a/GWMS.UI/GWMS.UI.csproj +++ b/GWMS.UI/GWMS.UI.csproj @@ -2,7 +2,7 @@ net5.0 - 1.0.2201.2112 + 1.0.2201.2611 95c9f021-52d1-4390-a670-5810b7b777b0 true true diff --git a/GWMS.UI/Pages/Index.razor b/GWMS.UI/Pages/Index.razor index 062ab83..b6f2344 100644 --- a/GWMS.UI/Pages/Index.razor +++ b/GWMS.UI/Pages/Index.razor @@ -11,17 +11,21 @@ @attribute [AllowAnonymous] -
+
-
+

GWMS

GAS WareHouse Management System
-
-
- | | | | | +
@@ -32,20 +36,43 @@
-
- -

- Sistema di gestione e pianificazione logistica impianti distribuzione metano -

+
+
+
-
-
-
- +
+
+ + Sistema di gestione e pianificazione logistica impianti distribuzione metano + +
+
+
+
+
+
+ + +
+ + +
Scheda Trasportatore
+
+
+
+
+
+
+ + +
+ + +
Scheda Fornitore
+
+
+
+
diff --git a/GWMS.UI/Pages/UserAdmin.razor.cs b/GWMS.UI/Pages/UserAdmin.razor.cs index 12f1138..f188601 100644 --- a/GWMS.UI/Pages/UserAdmin.razor.cs +++ b/GWMS.UI/Pages/UserAdmin.razor.cs @@ -380,6 +380,7 @@ namespace GWMS.UI.Pages string baseUrl = Configuration["BaseUrl"]; string baseAppPath = Configuration["BaseAppPath"]; + string redirPage = Configuration["QrRedirPage"]; if (!string.IsNullOrEmpty(baseAppPath)) { if (baseUrl.EndsWith("/")) @@ -388,7 +389,7 @@ namespace GWMS.UI.Pages } baseUrl = $"{baseUrl}{baseAppPath}"; } - qrCodeVal = $"{baseUrl}Identity/Account/LogIn?uid={user.Id}&uem={user.Email}&pag=Transporters"; + qrCodeVal = $"{baseUrl}Identity/Account/LogIn?uid={user.Id}&uem={user.Email}&pag={redirPage}"; } }); pUpd.Wait(); diff --git a/GWMS.UI/appsettings.Production.json b/GWMS.UI/appsettings.Production.json index 6f50518..153dff4 100644 --- a/GWMS.UI/appsettings.Production.json +++ b/GWMS.UI/appsettings.Production.json @@ -21,5 +21,6 @@ "ZCodeUrl": "https://qrcode.steamware.net/", "BaseUrl": "https://gwms.egalware.com/", "BaseAppPath": "/pizzaferri/", + "QrRedirPage": "/pizzaferri/", "jumpRedir": "~/../" } \ No newline at end of file diff --git a/GWMS.UI/appsettings.json b/GWMS.UI/appsettings.json index 683b813..3d68f24 100644 --- a/GWMS.UI/appsettings.json +++ b/GWMS.UI/appsettings.json @@ -38,6 +38,7 @@ "ChartWaitDelay": 10, "BaseUrl": "https://localhost:44339/", "BaseAppPath": "", + "QrRedirPage": "", "jumpRedir": "~/../../", "logo": "img/LogoPizzaferri.jpg", "ReloadParamTimer": 15000, diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html index ccedf04..7b75fc7 100644 --- a/Resources/ChangeLog.html +++ b/Resources/ChangeLog.html @@ -1,6 +1,6 @@ GWMS - Gas Warehouse Management System -

Versione: 1.0.2201.2112

+

Versione: 1.0.2201.2611


Note di rilascio:
  • diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt index 8387f5c..7c22246 100644 --- a/Resources/VersNum.txt +++ b/Resources/VersNum.txt @@ -1 +1 @@ -1.0.2201.2112 +1.0.2201.2611 diff --git a/Resources/manifest.xml b/Resources/manifest.xml index 9e20842..ed1a1fb 100644 --- a/Resources/manifest.xml +++ b/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.0.2201.2112 + 1.0.2201.2611 http://nexus.steamware.net/repository/SWS/GWMS/stable/0/GWMS.UI.zip http://nexus.steamware.net/repository/SWS/GWMS/stable/0/ChangeLog.html false