winzer/elwig
2
1
Fork 0
Code Issues 8 Pull Requests Actions Releases 46 Activity

Use integer as penalty_amount

Browse Source
This commit is contained in:
Lorenz Stechauner
2023-08-24 18:11:13 +02:00
parent 83a82c17c6
commit 5dd56d9666
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Elwig/Models/AreaComType.cs
View File

@ -1,3 +1,4 @@
using Elwig.Helpers;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
@ -26,12 +27,12 @@ namespace Elwig.Models {
public int? MaxKgPerHa { get; set; } public int? MaxKgPerHa { get; set; }
[Column("penalty_amount")] [Column("penalty_amount")]
public double? PenaltyAmoutValue { get; set; } public long? PenaltyAmoutValue { get; set; }
[NotMapped] [NotMapped]
public decimal? PenaltyAmount { public decimal? PenaltyAmount {
get => PenaltyAmoutValue != null ? (decimal)PenaltyAmoutValue : null; get => PenaltyAmoutValue != null ? Utils.DecFromDb(PenaltyAmoutValue.Value, 4) : null;
set => PenaltyAmoutValue = value != null ? (double)value : null; set => PenaltyAmoutValue = value != null ? Utils.DecToDb(value.Value, 4) : null;
} }
[ForeignKey("SortId")] [ForeignKey("SortId")]

2
Elwig/Models/Currency.cs
View File

@ -18,6 +18,6 @@ namespace Elwig.Models {
public long? OneEuroValue { get; private set; } public long? OneEuroValue { get; private set; }
[NotMapped] [NotMapped]
public decimal? OneEuro => OneEuroValue != null ? Utils.DecFromDb((long)OneEuroValue, 6) : null; public decimal? OneEuro => OneEuroValue != null ? Utils.DecFromDb(OneEuroValue.Value, 6) : null;
} }
} }

4
Elwig/Models/Modifier.cs
View File

@ -24,10 +24,10 @@ namespace Elwig.Models {
[NotMapped] [NotMapped]
public decimal? Abs { public decimal? Abs {
get { get {
return AbsValue != null ? Season.DecFromDb((long)AbsValue) : null; return AbsValue != null ? Season.DecFromDb(AbsValue.Value) : null;
} }
set { set {
AbsValue = value != null ? Season.DecToDb((decimal)value) : null; AbsValue = value != null ? Season.DecToDb(value.Value) : null;
} }
} }

2
Elwig/Windows/DeliveryAdminWindow.xaml.cs
View File

@ -26,7 +26,7 @@ namespace Elwig.Windows {
private string? ManualWeighingReason = null; private string? ManualWeighingReason = null;
private string? ScaleId = null; private string? ScaleId = null;
private string? WeighingId = null; private string? WeighingId = null;
private Button[] WeighingButtons; private readonly Button[] WeighingButtons;
public DeliveryAdminWindow(bool receipt = false) { public DeliveryAdminWindow(bool receipt = false) {
InitializeComponent(); InitializeComponent();