From 91997ae251a8e443aba68c0806ce1f75ac658419 Mon Sep 17 00:00:00 2001
From: Mei Chang van der Werff <m.c.l.werff@student.tudelft.nl>
Date: Thu, 22 Jan 2026 20:18:06 +0100
Subject: [PATCH] 2 decimal limit

---
 .../main/java/commons/FormalIngredient.java   | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/commons/src/main/java/commons/FormalIngredient.java b/commons/src/main/java/commons/FormalIngredient.java
index 58f3c76..ec7a382 100644
--- a/commons/src/main/java/commons/FormalIngredient.java
+++ b/commons/src/main/java/commons/FormalIngredient.java
@@ -2,6 +2,7 @@ package commons;
 
 import jakarta.persistence.Entity;
 
+import java.text.DecimalFormat;
 import java.util.Objects;
 import java.util.Optional;
 
@@ -19,6 +20,8 @@ public class FormalIngredient extends RecipeIngredient implements Scalable<Forma
     private static final int tbspToCupConvert = 16;
     private static final int tbspToOunceConvert = 2;
     private static final int OunceToPoundConvert = 16;
+    private static final DecimalFormat numberFormat = new DecimalFormat("#.00");
+
 
     public double getAmount() {
         return amount;
@@ -66,7 +69,7 @@ public class FormalIngredient extends RecipeIngredient implements Scalable<Forma
     public String normalisedUnit(){
         Optional<Unit> unit = Unit.fromString(unitSuffix);
         if (unit.isEmpty() || !unit.get().isFormal() || unit.get().conversionFactor <= 0) {
-            return amount + unitSuffix;
+            return numberFormat.format(amount) + unitSuffix;
         }
 
         Unit currentUnit = unit.get();
@@ -75,37 +78,37 @@ public class FormalIngredient extends RecipeIngredient implements Scalable<Forma
         switch (currentUnit){
             case GRAMME -> {
                 if(baseAmount >= Unit.TONNE.conversionFactor){
-                    return baseAmount /Unit.TONNE.conversionFactor + Unit.TONNE.suffix;
+                    return numberFormat.format(baseAmount /Unit.TONNE.conversionFactor) + Unit.TONNE.suffix;
                 }if(baseAmount >=Unit.KILOGRAMME.conversionFactor) {
-                    return baseAmount / Unit.KILOGRAMME.conversionFactor + Unit.KILOGRAMME.suffix;
+                    return numberFormat.format(baseAmount / Unit.KILOGRAMME.conversionFactor) + Unit.KILOGRAMME.suffix;
                 }
             }
 
             case MILLILITRE -> {
                 if (baseAmount >= Unit.LITRE.conversionFactor) {
-                    return baseAmount /Unit.LITRE.conversionFactor + Unit.LITRE.suffix;
+                    return numberFormat.format(baseAmount /Unit.LITRE.conversionFactor) + Unit.LITRE.suffix;
                 }
             }
 
             case TABLESPOON -> {
                 if(amount>=tbspToPoundConvert){
-                    return amount/tbspToPoundConvert + Unit.POUND.suffix;
+                    return numberFormat.format(amount/tbspToPoundConvert) + Unit.POUND.suffix;
                 }
                 if(amount>=tbspToCupConvert){
-                    return amount /tbspToCupConvert + Unit.CUP.suffix;
+                    return numberFormat.format(amount /tbspToCupConvert) + Unit.CUP.suffix;
                 }
                 if(amount>=tbspToOunceConvert){
-                    return amount /tbspToOunceConvert + Unit.OUNCE.suffix;
+                    return numberFormat.format(amount /tbspToOunceConvert) + Unit.OUNCE.suffix;
                 }
             }
 
             case OUNCE -> {
                 if (baseAmount >= OunceToPoundConvert) {
-                    return amount / OunceToPoundConvert + Unit.POUND.suffix;
+                    return numberFormat.format(amount / OunceToPoundConvert) + Unit.POUND.suffix;
                 }
             }
         }
-        return amount + currentUnit.suffix;
+        return numberFormat.format(amount) + currentUnit.suffix;
     }
 
     public String toString() {