diff --git a/GWMS.UI/Components/OrderAdminEditor.razor b/GWMS.UI/Components/OrderAdminEditor.razor index 71b966e..6e917e5 100644 --- a/GWMS.UI/Components/OrderAdminEditor.razor +++ b/GWMS.UI/Components/OrderAdminEditor.razor @@ -87,7 +87,7 @@
-
+
@@ -95,7 +95,7 @@
- kg + kg
@@ -169,15 +169,15 @@
-
+
- +
- kg + kg
diff --git a/GWMS.UI/Controllers/IOBController.cs b/GWMS.UI/Controllers/IOBController.cs index 7a1860c..73c5c1a 100644 --- a/GWMS.UI/Controllers/IOBController.cs +++ b/GWMS.UI/Controllers/IOBController.cs @@ -826,7 +826,6 @@ namespace GWMS.UI.Controllers [HttpPost("saveConf/{id}")] public async Task saveConf(string id, [FromBody] System.Text.Json.JsonElement rawQuery) { - //Log.Debug($"Chiamata saveConf | {id}"); // problema deserializzaizone ENUM con classe nuova dotnet 5: // https://github.com/graphql-dotnet/graphql-dotnet/issues/1439 diff --git a/GWMS.UI/GWMS.UI.csproj b/GWMS.UI/GWMS.UI.csproj index a18ecd1..790f44b 100644 --- a/GWMS.UI/GWMS.UI.csproj +++ b/GWMS.UI/GWMS.UI.csproj @@ -2,7 +2,7 @@ net5.0 - 1.0.2112.2012 + 1.0.2201.2016 95c9f021-52d1-4390-a670-5810b7b777b0 true true diff --git a/GWMS.UI/Pages/PlantAnalisys.razor b/GWMS.UI/Pages/PlantAnalisys.razor index a181c44..194d4b4 100644 --- a/GWMS.UI/Pages/PlantAnalisys.razor +++ b/GWMS.UI/Pages/PlantAnalisys.razor @@ -20,7 +20,7 @@
-
+
@@ -123,8 +123,9 @@ Livello Apertura Livello Chiusura Variazione - Versato - Ordine + Ordinato + Versato + Azione @@ -145,7 +146,7 @@ @if (record.HasRefill) { - if (record.HasOrder) + if (record.HasExecution) { @record.LevelMin.ToString("N0") @record.LevelMax.ToString("N0") } @@ -156,14 +157,20 @@ } - - @if (record.QtaConfermata > 0) + + @if (record.HasOrder) { - @record.QtaConfermata.ToString("N0") + @record.QtaOrdinata.ToString("N0") + } + + + @if (record.HasExecution) + { + @record.QtaVersata.ToString("N0") } - @if (record.HasOrder) + @if (record.HasExecution) { @if (currRecord == null) { diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html index 2028e99..3c4b685 100644 --- a/Resources/ChangeLog.html +++ b/Resources/ChangeLog.html @@ -1,6 +1,6 @@ GWMS - Gas Warehouse Management System -

Versione: 1.0.2112.2012

+

Versione: 1.0.2201.2016


Note di rilascio:
  • diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt index f9f6f46..d15a6de 100644 --- a/Resources/VersNum.txt +++ b/Resources/VersNum.txt @@ -1 +1 @@ -1.0.2112.2012 +1.0.2201.2016 diff --git a/Resources/manifest.xml b/Resources/manifest.xml index c1b75b6..2f5e911 100644 --- a/Resources/manifest.xml +++ b/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.0.2112.2012 + 1.0.2201.2016 http://nexus.steamware.net/repository/SWS/GWMS/stable/0/GWMS.UI.zip http://nexus.steamware.net/repository/SWS/GWMS/stable/0/ChangeLog.html false