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=1680236bc9c96a12675be57dd39b6488ce93ed8f;hp=480c0de271b9d4d71d0f2215c84102a04e482c07;hb=14873dbc3aa249dc5af735c8906be1a19b5f7dda;hpb=7b0001951ebea2e0cd352bdfca322e9b43ecac64 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 480c0de2..1680236b 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 @@ -22,7 +22,11 @@ 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.TransactionListActivity; import net.ktnx.mobileledger.model.LedgerTransaction; import net.ktnx.mobileledger.utils.MLDB; @@ -35,10 +39,33 @@ public class TransactionListViewModel extends ViewModel { public void reloadTransactions(Context context) { ArrayList newList = new ArrayList<>(); - String sql = "SELECT id FROM transactions ORDER BY date desc, id desc"; + TransactionListActivity act = (TransactionListActivity) context; + 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()); + + 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(context)) { - try (Cursor cursor = db.rawQuery(sql, null)) { + try (Cursor cursor = db.rawQuery(sql, params)) { while (cursor.moveToNext()) { newList.add(new LedgerTransaction(cursor.getInt(0))); }