? SearchRecords = null;
+
private bool sortAsc = true;
+
private string sortField = "";
#endregion Private Fields
@@ -249,7 +271,9 @@ namespace MagMan.UI.Components
}
private bool isLoading { get; set; } = false;
+
private MaterialModel materialSel { get; set; } = new MaterialModel();
+
private int numRecord { get; set; } = 10;
#endregion Private Properties
@@ -262,6 +286,11 @@ namespace MagMan.UI.Components
await ReloadData();
}
+ private bool hasDecimal(decimal num)
+ {
+ return (num - Math.Round(num) != 0);
+ }
+
private async Task ReloadData()
{
isLoading = true;
diff --git a/MagMan.UI/Components/MaterialMan.razor b/MagMan.UI/Components/MaterialMan.razor
index 161963b..fbb7986 100644
--- a/MagMan.UI/Components/MaterialMan.razor
+++ b/MagMan.UI/Components/MaterialMan.razor
@@ -112,7 +112,14 @@
|
@if (item.IsBeam)
{
- @($"{item.WMm:N2}")
+ @if (hasDecimal(item.WMm))
+ {
+ @($"{item.WMm:N2}")
+ }
+ else
+ {
+ @($"{item.WMm:N0}")
+ }
}
else
{
@@ -120,7 +127,14 @@
}
|
- @($"{item.HMm:N2}")
+ @if(hasDecimal(item.HMm))
+ {
+ @($"{item.HMm:N2}")
+ }
+ else
+ {
+ @($"{item.HMm:N0}")
+ }
|
@if (MaterialId == 0)
{
diff --git a/MagMan.UI/Components/MaterialMan.razor.cs b/MagMan.UI/Components/MaterialMan.razor.cs
index 67f42e4..0adaec8 100644
--- a/MagMan.UI/Components/MaterialMan.razor.cs
+++ b/MagMan.UI/Components/MaterialMan.razor.cs
@@ -214,6 +214,11 @@ namespace MagMan.UI.Components
await ReloadData();
}
+ private bool hasDecimal(decimal num)
+ {
+ return (num - Math.Round(num) != 0);
+ }
+
private async void QueUpdAliasMat_EA_NewMessage(object? sender, EventArgs e)
{
// verifico se il messaggio sia per la mia KEY e nel caso --> refresh!
diff --git a/MagMan.UI/MagMan.UI.csproj b/MagMan.UI/MagMan.UI.csproj
index 41c449b..6431e4e 100644
--- a/MagMan.UI/MagMan.UI.csproj
+++ b/MagMan.UI/MagMan.UI.csproj
@@ -2,7 +2,7 @@
net6.0
- 1.0.2407.0308
+ 1.0.2407.0314
enable
enable
true
diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html
index e28a924..5f6795e 100644
--- a/Resources/ChangeLog.html
+++ b/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
MagMan - Wood Warehouse Management System
- Versione: 1.0.2407.0308
+ Versione: 1.0.2407.0314
Note di rilascio:
-
diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt
index d37c98e..a1667eb 100644
--- a/Resources/VersNum.txt
+++ b/Resources/VersNum.txt
@@ -1 +1 @@
-1.0.2407.0308
+1.0.2407.0314
diff --git a/Resources/manifest.xml b/Resources/manifest.xml
index 3331b4d..d372811 100644
--- a/Resources/manifest.xml
+++ b/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 1.0.2407.0308
+ 1.0.2407.0314
http://nexus.steamware.net/repository/SWS/MagMan/stable/0/MagMan.UI.zip
http://nexus.steamware.net/repository/SWS/MagMan/stable/0/ChangeLog.html
false