X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fmodel%2FLedgerTransaction.java;h=c4127ab81641eaf679cc91efd7074fddecb0c18c;hp=8aa169dc05a6893a8d3d2f54be37eef5daa30d89;hb=a686c3293dd0dbbe49db7fc0f287c451d6b2ecd8;hpb=a983099d6150044a08a1fbc601d9af9bd8d0c0a8 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 8aa169dc..c4127ab8 100644 --- a/app/src/main/java/net/ktnx/mobileledger/model/LedgerTransaction.java +++ b/app/src/main/java/net/ktnx/mobileledger/model/LedgerTransaction.java @@ -17,6 +17,7 @@ package net.ktnx.mobileledger.model; +import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; import net.ktnx.mobileledger.utils.Digest; @@ -40,24 +41,26 @@ public class LedgerTransaction { return Float.compare(o1.getAmount(), o2.getAmount()); } }; - private String id; + private Integer id; private String date; private String description; private ArrayList items; private String dataHash; - public LedgerTransaction(String id, String date, String description) { + private boolean dataLoaded; + public LedgerTransaction(Integer id, String date, String description) { this.id = id; this.date = date; this.description = description; this.items = new ArrayList<>(); this.dataHash = null; - } - public LedgerTransaction(int id, String date, String description) { - this(String.valueOf(id), date, description); + dataLoaded = false; } public LedgerTransaction(String date, String description) { this(null, date, description); } + public LedgerTransaction(int id) { + this(id, null, null); + } public void add_item(LedgerTransactionItem item) { items.add(item); dataHash = null; @@ -90,13 +93,13 @@ public class LedgerTransaction { } }; } - public String getId() { + public int getId() { return id; } public void insertInto(SQLiteDatabase db) { fillDataHash(); db.execSQL("INSERT INTO transactions(id, date, description, data_hash) values(?,?,?,?)", - new String[]{id, date, description}); + new Object[]{id, date, description, dataHash}); for (LedgerTransactionItem item : items) { db.execSQL("INSERT INTO transaction_accounts(transaction_id, account_name, amount, " + @@ -128,4 +131,29 @@ public class LedgerTransaction { String.format("Unable to get instance of %s digest", DIGEST_TYPE), e); } } + public void loadData(SQLiteDatabase db) { + if (dataLoaded) return; + + try (Cursor cTr = db.rawQuery("SELECT date, description from transactions WHERE id=?", + new String[]{String.valueOf(id)})) + { + if (cTr.moveToFirst()) { + date = cTr.getString(0); + description = cTr.getString(1); + + try (Cursor cAcc = db.rawQuery("SELECT account_name, amount, currency FROM " + + "transaction_accounts WHERE transaction_id = ?", + new String[]{String.valueOf(id)})) + { + while (cAcc.moveToNext()) { + add_item(new LedgerTransactionItem(cAcc.getString(0), cAcc.getFloat(1), + cAcc.getString(2))); + } + + dataLoaded = true; + } + } + } + + } }