Merge pull request #159 from eurofurence/issue-158-number-formatting

fix(#158): use double for currency formatting not float
eurofurence · May 27, 2024 · 1fd3cf7 · 1fd3cf7
2 parents 3628fbe + bc7c511
commit 1fd3cf7
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 16 deletions.
diff --git a/src/java/org/eurofurence/regsys/web/forms/AccountingSearchForm.java b/src/java/org/eurofurence/regsys/web/forms/AccountingSearchForm.java
@@ -339,7 +339,7 @@ public String getAmount() {
             if (Transaction.TransactionType.PAYMENT.getValue().equals(found.get(count).transactionType)) {
                 Transaction.Amount amount = found.get(count).amount;
                 if (amount != null) {
-                    return Util.toDecimals(amount.grossCent / 100.0f);
+                    return Util.toCurrencyDecimals(amount.grossCent);
                 } else {
                     return "???";
                 }
@@ -352,7 +352,7 @@ public String getAmountDue() {
             if (Transaction.TransactionType.DUE.getValue().equals(found.get(count).transactionType)) {
                 Transaction.Amount amount = found.get(count).amount;
                 if (amount != null) {
-                    return Util.toDecimals(amount.grossCent / 100.0f);
+                    return Util.toCurrencyDecimals(amount.grossCent);
                 } else {
                     return "???";
                 }

diff --git a/src/java/org/eurofurence/regsys/web/forms/FormHelper.java b/src/java/org/eurofurence/regsys/web/forms/FormHelper.java
@@ -73,8 +73,8 @@ public static boolean testEmail(Page page, String input, final String field) {
         return Util.testEmail(page::addError, input, field);
     }
 
-    public static String toDecimals(float f) {
-        return Util.toDecimals(f);
+    public static String toDecimals(double d) {
+        return Util.toDecimals(d);
     }
 
     public static String toCurrencyDecimals(Long cents) {

diff --git a/src/java/org/eurofurence/regsys/web/forms/InputForm.java b/src/java/org/eurofurence/regsys/web/forms/InputForm.java
@@ -585,18 +585,10 @@ public boolean showManualDues() {
 
         // attribute forwarders
 
-        private String str(int i) {
-            return Integer.toString(i);
-        }
-
         private String str(long i) {
             return Long.toString(i);
         }
 
-        private String str(float f) {
-            return FormHelper.toDecimals(f);
-        }
-
         public String getId() {
             return str(nvl(attendee.id));
         }

diff --git a/src/java/org/eurofurence/regsys/web/forms/Util.java b/src/java/org/eurofurence/regsys/web/forms/Util.java
@@ -266,19 +266,19 @@ public static boolean testEmail(Consumer<String> errors, String input, final Str
 
     // Other data conversion helpers
 
-    public static String toDecimals(float f) {
+    public static String toDecimals(double d) {
         DecimalFormat format = new DecimalFormat("0.00");
-        String res = format.format(f);
+        String res = format.format(d);
         if (res != null) {
-          res = res.replace(',', '.'); // damn i8n
+            res = res.replace(',', '.'); // damn i8n
         }
         return res;
     }
 
     public static String toCurrencyDecimals(Long cents) {
         if (cents == null)
             return "UNKNOWN";
-        return toDecimals(cents/100f);
+        return toDecimals(cents/100d);
     }
 
     public static float toFloat(String s) {