X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fmodel%2FLedgerTransactionAccount.java;h=59e1dab00fb90d69b8d28ec45f465d9574db74a4;hb=592803265bf5a0f6ea2da27dd061c9829ce2bf20;hp=801e0169845f8c2ff2daedb06177eec7d62ba3d6;hpb=2681ef6acda4128b8af6566a7925eb041083bcbc;p=mobile-ledger.git diff --git a/app/src/main/java/net/ktnx/mobileledger/model/LedgerTransactionAccount.java b/app/src/main/java/net/ktnx/mobileledger/model/LedgerTransactionAccount.java index 801e0169..59e1dab0 100644 --- a/app/src/main/java/net/ktnx/mobileledger/model/LedgerTransactionAccount.java +++ b/app/src/main/java/net/ktnx/mobileledger/model/LedgerTransactionAccount.java @@ -19,41 +19,38 @@ package net.ktnx.mobileledger.model; import androidx.annotation.NonNull; -import net.ktnx.mobileledger.json.ParsedAmount; -import net.ktnx.mobileledger.json.ParsedPosting; -import net.ktnx.mobileledger.json.ParsedQuantity; -import net.ktnx.mobileledger.json.ParsedStyle; - -import java.util.ArrayList; - public class LedgerTransactionAccount { private String accountName; private String shortAccountName; private float amount; private boolean amountSet = false; private String currency; - - public LedgerTransactionAccount(String accountName, float amount) { - this(accountName, amount, null); - } - public LedgerTransactionAccount(String accountName, float amount, String currency) { + private String comment; + public LedgerTransactionAccount(String accountName, float amount, String currency, + String comment) { this.setAccountName(accountName); this.amount = amount; this.amountSet = true; this.currency = currency; + this.comment = comment; } - public LedgerTransactionAccount(String accountName) { this.accountName = accountName; } public LedgerTransactionAccount(LedgerTransactionAccount origin) { // copy constructor setAccountName(origin.getAccountName()); + setComment(origin.getComment()); if (origin.isAmountSet()) setAmount(origin.getAmount()); currency = origin.getCurrency(); } - + public String getComment() { + return comment; + } + public void setComment(String comment) { + this.comment = comment; + } public String getAccountName() { return accountName; } @@ -100,25 +97,4 @@ public class LedgerTransactionAccount { return sb.toString(); } - public ParsedPosting asParsedPosting() { - ParsedPosting result = new ParsedPosting(); - result.setPaccount(accountName); - ArrayList amounts = new ArrayList<>(); - ParsedAmount amt = new ParsedAmount(); - amt.setAcommodity((currency == null) ? "" : currency); - amt.setAismultiplier(false); - ParsedQuantity qty = new ParsedQuantity(); - qty.setDecimalPlaces(2); - qty.setDecimalMantissa(Math.round(amount * 100)); - amt.setAquantity(qty); - ParsedStyle style = new ParsedStyle(); - style.setAscommodityside('L'); - style.setAscommodityspaced(false); - style.setAsprecision(2); - style.setAsdecimalpoint('.'); - amt.setAstyle(style); - amounts.add(amt); - result.setPamount(amounts); - return result; - } }