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=480c0de271b9d4d71d0f2215c84102a04e482c07;hb=74c3711f3a71f54979d7a687e9ac20b903e38ea2;hpb=a5971dd3588704cc5c8dd9077d4d74860c5a06a9

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..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,12 +17,15 @@
 
 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;
 
@@ -32,13 +35,37 @@ public class TransactionListViewModel extends ViewModel {
 
     private ArrayList<LedgerTransaction> transactions;
 
-    public void reloadTransactions(Context context) {
+    public void reloadTransactions(TransactionListFragment context) {
         ArrayList<LedgerTransaction> newList = new ArrayList<>();
 
-        String sql = "SELECT id FROM transactions ORDER BY date desc, id desc";
+        Activity act = context.getActivity();
 
-        try (SQLiteDatabase db = MLDB.getReadableDatabase(context)) {
-            try (Cursor cursor = db.rawQuery(sql, null)) {
+        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()) {
+            try (Cursor cursor = db.rawQuery(sql, params)) {
                 while (cursor.moveToNext()) {
                     newList.add(new LedgerTransaction(cursor.getInt(0)));
                 }