Egalware/gwms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update visualizzazione plant analisys x ordini e versato e editing

Browse Source
This commit is contained in:
Samuele Locatelli
2022-01-20 16:22:45 +01:00
parent 74e438aa99
commit f63d7ba3ba
7 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GWMS.UI/Components/OrderAdminEditor.razor
+5 -5
View File
@@ -87,7 +87,7 @@
</div>
</div>
<div class="col-3 pl-0 mt-2">
<div class="input-group">
<div class="input-group" title="Ordinato">
<div class="input-group-prepend">
<span class="input-group-text">
<span class="fas fa-cart-plus" title="Ordinato"></span>
@@ -95,7 +95,7 @@
</div>
<InputNumber @bind-Value="@_currItem.OrderQty" class="form-control"></InputNumber>
<div class="input-group-append">
<span class="input-group-text" title="Ordinato">kg</span>
<span class="input-group-text">kg</span>
</div>
</div>
</div>
@@ -169,15 +169,15 @@
</div>
</div>
<div class="col-12 col-lg-2">
<div class="input-group">
<div class="input-group" title="Versato">
<div class="input-group-prepend">
<span class="input-group-text">
<span class="fas fa-weight" aria-hidden="true" title="Consegnato"></span>
<span class="fas fa-truck-moving" aria-hidden="true"></span>
</span>
</div>
<InputNumber @bind-Value="@_currItem.ExecutionQty" class="form-control"></InputNumber>
<div class="input-group-append">
<span class="input-group-text" title="Consegnato">kg</span>
<span class="input-group-text" title="Versato">kg</span>
</div>
</div>
</div>
GWMS.UI/Controllers/IOBController.cs
-1
View File
@@ -826,7 +826,6 @@ namespace GWMS.UI.Controllers
[HttpPost("saveConf/{id}")]
public async Task<string> 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
GWMS.UI/GWMS.UI.csproj
+1 -1
View File
@@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<Version>1.0.2112.2012</Version>
<Version>1.0.2201.2016</Version>
<UserSecretsId>95c9f021-52d1-4390-a670-5810b7b777b0</UserSecretsId>
<EnableNETAnalyzers>true</EnableNETAnalyzers>
<RunAnalyzersDuringBuild>true</RunAnalyzersDuringBuild>
GWMS.UI/Pages/PlantAnalisys.razor
+15 -8
View File
@@ -20,7 +20,7 @@
<div class="input-group input-group-sm">
<div class="input-group-prepend">
</div>
<div class="custom-control custom-switch">
<div class="custom-control custom-switch" title="Mostra solo Consegne">
<input type="checkbox" class="custom-control-input" id="togRefill" title="Solo con Carichi / Mostra tutti" @bind-value="@ShowOnlyRefill" checked="@ShowOnlyRefill" />
<label class="custom-control-label small" for="togRefill"><sub>Consegne</sub></label>
</div>
@@ -123,8 +123,9 @@
<th>Livello Apertura</th>
<th>Livello Chiusura</th>
<th class="text-right">Variazione <i class="fas fa-arrows-alt-v"></i></th>
<th class="text-right">Versato <i class="fas fa-truck-moving"></i></th>
<th class="text-right">Ordine <i class="fas fa-file"></i></th>
<th class="text-right" title="Quantità Ordinata">Ordinato <i class="fas fa-cart-plus"></i></th>
<th class="text-right" title="Quantità versata">Versato <i class="fas fa-truck-moving"></i></th>
<th class="text-right">Azione <i class="fas fa-file"></i></th>
</tr>
</thead>
<tbody>
@@ -145,7 +146,7 @@
<td class="text-right">
@if (record.HasRefill)
{
if (record.HasOrder)
if (record.HasExecution)
{
<span class="text-success">@record.LevelMin.ToString("N0") <i class="fas fa-sort-amount-up"></i> @record.LevelMax.ToString("N0")</span>
}
@@ -156,14 +157,20 @@
}
</td>
<td class="text-right">
@if (record.QtaConfermata > 0)
<td class="text-right" title="Quantità Ordinata">
@if (record.HasOrder)
{
<b>@record.QtaConfermata.ToString("N0")</b>
<b>@record.QtaOrdinata.ToString("N0")</b>
}
</td>
<td class="text-right" title="Quantità Versata">
@if (record.HasExecution)
{
<b>@record.QtaVersata.ToString("N0")</b>
}
</td>
<td class="text-right">
@if (record.HasOrder)
@if (record.HasExecution)
{
@if (currRecord == null)
{
Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>GWMS - Gas Warehouse Management System</i>
<h4>Versione: 1.0.2112.2012</h4>
<h4>Versione: 1.0.2201.2016</h4>
<br /> Note di rilascio:
<ul>
<li>
Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
1.0.2112.2012
1.0.2201.2016
Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>1.0.2112.2012</version>
<version>1.0.2201.2016</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>