add transaction comment to the internal transaction representation

[mobile-ledger.git] / app / src / main / java / net / ktnx / mobileledger / model / LedgerTransaction.java

diff --git a/app/src/main/java/net/ktnx/mobileledger/model/LedgerTransaction.java b/app/src/main/java/net/ktnx/mobileledger/model/LedgerTransaction.java
index 2f23eff0a082a5d4c8866e498f99f348cf599337..afb9c57f01bdc3298f942b99a73180029e1fa5e2 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/model/LedgerTransaction.java
+++ b/app/src/main/java/net/ktnx/mobileledger/model/LedgerTransaction.java
@@ -51,6 +51,7 @@ public class LedgerTransaction {
     private Integer id;
     private Date date;
     private String description;
+    private String comment;
     private ArrayList<LedgerTransactionAccount> accounts;
     private String dataHash;
     private boolean dataLoaded;
@@ -107,6 +108,12 @@ public class LedgerTransaction {
         this.description = description;
         dataHash = null;
     }
+    public String getComment() {
+        return comment;
+    }
+    public void setComment(String comment) {
+        this.comment = comment;
+    }
     public int getId() {
         return id;
     }
@@ -129,6 +136,8 @@ public class LedgerTransaction {
                 data.append(item.getCurrency());
                 data.append('\0');
                 data.append(item.getAmount());
+                data.append('\0');
+                data.append(item.getComment());
             }
             sha.update(data.toString()
                            .getBytes(Charset.forName("UTF-8")));
@@ -166,12 +175,12 @@ public class LedgerTransaction {
                 catch (ParseException e) {
                     e.printStackTrace();
                     throw new RuntimeException(
-                            String.format("Error parsing date '%s' from " + "transacion %d",
+                            String.format("Error parsing date '%s' from " + "transaction %d",
                                     dateString, id));
                 }
                 description = cTr.getString(1);
 
-                try (Cursor cAcc = db.rawQuery("SELECT account_name, amount, currency FROM " +
+                try (Cursor cAcc = db.rawQuery("SELECT account_name, amount, currency, comment FROM " +
                                                "transaction_accounts WHERE " +
                                                "profile=? AND transaction_id = ?",
                         new String[]{profile, String.valueOf(id)}))
@@ -181,7 +190,7 @@ public class LedgerTransaction {
 //                                String.format("Loaded %d: %s %1.2f %s", id, cAcc.getString(0),
 //                                        cAcc.getFloat(1), cAcc.getString(2)));
                         addAccount(new LedgerTransactionAccount(cAcc.getString(0), cAcc.getFloat(1),
-                                cAcc.getString(2)));
+                                cAcc.getString(2), cAcc.getString(3)));
                     }
 
                     finishLoading();