X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fmodel%2FLedgerTransactionAccount.java;h=1791cfbc5962e79b5b3c16ab4516c5e921a1765b;hb=a1f5cf187a6bc2731aa1ed057d3d11fccc5de2c4;hp=801e0169845f8c2ff2daedb06177eec7d62ba3d6;hpb=2681ef6acda4128b8af6566a7925eb041083bcbc;p=mobile-ledger.git

diff --git a/app/src/main/java/net/ktnx/mobileledger/model/LedgerTransactionAccount.java b/app/src/main/java/net/ktnx/mobileledger/model/LedgerTransactionAccount.java
index 801e0169..1791cfbc 100644
--- a/app/src/main/java/net/ktnx/mobileledger/model/LedgerTransactionAccount.java
+++ b/app/src/main/java/net/ktnx/mobileledger/model/LedgerTransactionAccount.java
@@ -19,12 +19,9 @@ package net.ktnx.mobileledger.model;
 
 import androidx.annotation.NonNull;
 
-import net.ktnx.mobileledger.json.ParsedAmount;
-import net.ktnx.mobileledger.json.ParsedPosting;
-import net.ktnx.mobileledger.json.ParsedQuantity;
-import net.ktnx.mobileledger.json.ParsedStyle;
+import net.ktnx.mobileledger.utils.Misc;
 
-import java.util.ArrayList;
+import java.util.Locale;
 
 public class LedgerTransactionAccount {
     private String accountName;
@@ -32,28 +29,39 @@ public class LedgerTransactionAccount {
     private float amount;
     private boolean amountSet = false;
     private String currency;
-
-    public LedgerTransactionAccount(String accountName, float amount) {
-        this(accountName, amount, null);
-    }
-    public LedgerTransactionAccount(String accountName, float amount, String currency) {
+    private String comment;
+    private boolean amountValid = true;
+    public LedgerTransactionAccount(String accountName, float amount, String currency,
+                                    String comment) {
         this.setAccountName(accountName);
         this.amount = amount;
         this.amountSet = true;
-        this.currency = currency;
+        this.amountValid = true;
+        this.currency = Misc.emptyIsNull(currency);
+        this.comment = Misc.emptyIsNull(comment);
     }
-
     public LedgerTransactionAccount(String accountName) {
         this.accountName = accountName;
     }
+    public LedgerTransactionAccount(String accountName, String currency) {
+        this.accountName = accountName;
+        this.currency = Misc.emptyIsNull(currency);
+    }
     public LedgerTransactionAccount(LedgerTransactionAccount origin) {
         // copy constructor
         setAccountName(origin.getAccountName());
+        setComment(origin.getComment());
         if (origin.isAmountSet())
             setAmount(origin.getAmount());
+        amountValid = origin.amountValid;
         currency = origin.getCurrency();
     }
-
+    public String getComment() {
+        return comment;
+    }
+    public void setComment(String comment) {
+        this.comment = comment;
+    }
     public String getAccountName() {
         return accountName;
     }
@@ -70,22 +78,28 @@ public class LedgerTransactionAccount {
 
         return amount;
     }
-
     public void setAmount(float account_amount) {
         this.amount = account_amount;
         this.amountSet = true;
+        this.amountValid = true;
     }
-
     public void resetAmount() {
         this.amountSet = false;
+        this.amountValid = true;
+    }
+    public void invalidateAmount() {
+        this.amountValid = false;
     }
-
     public boolean isAmountSet() {
         return amountSet;
     }
+    public boolean isAmountValid() { return amountValid; }
     public String getCurrency() {
         return currency;
     }
+    public void setCurrency(String currency) {
+        this.currency = Misc.emptyIsNull(currency);
+    }
     @NonNull
     public String toString() {
         if (!amountSet)
@@ -96,29 +110,8 @@ public class LedgerTransactionAccount {
             sb.append(currency);
             sb.append(' ');
         }
-        sb.append(String.format("%,1.2f", amount));
+        sb.append(String.format(Locale.US, "%,1.2f", amount));
 
         return sb.toString();
     }
-    public ParsedPosting asParsedPosting() {
-        ParsedPosting result = new ParsedPosting();
-        result.setPaccount(accountName);
-        ArrayList<ParsedAmount> amounts = new ArrayList<>();
-        ParsedAmount amt = new ParsedAmount();
-        amt.setAcommodity((currency == null) ? "" : currency);
-        amt.setAismultiplier(false);
-        ParsedQuantity qty = new ParsedQuantity();
-        qty.setDecimalPlaces(2);
-        qty.setDecimalMantissa(Math.round(amount * 100));
-        amt.setAquantity(qty);
-        ParsedStyle style = new ParsedStyle();
-        style.setAscommodityside('L');
-        style.setAscommodityspaced(false);
-        style.setAsprecision(2);
-        style.setAsdecimalpoint('.');
-        amt.setAstyle(style);
-        amounts.add(amt);
-        result.setPamount(amounts);
-        return result;
-    }
-}
+}
\ No newline at end of file