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=fd900efa1851c5cf1135cebc2a8da5f715f405b6;hp=fd2a8407dfca79910216bc3191ed692d3661f956;hb=0fc2ddc465cd9b9314ae336e69535020a96a7fbc;hpb=00a1049ca910c976363fd1c2f6304d4512cfcedb

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 fd2a8407..fd900efa 100644
--- a/app/src/main/java/net/ktnx/mobileledger/model/LedgerTransaction.java
+++ b/app/src/main/java/net/ktnx/mobileledger/model/LedgerTransaction.java
@@ -19,8 +19,9 @@ package net.ktnx.mobileledger.model;
 
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
-import android.util.Log;
 
+import net.ktnx.mobileledger.json.ParsedLedgerTransaction;
+import net.ktnx.mobileledger.json.ParsedPosting;
 import net.ktnx.mobileledger.utils.Digest;
 import net.ktnx.mobileledger.utils.Globals;
 
@@ -55,8 +56,8 @@ public class LedgerTransaction {
             throws ParseException {
         this(id, Globals.parseLedgerDate(dateString), description);
     }
-    public LedgerTransaction(Integer id, Date date, String description) {
-        this.profile = Data.profile.get().getUuid();
+    public LedgerTransaction(Integer id, Date date, String description, MobileLedgerProfile profile) {
+        this.profile = profile.getUuid();
         this.id = id;
         this.date = date;
         this.description = description;
@@ -64,6 +65,9 @@ public class LedgerTransaction {
         this.dataHash = null;
         dataLoaded = false;
     }
+    public LedgerTransaction(Integer id, Date date, String description) {
+        this(id, date, description, Data.profile.getValue());
+    }
     public LedgerTransaction(Date date, String description) {
         this(null, date, description);
     }
@@ -136,8 +140,8 @@ public class LedgerTransaction {
                 .rawQuery("SELECT 1 from transactions where data_hash = ?", new String[]{dataHash}))
         {
             boolean result = c.moveToFirst();
-            Log.d("db", String.format("Transaction %d (%s) %s", id, dataHash,
-                    result ? "already present" : "not present"));
+//            debug("db", String.format("Transaction %d (%s) %s", id, dataHash,
+//                    result ? "already present" : "not present"));
             return result;
         }
     }
@@ -167,7 +171,7 @@ public class LedgerTransaction {
                         new String[]{profile, String.valueOf(id)}))
                 {
                     while (cAcc.moveToNext()) {
-//                        Log.d("transactions",
+//                        debug("transactions",
 //                                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),
@@ -186,4 +190,21 @@ public class LedgerTransaction {
     public void finishLoading() {
         dataLoaded = true;
     }
+    public ParsedLedgerTransaction toParsedLedgerTransaction() {
+        ParsedLedgerTransaction result = new ParsedLedgerTransaction();
+        result.setTcomment("");
+        result.setTprecedingcomment("");
+
+        ArrayList<ParsedPosting> postings = new ArrayList<>();
+        for (LedgerTransactionAccount acc : accounts) {
+            if (!acc.getAccountName().isEmpty()) postings.add(acc.asParsedPosting());
+        }
+
+        result.setTpostings(postings);
+        result.setTdate(Globals.formatIsoDate(date));
+        result.setTdate2(null);
+        result.setTindex(1);
+        result.setTdescription(description);
+        return result;
+    }
 }