X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fmodel%2FLedgerTransaction.java;h=8e16408ff18c69abc73d693fa18734b642c18194;hb=899d71e1f4cff043592de4283813b96be8f397a5;hp=03b9c7ac54582d501482810680b39c5f10d95c4c;hpb=ea17ca9e3b03ca0090be03fdc0abbbbfd954be89;p=mobile-ledger.git
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 03b9c7ac..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 .
+ * along with MoLe. If not, see .
*/
package net.ktnx.mobileledger.model;
@@ -21,6 +21,8 @@ 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 +57,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,12 +66,24 @@ public class LedgerTransaction {
this.dataHash = null;
dataLoaded = false;
}
+ 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, (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 getAccounts() {
return accounts;
}
@@ -177,4 +191,21 @@ public class LedgerTransaction {
public void finishLoading() {
dataLoaded = true;
}
+ public ParsedLedgerTransaction toParsedLedgerTransaction() {
+ ParsedLedgerTransaction result = new ParsedLedgerTransaction();
+ result.setTcomment("");
+ result.setTprecedingcomment("");
+
+ ArrayList 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;
+ }
}