X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fasync%2FUpdateTransactionsTask.java;h=042da8ab50db02e8165019300f045c851a6acdc5;hp=22511560679e9c9e192f98b3cd1c74df292add00;hb=e8c73363b1848804daaddd9a10940c7f8acc1d85;hpb=3b365016042215dd73cb4600840aa8199b8322b9

diff --git a/app/src/main/java/net/ktnx/mobileledger/async/UpdateTransactionsTask.java b/app/src/main/java/net/ktnx/mobileledger/async/UpdateTransactionsTask.java
index 22511560..042da8ab 100644
--- a/app/src/main/java/net/ktnx/mobileledger/async/UpdateTransactionsTask.java
+++ b/app/src/main/java/net/ktnx/mobileledger/async/UpdateTransactionsTask.java
@@ -24,50 +24,77 @@ import android.util.Log;
 
 import net.ktnx.mobileledger.model.Data;
 import net.ktnx.mobileledger.model.LedgerTransaction;
+import net.ktnx.mobileledger.model.MobileLedgerProfile;
+import net.ktnx.mobileledger.model.TransactionListItem;
+import net.ktnx.mobileledger.utils.Globals;
 import net.ktnx.mobileledger.utils.MLDB;
 
+import java.text.ParseException;
 import java.util.ArrayList;
-import java.util.List;
+import java.util.Date;
 
-public class UpdateTransactionsTask extends AsyncTask<String, Void, List<LedgerTransaction>> {
-    protected List<LedgerTransaction> doInBackground(String[] filterAccName) {
+public class UpdateTransactionsTask extends AsyncTask<String, Void, String> {
+    protected String doInBackground(String[] filterAccName) {
         Data.backgroundTaskCount.incrementAndGet();
-        String profile_uuid = Data.profile.get().getUuid();
-        try {
-            ArrayList<LedgerTransaction> newList = new ArrayList<>();
+        final MobileLedgerProfile profile = Data.profile.get();
+        if (profile == null) return "Profile not configured";
 
-            boolean hasFilter = (filterAccName != null) && (filterAccName.length > 0) &&
-                                (filterAccName[0] != null) && !filterAccName[0].isEmpty();
+        String profile_uuid = profile.getUuid();
+        try {
+            ArrayList<TransactionListItem> newList = new ArrayList<>();
 
             String sql;
             String[] params;
 
-            sql = "SELECT id FROM transactions WHERE profile=? ORDER BY date desc, id desc";
-            params = new String[]{profile_uuid};
+            if (filterAccName[0] == null) {
+                sql = "SELECT id, date FROM transactions WHERE profile=? ORDER BY date desc, id " +
+                      "desc";
+                params = new String[]{profile_uuid};
 
-            if (hasFilter) {
-                sql = "SELECT distinct tr.id from transactions tr JOIN transaction_accounts ta " +
+            }
+            else {
+                sql = "SELECT distinct tr.id, tr.date from transactions tr JOIN " +
+                      "transaction_accounts ta " +
                       "ON ta.transaction_id=tr.id AND ta.profile=tr.profile WHERE tr.profile=? " +
-                      "and ta" + ".account_name LIKE ?||'%' AND ta" +
+                      "and ta.account_name LIKE ?||'%' AND ta" +
                       ".amount <> 0 ORDER BY tr.date desc, tr.id desc";
-                params = filterAccName;
+                params = new String[]{profile_uuid, filterAccName[0]};
             }
 
             Log.d("UTT", sql);
             SQLiteDatabase db = MLDB.getReadableDatabase();
+            String lastDateString = Globals.formatLedgerDate(new Date());
+            Date lastDate = Globals.parseLedgerDate(lastDateString);
+            boolean odd = true;
             try (Cursor cursor = db.rawQuery(sql, params)) {
                 while (cursor.moveToNext()) {
                     if (isCancelled()) return null;
 
                     int transaction_id = cursor.getInt(0);
-                    newList.add(new LedgerTransaction(transaction_id));
-                    Log.d("UTT", String.format("got transaction %d", transaction_id));
+                    String dateString = cursor.getString(1);
+                    Date date = Globals.parseLedgerDate(dateString);
+
+                    if (!lastDateString.equals(dateString)) {
+                        boolean showMonth = (date.getMonth() != lastDate.getMonth() ||
+                                             date.getYear() != lastDate.getYear());
+                        newList.add(new TransactionListItem(date, showMonth));
+                    }
+                    newList.add(
+                            new TransactionListItem(new LedgerTransaction(transaction_id), odd));
+//                    Log.d("UTT", String.format("got transaction %d", transaction_id));
+
+                    lastDate = date;
+                    lastDateString = dateString;
+                    odd = !odd;
                 }
                 Data.transactions.set(newList);
                 Log.d("UTT", "transaction list value updated");
             }
 
-            return newList;
+            return null;
+        }
+        catch (ParseException e) {
+            return String.format("Error parsing stored date '%s'", e.getMessage());
         }
         finally {
             Data.backgroundTaskCount.decrementAndGet();