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=1482c1d59d991b7f3bc2c459db9d72d7da315038;hb=14873dbc3aa249dc5af735c8906be1a19b5f7dda;hpb=0250439d60e198f47f86ab4091027ec0d772d4c9

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 1482c1d5..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
@@ -18,38 +18,69 @@
 package net.ktnx.mobileledger.ui.transaction_list;
 
 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.TransactionListActivity;
 import net.ktnx.mobileledger.model.LedgerTransaction;
-import net.ktnx.mobileledger.utils.MobileLedgerDatabase;
+import net.ktnx.mobileledger.utils.MLDB;
 
 import java.util.ArrayList;
-import java.util.List;
 
 public class TransactionListViewModel extends ViewModel {
 
-    private List<LedgerTransaction> transactions;
+    private ArrayList<LedgerTransaction> transactions;
 
-    public List<LedgerTransaction> getTransactions(MobileLedgerDatabase dbh) {
-        if (transactions == null) {
-            transactions = new ArrayList<>();
-            reloadTransactions(dbh);
-        }
+    public void reloadTransactions(Context context) {
+        ArrayList<LedgerTransaction> newList = new ArrayList<>();
 
-        return transactions;
-    }
-    private void reloadTransactions(MobileLedgerDatabase dbh) {
-        transactions.clear();
-        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());
 
-        try (SQLiteDatabase db = dbh.getReadableDatabase()) {
-            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(context)) {
+            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();
+    }
 }