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=8e16408ff18c69abc73d693fa18734b642c18194;hp=3e5a45fd7ff6dd939b8eade386ddc7353549be5e;hb=c0a2a2d5aa42ad56f76dfe73ba10250e11e7f3fd;hpb=3b365016042215dd73cb4600840aa8199b8322b9

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 3e5a45fd..8e16408f 100644
--- a/app/src/main/java/net/ktnx/mobileledger/model/LedgerTransaction.java
+++ b/app/src/main/java/net/ktnx/mobileledger/model/LedgerTransaction.java
@@ -1,18 +1,18 @@
 /*
  * Copyright © 2019 Damyan Ivanov.
- * This file is part of Mobile-Ledger.
- * Mobile-Ledger is free software: you can distribute it and/or modify it
+ * This file is part of MoLe.
+ * MoLe is free software: you can distribute it and/or modify it
  * under the term of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your opinion), any later version.
  *
- * Mobile-Ledger is distributed in the hope that it will be useful,
+ * MoLe is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License terms for details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Mobile-Ledger. If not, see <https://www.gnu.org/licenses/>.
+ * along with MoLe. If not, see <https://www.gnu.org/licenses/>.
  */
 
 package net.ktnx.mobileledger.model;
@@ -21,12 +21,17 @@ 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;
 
 import java.nio.charset.Charset;
 import java.security.NoSuchAlgorithmException;
+import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Comparator;
+import java.util.Date;
 
 public class LedgerTransaction {
     private static final String DIGEST_TYPE = "SHA-256";
@@ -43,13 +48,17 @@ public class LedgerTransaction {
             };
     private String profile;
     private Integer id;
-    private String date;
+    private Date date;
     private String description;
     private ArrayList<LedgerTransactionAccount> accounts;
     private String dataHash;
     private boolean dataLoaded;
-    public LedgerTransaction(Integer id, String date, String description) {
-        this.profile = Data.profile.get().getUuid();
+    public LedgerTransaction(Integer id, String dateString, String description)
+            throws ParseException {
+        this(id, Globals.parseLedgerDate(dateString), description);
+    }
+    public LedgerTransaction(Integer id, Date date, String description, MobileLedgerProfile profile) {
+        this.profile = profile.getUuid();
         this.id = id;
         this.date = date;
         this.description = description;
@@ -57,11 +66,23 @@ public class LedgerTransaction {
         this.dataHash = null;
         dataLoaded = false;
     }
-    public LedgerTransaction(String date, String description) {
+    public LedgerTransaction(Integer id, Date date, String description) {
+        this(id, date, description, Data.profile.get());
+    }
+    public LedgerTransaction(Date date, String description) {
         this(null, date, description);
     }
     public LedgerTransaction(int id) {
-        this(id, null, null);
+        this(id, (Date) null, null);
+    }
+    public LedgerTransaction(int id, String profileUUID) {
+        this.profile = profileUUID;
+        this.id = id;
+        this.date = null;
+        this.description = null;
+        this.accounts = new ArrayList<>();
+        this.dataHash = null;
+        this.dataLoaded = false;
     }
     public ArrayList<LedgerTransactionAccount> getAccounts() {
         return accounts;
@@ -70,10 +91,10 @@ public class LedgerTransaction {
         accounts.add(item);
         dataHash = null;
     }
-    public String getDate() {
+    public Date getDate() {
         return date;
     }
-    public void setDate(String date) {
+    public void setDate(Date date) {
         this.date = date;
         dataHash = null;
     }
@@ -97,6 +118,8 @@ public class LedgerTransaction {
             data.append('\0');
             data.append(getDescription());
             data.append('\0');
+            data.append(Globals.formatLedgerDate(getDate()));
+            data.append('\0');
             for (LedgerTransactionAccount item : accounts) {
                 data.append(item.getAccountName());
                 data.append('\0');
@@ -131,7 +154,16 @@ public class LedgerTransaction {
                         new String[]{profile, String.valueOf(id)}))
         {
             if (cTr.moveToFirst()) {
-                date = cTr.getString(0);
+                String dateString = cTr.getString(0);
+                try {
+                    date = Globals.parseLedgerDate(dateString);
+                }
+                catch (ParseException e) {
+                    e.printStackTrace();
+                    throw new RuntimeException(
+                            String.format("Error parsing date '%s' from " + "transacion %d",
+                                    dateString, id));
+                }
                 description = cTr.getString(1);
 
                 try (Cursor cAcc = db.rawQuery("SELECT account_name, amount, currency FROM " +
@@ -159,4 +191,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;
+    }
 }