UPDATE: view of NettoWeight - DeviceControl

Author: BaggerFast

Src/Apps/Desktop/ScalesDesktop/Source/Features/LabelPrint.razor.cs

@@ -70,7 +70,7 @@ private async Task PrintLabelAsync()
         {
             Kneading = LabelContext.KneadingModel.KneadingCount,
             ProductDt = GetProductDt(LabelContext.KneadingModel.ProductDate),
-            WeightNet = (decimal)LabelContext.KneadingModel.NetWeightG / 1000,
+            WeightNet = LabelContext.KneadingModel.NetWeight,
             WeightTare = LabelContext.Plu?.TareWeight ?? 0
         };
 
@@ -123,13 +123,9 @@ private bool ValidateScalesStatus()
             return false;
         }
 
-        if (((decimal)LabelContext.KneadingModel.NetWeightG / 1000 - LabelContext.Plu?.TareWeight ?? 0) < 0)
-        {
-            ToastService.ShowWarning(Localizer["ScalesStatusTooLight"]);
-            return false;
-        }
-
-        return true;
+        if (LabelContext.KneadingModel.NetWeight >= 0) return true;
+        ToastService.ShowWarning(Localizer["ScalesStatusTooLight"]);
+        return false;
     }
 
     private static DateTime GetProductDt(DateTime time) =>

Src/Apps/Desktop/ScalesDesktop/Source/Shared/Models/WeightKneadingModel.cs

@@ -2,7 +2,7 @@ namespace ScalesDesktop.Source.Shared.Models;
 
 public class WeightKneadingModel
 {
-    public int NetWeightG { get; set; }
+    public decimal NetWeight { get; set; }
     public DateTime ProductDate { get; set; } = DateTime.Now;
     public ushort KneadingCount { get; set; } = 1;
 }

Src/Apps/Desktop/ScalesDesktop/Source/Widgets/LabelDisplay/LabelDisplayNetWeight.razor

@@ -1,4 +1,5 @@
 @using MassaK.Plugin.Abstractions.Enums
+@using Ws.Shared.Extensions
 
 <LabelDisplayItem Label="@WsDataLocalizer["ColNetWeight"]">
   @if (ScalesService.Status == MassaKStatus.Initializing)
@@ -10,14 +11,9 @@
     <div class="text-[2rem] flex items-end mx-auto px-4 text-center rounded-lg overflow-hidden xl:text-[2.5rem]
              @(!ScalesService.IsStable || GetNetWeight <= 0 ? "text-destructive" : "text-green-400")">
       <span class="w-5 flex justify-center xl:w-6">@Sign</span>
-      @foreach (char intChar in IntegerPart)
+      @foreach (char i in NetWeightAbsStr)
       {
-        <span class="w-5 flex justify-center xl:w-6">@intChar</span>
-      }
-      <span>,</span>
-      @foreach (char decChar in DecimalPart)
-      {
-        <span class="w-5 flex justify-center xl:w-6">@decChar</span>
+        <span class="@(i.ToString().IsDigitsOnly() ? "w-5 flex justify-center xl:w-6" : string.Empty)">@i</span>
       }
       <span>@WsDataLocalizer["MeasureKg"]</span>
     </div>

Src/Apps/Desktop/ScalesDesktop/Source/Widgets/LabelDisplay/LabelDisplayNetWeight.razor.cs

@@ -1,3 +1,5 @@
+using Ws.Shared.Extensions;
+
 namespace ScalesDesktop.Source.Widgets.LabelDisplay;
 
 public sealed partial class LabelDisplayNetWeight : ComponentBase, IDisposable
@@ -12,28 +14,26 @@ public sealed partial class LabelDisplayNetWeight : ComponentBase, IDisposable
 
     private Action? StableStatusChangedHandler { get; set; }
 
+    #region Weight
+
+    private string Sign => GetNetWeight >= 0 ? string.Empty : "-";
+    private decimal GetNetWeight => LabelContext.KneadingModel.NetWeight;
+    private string NetWeightAbsStr => Math.Abs(GetNetWeight).ToSepStr(',').PadLeft(8, '0');
+
+    #endregion
+
     protected override void OnInitialized()
     {
         StableStatusChangedHandler = () =>
         {
-            LabelContext.KneadingModel.NetWeightG = ScalesService.CurrentWeight;
+            LabelContext.KneadingModel.NetWeight = (decimal)ScalesService.CurrentWeight / 1000 - LabelContext.Plu?.TareWeight ?? 0;
             StateHasChanged();
         };
         LabelContext.StateChanged += StateHasChanged;
         ScalesService.WeightChanged += StableStatusChangedHandler;
         ScalesService.StartPolling();
     }
 
-    private decimal GetNetWeight => (decimal)LabelContext.KneadingModel.NetWeightG / 1000 - GetTareWeight;
-
-    private decimal GetTareWeight => LabelContext.Plu?.TareWeight ?? 0;
-
-    private string Sign => GetNetWeight >= 0 ? string.Empty : "-";
-
-    private string IntegerPart => $"{Math.Truncate(Math.Abs(GetNetWeight)):0000}";
-
-    private string DecimalPart => Math.Abs(GetNetWeight % 1).ToString(".000")[1..];
-
     public void Dispose()
     {
         ScalesService.StopPolling();

Src/Apps/Desktop/Ws.Desktop.Api/App/Features/Plu/Impl/Weight/PluWeightService.cs

@@ -55,7 +55,6 @@ public List<PluWeight> GetAllWeightByArm(Guid uid)
 
     #region Commands
 
-    // FIX: dto naming
     public WeightLabel GenerateLabel(Guid armId, Guid pluId, CreateWeightLabelDto dto)
     {
         Arm line = armService.GetItemByUid(armId);
@@ -64,7 +63,7 @@ public WeightLabel GenerateLabel(Guid armId, Guid pluId, CreateWeightLabelDto dt
         {
             Plu = pluService.GetItemByUid(pluId),
             Line = line,
-            Weight = dto.WeightNet-dto.WeightTare,
+            Weight = dto.WeightNet,
             Kneading = (short)dto.Kneading,
             ProductDt = dto.ProductDt
         };