X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2FNewTransactionActivity.java;h=5b382873aa6b9a02a0f174dd72f63a6ae3e5da25;hb=cc080f415ad546183c7d92d8f58dddefb60560fe;hp=f86780408206b050bfeee566593619d7aeabf50d;hpb=48d2f79edc48f9aa504b5d0214429a8e5017bf3e;p=mobile-ledger.git

diff --git a/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java b/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java
index f8678040..5b382873 100644
--- a/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java
+++ b/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java
@@ -8,6 +8,7 @@ import android.os.Build;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.provider.FontsContract;
+import android.support.design.widget.BaseTransientBottomBar;
 import android.support.design.widget.Snackbar;
 import android.support.v4.app.DialogFragment;
 import android.support.v7.app.AppCompatActivity;
@@ -198,13 +199,20 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal
                 String[] col_names = {FontsContract.Columns._ID, field};
                 MatrixCursor c = new MatrixCursor(col_names);
 
-                Cursor matches = db.rawQuery(String.format("SELECT %s FROM %s WHERE UPPER(%s) LIKE '%%'||?||'%%' ORDER BY 1;", field, table, field), new String[]{str});
+                Cursor matches = db.rawQuery(String.format(
+                        "SELECT %s as a, case when %s_upper LIKE ?||'%%' then 1 " +
+                                "WHEN %s_upper LIKE '%%:'||?||'%%' then 2 " +
+                                "WHEN %s_upper LIKE '%% '||?||'%%' then 3 " + "else 9 end " +
+                                "FROM %s " + "WHERE %s_upper LIKE '%%'||?||'%%' " +
+                                "ORDER BY 2, 1;", field, field, field, field, table, field),
+                        new String[]{str, str, str, str});
 
                 try {
                     int i = 0;
                     while (matches.moveToNext()) {
                         String match = matches.getString(0);
-                        Log.d("autocompletion", String.format("match: %s", match));
+                        int order = matches.getInt(1);
+                        Log.d("autocompletion", String.format("match: %s |%d", match, order));
                         c.newRow().add(i++).add(match);
                     }
                 }
@@ -310,12 +318,17 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal
     }
 
     @Override
-    public void done() {
+    public
+    void done(String error) {
         progress.setVisibility(View.INVISIBLE);
         Log.d("visuals", "hiding progress");
 
-        reset_form();
+        if (error == null) reset_form();
+        else Snackbar.make(findViewById(R.id.new_transaction_accounts_table), error,
+                BaseTransientBottomBar.LENGTH_LONG).show();
+
         toggle_all_editing(true);
+        check_transaction_submittable();
     }
 
     private void reset_form() {