X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fmodel%2FLedgerTransactionAccount.java;h=53b6a65f3bca893186d73bb0710719fdab8d3fae;hb=5df10dc0b58df4d4be4e9ab34f1e0f477ca46766;hp=ba80ac615f4991bdd8d237b0f07779510d76840d;hpb=5545ddea3574103c2a7eea552fff0d43a0587fac;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 ba80ac61..53b6a65f 100644
--- a/app/src/main/java/net/ktnx/mobileledger/model/LedgerTransactionAccount.java
+++ b/app/src/main/java/net/ktnx/mobileledger/model/LedgerTransactionAccount.java
@@ -19,6 +19,11 @@ package net.ktnx.mobileledger.model;
 
 import androidx.annotation.NonNull;
 
+import net.ktnx.mobileledger.db.TransactionAccount;
+import net.ktnx.mobileledger.utils.Misc;
+
+import java.util.Locale;
+
 public class LedgerTransactionAccount {
     private String accountName;
     private String shortAccountName;
@@ -26,25 +31,40 @@ public class LedgerTransactionAccount {
     private boolean amountSet = false;
     private String currency;
     private String comment;
+    private boolean amountValid = true;
+    private long dbId;
     public LedgerTransactionAccount(String accountName, float amount, String currency,
                                     String comment) {
         this.setAccountName(accountName);
         this.amount = amount;
         this.amountSet = true;
-        this.currency = currency;
-        this.comment = comment;
+        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 LedgerTransactionAccount(TransactionAccount dbo) {
+        this(dbo.getAccountName(), dbo.getAmount(), Misc.emptyIsNull(dbo.getCurrency()),
+                Misc.emptyIsNull(dbo.getComment()));
+        amountSet = true;
+        amountValid = true;
+        dbId = dbo.getId();
+    }
     public String getComment() {
         return comment;
     }
@@ -70,18 +90,24 @@ public class LedgerTransactionAccount {
     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 = currency;
+        this.currency = Misc.emptyIsNull(currency);
     }
     @NonNull
     public String toString() {
@@ -93,8 +119,19 @@ 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 TransactionAccount toDBO() {
+        TransactionAccount dbo = new TransactionAccount();
+        dbo.setAccountName(accountName);
+        if (amountSet)
+            dbo.setAmount(amount);
+        dbo.setComment(comment);
+        dbo.setCurrency(currency);
+        dbo.setId(dbId);
+
+        return dbo;
+    }
+}
\ No newline at end of file