X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Factivity%2FNewTransactionModel.java;h=cad07c0def34ee0ea3acb810775aa98a81c4f270;hp=443c21f911ff310681c683a60fdd744e77a95c5f;hb=6d8645bc5ffd9ad56124ddc21b2477c687c15ff7;hpb=f50575e1d86035e9328cf0296e1dc09fda70e442 diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionModel.java b/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionModel.java index 443c21f9..cad07c0d 100644 --- a/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionModel.java +++ b/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionModel.java @@ -25,21 +25,25 @@ import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModel; +import net.ktnx.mobileledger.BuildConfig; +import net.ktnx.mobileledger.model.Currency; import net.ktnx.mobileledger.model.LedgerTransactionAccount; +import net.ktnx.mobileledger.utils.Logger; import net.ktnx.mobileledger.utils.Misc; import org.jetbrains.annotations.NotNull; import java.util.ArrayList; import java.util.Calendar; +import java.util.Collections; import java.util.Date; import java.util.GregorianCalendar; +import java.util.List; import java.util.Locale; import java.util.regex.Matcher; import java.util.regex.Pattern; import static net.ktnx.mobileledger.utils.Logger.debug; -import static net.ktnx.mobileledger.utils.Misc.isZero; public class NewTransactionModel extends ViewModel { static final Pattern reYMD = Pattern.compile("^\\s*(\\d+)\\d*/\\s*(\\d+)\\s*/\\s*(\\d+)\\s*$"); @@ -49,8 +53,24 @@ public class NewTransactionModel extends ViewModel { private final Item trailer = new Item(this); private final ArrayList items = new ArrayList<>(); private final MutableLiveData isSubmittable = new MutableLiveData<>(false); - private final MutableLiveData focusedItem = new MutableLiveData<>(null); + private final MutableLiveData focusedItem = new MutableLiveData<>(0); private final MutableLiveData accountCount = new MutableLiveData<>(0); + private final MutableLiveData simulateSave = new MutableLiveData<>(false); + final MutableLiveData showCurrency = new MutableLiveData<>(false); + public boolean getSimulateSave() { + return simulateSave.getValue(); + } + public void setSimulateSave(boolean simulateSave) { + this.simulateSave.setValue(simulateSave); + } + public void toggleSimulateSave() { + simulateSave.setValue(!simulateSave.getValue()); + } + public void observeSimulateSave(@NonNull @NotNull androidx.lifecycle.LifecycleOwner owner, + @NonNull + androidx.lifecycle.Observer observer) { + this.simulateSave.observe(owner, observer); + } public int getAccountCount() { return items.size(); } @@ -88,6 +108,7 @@ public class NewTransactionModel extends ViewModel { @NonNull androidx.lifecycle.Observer observer) { this.accountCount.removeObserver(observer); } + public int getFocusedItem() { return focusedItem.getValue(); } public void setFocusedItem(int position) { focusedItem.setValue(position); } @@ -123,28 +144,35 @@ public class NewTransactionModel extends ViewModel { return trailer; } - // rules: - // 1) at least two account names - // 2) each amount must have account name - // 3) amounts must balance to 0, or - // 3a) there must be exactly one empty amount - // 4) empty accounts with empty amounts are ignored - // 5) a row with an empty account name or empty amount is guaranteed to exist + /* + A transaction is submittable if: + 0) has description + 1) has at least two account names + 2) each amount has account name + 3) amounts must balance to 0, or + 3a) there must be exactly one empty amount (with account) + 4) empty accounts with empty amounts are ignored + 5) a row with an empty account name or empty amount is guaranteed to exist + */ @SuppressLint("DefaultLocale") public void checkTransactionSubmittable(NewTransactionItemsAdapter adapter) { int accounts = 0; - int accounts_with_values = 0; int amounts = 0; - int amounts_with_accounts = 0; int empty_rows = 0; - Item empty_amount = null; - boolean single_empty_amount = false; - boolean single_empty_amount_has_account = false; - float running_total = 0f; + float balance = 0f; final String descriptionText = getDescription(); - final boolean have_description = ((descriptionText != null) && !descriptionText.isEmpty()); + boolean submittable = true; + List itemsWithEmptyAmount = new ArrayList<>(); + List itemsWithAccountAndEmptyAmount = new ArrayList<>(); try { + if ((descriptionText == null) || descriptionText.trim() + .isEmpty()) + { + Logger.debug("submittable", "Transaction not submittable: missing description"); + submittable = false; + } + for (int i = 0; i < this.items.size(); i++) { Item item = this.items.get(i); @@ -153,80 +181,97 @@ public class NewTransactionModel extends ViewModel { .trim(); if (acc_name.isEmpty()) { empty_rows++; - } - else { - accounts++; if (acc.isAmountSet()) { - accounts_with_values++; + // 2) each amount has account name + Logger.debug("submittable", String.format( + "Transaction not submittable: row %d has no account name, but has" + + " amount %1.2f", i + 1, acc.getAmount())); + submittable = false; } } + else { + accounts++; + } if (acc.isAmountSet()) { amounts++; - if (!acc_name.isEmpty()) - amounts_with_accounts++; - running_total += acc.getAmount(); + balance += acc.getAmount(); } else { - if (empty_amount == null) { - empty_amount = item; - single_empty_amount = true; - single_empty_amount_has_account = !acc_name.isEmpty(); + itemsWithEmptyAmount.add(item); + + if (!acc_name.isEmpty()) { + itemsWithAccountAndEmptyAmount.add(item); } - else if (!acc_name.isEmpty()) - single_empty_amount = false; } } - if ((empty_rows == 0) && - ((this.items.size() == accounts) || (this.items.size() == amounts))) - { - adapter.addRow(); + // 1) has at least two account names + if (accounts < 2) { + Logger.debug("submittable", + String.format("Transaction not submittable: only %d account names", + accounts)); + submittable = false; } - for (NewTransactionModel.Item item : items) { - - final LedgerTransactionAccount acc = item.getAccount(); - if (acc.isAmountSet()) - continue; - - if (single_empty_amount) { - if (item.equals(empty_amount)) { - empty_amount.setAmountHint(Misc.isZero(running_total) ? null - : String.format( - "%1.2f", - -running_total)); - continue; - } - } - else { - // no single empty account and this account's amount is not set - // => hint should be '0.00' + // 3) amount must balance to 0, or + // 3a) there must be exactly one empty amount (with account) + if (Misc.isZero(balance)) { + for (Item item : items) { item.setAmountHint(null); } - } + else { + int balanceReceiversCount = itemsWithAccountAndEmptyAmount.size(); + if (balanceReceiversCount != 1) { + Logger.debug("submittable", (balanceReceiversCount == 0) ? + "Transaction not submittable: non-zero balance " + + "with no empty amounts with accounts" : + "Transaction not submittable: non-zero balance " + + "with multiple empty amounts with accounts"); + submittable = false; + } - debug("submittable", String.format(Locale.US, - "%s, accounts=%d, accounts_with_values=%s, " + - "amounts_with_accounts=%d, amounts=%d, running_total=%1.2f, " + - "single_empty_with_acc=%s", have_description ? "description" : "NO description", - accounts, accounts_with_values, amounts_with_accounts, amounts, running_total, - (single_empty_amount && single_empty_amount_has_account) ? "true" : "false")); + // suggest off-balance amount to a row and remove hints on other rows + Item receiver = null; + if (!itemsWithAccountAndEmptyAmount.isEmpty()) + receiver = itemsWithAccountAndEmptyAmount.get(0); + else if (!itemsWithEmptyAmount.isEmpty()) + receiver = itemsWithEmptyAmount.get(0); + + for (Item item : items) { + if (item.equals(receiver)) { + Logger.debug("submittable", + String.format("Setting amount hint to %1.2f", -balance)); + item.setAmountHint(String.format("%1.2f", -balance)); + } + else + item.setAmountHint(null); + } + } - if (have_description && (accounts >= 2) && (accounts_with_values >= (accounts - 1)) && - (amounts_with_accounts == amounts) && - (single_empty_amount && single_empty_amount_has_account || isZero(running_total))) + // 5) a row with an empty account name or empty amount is guaranteed to exist + if ((empty_rows == 0) && + ((this.items.size() == accounts) || (this.items.size() == amounts))) { - debug("submittable", "YES"); - isSubmittable.setValue(true); - } - else { - debug("submittable", "NO"); - isSubmittable.setValue(false); + adapter.addRow(); } + + debug("submittable", submittable ? "YES" : "NO"); + isSubmittable.setValue(submittable); + + if (BuildConfig.DEBUG) { + debug("submittable", "== Dump of all items"); + for (int i = 0; i < items.size(); i++) { + Item item = items.get(i); + LedgerTransactionAccount acc = item.getAccount(); + debug("submittable", String.format("Item %2d: [%4.2f] %s (%s)", i, + acc.isAmountSet() ? acc.getAmount() : 0, acc.getAccountName(), + acc.getComment())); + } + } } catch (NumberFormatException e) { debug("submittable", "NO (because of NumberFormatException)"); @@ -245,9 +290,45 @@ public class NewTransactionModel extends ViewModel { public void sendCountNotifications() { accountCount.setValue(getAccountCount()); } + public void sendFocusedNotification() { + focusedItem.setValue(focusedItem.getValue()); + } + public void updateFocusedItem(int position) { + focusedItem.setValue(position); + } + public void noteFocusChanged(int position, FocusedElement element) { + getItem(position).setFocusedElement(element); + } + public void swapItems(int one, int two) { + Collections.swap(items, one - 1, two - 1); + } + public void toggleComment(int position) { + final MutableLiveData commentVisible = getItem(position).commentVisible; + commentVisible.postValue(!commentVisible.getValue()); + } + public void moveItemLast(int index) { + /* 0 + 1 <-- index + 2 + 3 <-- desired position + */ + int itemCount = items.size(); + + if (index < itemCount - 1) { + Item acc = items.remove(index); + items.add(itemCount - 1, acc); + } + } + public void toggleCurrencyVisible() { + showCurrency.setValue(!showCurrency.getValue()); + } enum ItemType {generalData, transactionRow, bottomFiller} - class Item extends Object { + //========================================================================================== + + enum FocusedElement {Account, Comment, Amount} + + class Item { private ItemType type; private MutableLiveData date = new MutableLiveData<>(); private MutableLiveData description = new MutableLiveData<>(); @@ -255,6 +336,10 @@ public class NewTransactionModel extends ViewModel { private MutableLiveData amountHint = new MutableLiveData<>(null); private NewTransactionModel model; private MutableLiveData editable = new MutableLiveData<>(true); + private FocusedElement focusedElement = FocusedElement.Account; + private MutableLiveData comment = new MutableLiveData<>(null); + private MutableLiveData commentVisible = new MutableLiveData<>(false); + private MutableLiveData currency = new MutableLiveData<>(null); public Item(NewTransactionModel model) { this.model = model; type = ItemType.bottomFiller; @@ -273,6 +358,12 @@ public class NewTransactionModel extends ViewModel { this.account = account; this.editable.setValue(true); } + public FocusedElement getFocusedElement() { + return focusedElement; + } + public void setFocusedElement(FocusedElement focusedElement) { + this.focusedElement = focusedElement; + } public NewTransactionModel getModel() { return model; } @@ -334,6 +425,13 @@ public class NewTransactionModel extends ViewModel { this.date.setValue(date); } public void setDate(String text) { + if ((text == null) || text.trim() + .isEmpty()) + { + setDate((Date) null); + return; + } + int year, month, day; final Calendar c = GregorianCalendar.getInstance(); Matcher m = reYMD.matcher(text); @@ -417,11 +515,11 @@ public class NewTransactionModel extends ViewModel { final int myDay = c.get(Calendar.DAY_OF_MONTH); if (today.get(Calendar.YEAR) != myYear) { - return String.format(Locale.US, "%d/%02d/%02d", myYear, myMonth, myDay); + return String.format(Locale.US, "%d/%02d/%02d", myYear, myMonth + 1, myDay); } if (today.get(Calendar.MONTH) != myMonth) { - return String.format(Locale.US, "%d/%02d", myMonth, myDay); + return String.format(Locale.US, "%d/%02d", myMonth + 1, myDay); } return String.valueOf(myDay); @@ -433,5 +531,37 @@ public class NewTransactionModel extends ViewModel { public void stopObservingEditableFlag(Observer observer) { editable.removeObserver(observer); } + public void observeCommentVisible(NewTransactionActivity activity, + Observer observer) { + commentVisible.observe(activity, observer); + } + public void stopObservingCommentVisible(Observer observer) { + commentVisible.removeObserver(observer); + } + public void observeComment(NewTransactionActivity activity, Observer observer) { + comment.observe(activity, observer); + } + public void stopObservingComment(Observer observer) { + comment.removeObserver(observer); + } + public void setComment(String comment) { + getAccount().setComment(comment); + this.comment.postValue(comment); + } + public Currency getCurrency() { + return this.currency.getValue(); + } + public void setCurrency(Currency currency) { + getAccount().setCurrency((currency != null && !currency.getName() + .isEmpty()) ? currency.getName() + : null); + this.currency.setValue(currency); + } + public void observeCurrency(NewTransactionActivity activity, Observer observer) { + currency.observe(activity, observer); + } + public void stopObservingCurrency(Observer observer) { + currency.removeObserver(observer); + } } }