X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Factivity%2FNewTransactionActivity.java;h=310232d2057a6fc9585d5f29ec0118adfce629b9;hp=f075929d9c85e8227fb0b8c0b98e91d1d1ebd8b0;hb=c4d80cd461385af945cd3e599ad2307ad5adcfe6;hpb=2bba456716f97113b7cefc1fba74cf9210c4e127

diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionActivity.java b/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionActivity.java
index f075929d..310232d2 100644
--- a/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionActivity.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionActivity.java
@@ -47,7 +47,7 @@ import com.google.android.material.snackbar.Snackbar;
 import net.ktnx.mobileledger.BuildConfig;
 import net.ktnx.mobileledger.R;
 import net.ktnx.mobileledger.async.DescriptionSelectedCallback;
-import net.ktnx.mobileledger.async.SaveTransactionTask;
+import net.ktnx.mobileledger.async.SendTransactionTask;
 import net.ktnx.mobileledger.async.TaskCallback;
 import net.ktnx.mobileledger.model.Data;
 import net.ktnx.mobileledger.model.LedgerTransaction;
@@ -56,7 +56,6 @@ import net.ktnx.mobileledger.model.MobileLedgerProfile;
 import net.ktnx.mobileledger.ui.DatePickerFragment;
 import net.ktnx.mobileledger.ui.OnSwipeTouchListener;
 import net.ktnx.mobileledger.utils.Globals;
-import net.ktnx.mobileledger.utils.LockHolder;
 import net.ktnx.mobileledger.utils.MLDB;
 
 import java.text.ParseException;
@@ -77,7 +76,7 @@ import androidx.fragment.app.DialogFragment;
 
 public class NewTransactionActivity extends ProfileThemedActivity
         implements TaskCallback, DescriptionSelectedCallback {
-    private static SaveTransactionTask saver;
+    private static SendTransactionTask saver;
     private TableLayout table;
     private ProgressBar progress;
     private FloatingActionButton fab;
@@ -93,7 +92,7 @@ public class NewTransactionActivity extends ProfileThemedActivity
         setContentView(R.layout.activity_new_transaction);
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
-        toolbar.setSubtitle(Data.profile.get().getName());
+        toolbar.setSubtitle(mProfile.getName());
 
         tvDate = findViewById(R.id.new_transaction_date);
         tvDate.setOnFocusChangeListener((v, hasFocus) -> {
@@ -122,7 +121,16 @@ public class NewTransactionActivity extends ProfileThemedActivity
 //            Log.d("swipe", "hooked to row "+i);
         }
     }
+    @Override
+    protected void initProfile() {
+        String profileUUID = getIntent().getStringExtra("profile_uuid");
 
+        if (profileUUID != null) {
+            mProfile = Data.getProfile(profileUUID);
+            if (mProfile == null) finish();
+        }
+        else super.initProfile();
+    }
     @Override
     public void finish() {
         super.finish();
@@ -149,7 +157,7 @@ public class NewTransactionActivity extends ProfileThemedActivity
         progress.setVisibility(View.VISIBLE);
         try {
 
-            saver = new SaveTransactionTask(this);
+            saver = new SendTransactionTask(this, mProfile);
 
             String dateString = tvDate.getText().toString();
             Date date;
@@ -158,16 +166,30 @@ public class NewTransactionActivity extends ProfileThemedActivity
             LedgerTransaction tr = new LedgerTransaction(date, tvDescription.getText().toString());
 
             TableLayout table = findViewById(R.id.new_transaction_accounts_table);
+            LedgerTransactionAccount emptyAmountAccount = null;
+            float emptyAmountAccountBalance = 0;
             for (int i = 0; i < table.getChildCount(); i++) {
                 TableRow row = (TableRow) table.getChildAt(i);
                 String acc = ((TextView) row.getChildAt(0)).getText().toString();
+                if (acc.isEmpty()) continue;
+
                 String amt = ((TextView) row.getChildAt(1)).getText().toString();
-                LedgerTransactionAccount item =
-                        amt.length() > 0 ? new LedgerTransactionAccount(acc, Float.parseFloat(amt))
-                                         : new LedgerTransactionAccount(acc);
+                LedgerTransactionAccount item;
+                if (amt.length() > 0) {
+                    final float amount = Float.parseFloat(amt);
+                    item = new LedgerTransactionAccount(acc, amount);
+                    emptyAmountAccountBalance += amount;
+                }
+                else {
+                    item = new LedgerTransactionAccount(acc);
+                    emptyAmountAccount = item;
+                }
 
                 tr.addAccount(item);
             }
+
+            if (emptyAmountAccount != null)
+                emptyAmountAccount.setAmount(-emptyAmountAccountBalance);
             saver.execute(tr);
         }
         catch (ParseException e) {
@@ -487,37 +509,43 @@ public class NewTransactionActivity extends ProfileThemedActivity
         Log.d("descr selected", description);
         if (!inputStateIsInitial()) return;
 
-        try (Cursor c = MLDB.getDatabase().rawQuery(
-                "select profile, id from transactions where description=? order by date desc " +
-                "limit 1", new String[]{description}))
-        {
+        String accFilter = mProfile.getPreferredAccountsFilter();
+
+        ArrayList<String> params = new ArrayList<>();
+        StringBuilder sb = new StringBuilder(
+                "select t.profile, t.id from transactions t where t.description=?");
+        params.add(description);
+
+        if (accFilter != null) {
+            sb.append(" AND EXISTS (").append("SELECT 1 FROM transaction_accounts ta ")
+                    .append("WHERE ta.profile = t.profile").append(" AND ta.transaction_id = t.id")
+                    .append(" AND UPPER(ta.account_name) LIKE '%'||?||'%')");
+            params.add(accFilter.toUpperCase());
+        }
+
+        sb.append(" ORDER BY date desc limit 1");
+
+        final String sql = sb.toString();
+        Log.d("descr", sql);
+        Log.d("descr", params.toString());
+
+        try (Cursor c = MLDB.getDatabase().rawQuery(sql, params.toArray(new String[]{}))) {
             if (!c.moveToNext()) return;
 
             String profileUUID = c.getString(0);
             int transactionId = c.getInt(1);
             LedgerTransaction tr;
-            try (LockHolder lh = Data.profiles.lockForReading()) {
-                MobileLedgerProfile profile = null;
-                for (int i = 0; i < Data.profiles.size(); i++) {
-                    MobileLedgerProfile p = Data.profiles.get(i);
-                    if (p.getUuid().equals(profileUUID)) {
-                        profile = p;
-                        break;
-                    }
-                }
-                if (profile == null) throw new RuntimeException(String.format(
-                        "Unable to find profile %s, which is supposed to contain " +
-                        "transaction %d with description %s", profileUUID, transactionId,
-                        description));
+            MobileLedgerProfile profile = Data.getProfile(profileUUID);
+            if (profile == null) throw new RuntimeException(String.format(
+                    "Unable to find profile %s, which is supposed to contain " +
+                    "transaction %d with description %s", profileUUID, transactionId, description));
 
-                tr = profile.loadTransaction(transactionId);
-            }
-            int i = 0;
+            tr = profile.loadTransaction(transactionId);
             table = findViewById(R.id.new_transaction_accounts_table);
             ArrayList<LedgerTransactionAccount> accounts = tr.getAccounts();
             TableRow firstNegative = null;
             int negativeCount = 0;
-            for (i = 0; i < accounts.size(); i++) {
+            for (int i = 0; i < accounts.size(); i++) {
                 LedgerTransactionAccount acc = accounts.get(i);
                 TableRow row = (TableRow) table.getChildAt(i);
                 if (row == null) row = doAddAccountRow(false);