diff --git a/src/main/java/no/ntnu/idatt1002/demo/data/Economics/Expense.java b/src/main/java/no/ntnu/idatt1002/demo/data/Economics/Expense.java index 5066f6b0d128352d9ae918b454feee68e73141d2..078ec99f4e9bfdef73c76b8396026dac0cbd2a7e 100644 --- a/src/main/java/no/ntnu/idatt1002/demo/data/Economics/Expense.java +++ b/src/main/java/no/ntnu/idatt1002/demo/data/Economics/Expense.java @@ -66,6 +66,6 @@ public class Expense extends Item{ */ @Override public String toString() { - return super.toString()+"\ncategory="+category.toString()+"\n"; + return super.toString()+"category="+category.toString()+"\n\n"; } } diff --git a/src/main/java/no/ntnu/idatt1002/demo/data/Economics/Income.java b/src/main/java/no/ntnu/idatt1002/demo/data/Economics/Income.java index 480636b05c985767e18d7b42c9ae970ed9f05db7..c07821dc0e79b6ec8ae934cb8ca4a1fadda78ea5 100644 --- a/src/main/java/no/ntnu/idatt1002/demo/data/Economics/Income.java +++ b/src/main/java/no/ntnu/idatt1002/demo/data/Economics/Income.java @@ -73,6 +73,6 @@ public class Income extends Item{ */ @Override public String toString() { - return super.toString()+"\ncategory="+category.toString()+"\n"; + return super.toString()+"category="+category.toString()+"\n\n"; } } diff --git a/src/main/java/no/ntnu/idatt1002/demo/data/Economics/Item.java b/src/main/java/no/ntnu/idatt1002/demo/data/Economics/Item.java index 04b6bc51b37f2b6014237b1ad467d6c7ded9c9d6..7bd8b00ee062e35ee5a51c94f359c168ef7d95ad 100644 --- a/src/main/java/no/ntnu/idatt1002/demo/data/Economics/Item.java +++ b/src/main/java/no/ntnu/idatt1002/demo/data/Economics/Item.java @@ -138,10 +138,10 @@ public abstract class Item { isReoccuring = "Not reoccurring"; } if(!description.isBlank()){ - return "\ndate=" + date+"\ndescription=" + description+"\namount="+amount+"\nisReoccuring="+isReoccuring; + return "date=" + date+"\ndescription=" + description+"\namount="+amount+"\nisReoccuring="+isReoccuring+"\n"; } else{ - return "\ndate="+date+"\namount="+amount+"\nisReoccuring="+isReoccuring; + return "date="+date+"\namount="+amount+"\nisReoccuring="+isReoccuring+"\n"; } } diff --git a/src/main/resources/expenseRegisterTest.itemRegister b/src/main/resources/expenseRegisterTest.itemRegister deleted file mode 100644 index 7f98526b7b5d9fa27c8d5ec080a8b33f9fb0b143..0000000000000000000000000000000000000000 --- a/src/main/resources/expenseRegisterTest.itemRegister +++ /dev/null @@ -1,6 +0,0 @@ - -date=03.03.23 -description=description -amount=59.900001525878906 -isReoccuring=Not reoccurring -category=CLOTHES diff --git a/src/main/resources/incomeRegisterTest.itemRegister b/src/main/resources/incomeRegisterTest.itemRegister deleted file mode 100644 index 6bfe0943a9c759b6838d594b03262e3727212ce9..0000000000000000000000000000000000000000 --- a/src/main/resources/incomeRegisterTest.itemRegister +++ /dev/null @@ -1,6 +0,0 @@ - -date=03.03.23 -description=description -amount=59.900001525878906 -isReoccuring=Not reoccurring -category=GIFT