X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Ftransaction_list%2FTransactionListViewModel.java;h=52fb19761d19a6adcda5bdd14643873ffcbed927;hp=53fb742f9a1acf7e2cc847781bbad3cb0e2c7e5a;hb=74c3711f3a71f54979d7a687e9ac20b903e38ea2;hpb=1857937cbdb55199cb9391a7b42766d6dcba80c8 diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/transaction_list/TransactionListViewModel.java b/app/src/main/java/net/ktnx/mobileledger/ui/transaction_list/TransactionListViewModel.java index 53fb742f..52fb1976 100644 --- a/app/src/main/java/net/ktnx/mobileledger/ui/transaction_list/TransactionListViewModel.java +++ b/app/src/main/java/net/ktnx/mobileledger/ui/transaction_list/TransactionListViewModel.java @@ -17,40 +17,70 @@ package net.ktnx.mobileledger.ui.transaction_list; +import android.app.Activity; import android.arch.lifecycle.ViewModel; -import android.content.Context; import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; +import android.util.Log; +import android.view.View; +import android.widget.AutoCompleteTextView; +import net.ktnx.mobileledger.R; import net.ktnx.mobileledger.model.LedgerTransaction; import net.ktnx.mobileledger.utils.MLDB; import java.util.ArrayList; -import java.util.List; public class TransactionListViewModel extends ViewModel { - private List transactions; + private ArrayList transactions; - public List getTransactions(Context context) { - if (transactions == null) { - transactions = new ArrayList<>(); - reloadTransactions(context); - } + public void reloadTransactions(TransactionListFragment context) { + ArrayList newList = new ArrayList<>(); - return transactions; - } - public void reloadTransactions(Context context) { - transactions.clear(); - String sql = "SELECT id FROM transactions ORDER BY date desc, id desc"; + Activity act = context.getActivity(); + + boolean hasFilter = + act.findViewById(R.id.transaction_list_account_name_filter).getVisibility() == + View.VISIBLE; + + String sql; + String[] params; + + sql = "SELECT id FROM transactions ORDER BY date desc, id desc"; + params = null; + + if (hasFilter) { + String filterAccName = String.valueOf( + ((AutoCompleteTextView) act.findViewById(R.id.transaction_filter_account_name)) + .getText()); - try (SQLiteDatabase db = MLDB.getReadableDatabase(context)) { - try (Cursor cursor = db.rawQuery(sql, null)) { + if (!filterAccName.isEmpty()) { + sql = "SELECT distinct tr.id from transactions tr JOIN transaction_accounts ta " + + "ON ta.transaction_id=tr.id WHERE ta.account_name LIKE ?||'%' AND ta" + + ".amount <> 0 ORDER BY tr.date desc, tr.id desc"; + params = new String[]{filterAccName}; + } + } + + Log.d("tmp", sql); + try (SQLiteDatabase db = MLDB.getReadableDatabase()) { + try (Cursor cursor = db.rawQuery(sql, params)) { while (cursor.moveToNext()) { - transactions.add(new LedgerTransaction(cursor.getInt(0))); + newList.add(new LedgerTransaction(cursor.getInt(0))); } + transactions = newList; + Log.d("transactions", "transaction list updated"); } } } + public LedgerTransaction getTransaction(int position) { + if (position >= transactions.size()) return null; + return transactions.get(position); + } + public int getTransactionCount() { + if (transactions == null) return 0; + return transactions.size(); + } }