replace dates in transaction list items with delimiters between items in different...

[mobile-ledger.git] / app / src / main / java / net / ktnx / mobileledger / model / MobileLedgerProfile.java

diff --git a/app/src/main/java/net/ktnx/mobileledger/model/MobileLedgerProfile.java b/app/src/main/java/net/ktnx/mobileledger/model/MobileLedgerProfile.java
index 96fa9b215e88fc1727c2437fe0a213bf77ebf141..70c12ab90f6fd7e1a447727cc65c0cc9709278f4 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/model/MobileLedgerProfile.java
+++ b/app/src/main/java/net/ktnx/mobileledger/model/MobileLedgerProfile.java
@@ -21,6 +21,7 @@ import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.util.Log;
 
+import net.ktnx.mobileledger.utils.Globals;
 import net.ktnx.mobileledger.utils.MLDB;
 
 import java.util.ArrayList;
@@ -56,10 +57,11 @@ public final class MobileLedgerProfile {
         List<MobileLedgerProfile> result = new ArrayList<>();
         SQLiteDatabase db = MLDB.getReadableDatabase();
         try (Cursor cursor = db.rawQuery("SELECT uuid, name, url, use_authentication, auth_user, " +
-                                         "auth_password FROM profiles", null))
+                                         "auth_password FROM profiles order by order_no", null))
         {
             while (cursor.moveToNext()) {
-                result.add(new MobileLedgerProfile(cursor.getString(0), cursor.getString(1), cursor.getString(2), cursor.getInt(3) == 1, cursor.getString(4),
+                result.add(new MobileLedgerProfile(cursor.getString(0), cursor.getString(1),
+                        cursor.getString(2), cursor.getInt(3) == 1, cursor.getString(4),
                         cursor.getString(5)));
             }
         }
@@ -125,21 +127,21 @@ public final class MobileLedgerProfile {
     public String getName() {
         return name;
     }
-    public void setName(CharSequence text) {
-        setName(String.valueOf(text));
-    }
     public void setName(String name) {
         this.name = name;
     }
+    public void setName(CharSequence text) {
+        setName(String.valueOf(text));
+    }
     public String getUrl() {
         return url;
     }
-    public void setUrl(CharSequence text) {
-        setUrl(String.valueOf(text));
-    }
     public void setUrl(String url) {
         this.url = url;
     }
+    public void setUrl(CharSequence text) {
+        setUrl(String.valueOf(text));
+    }
     public boolean isAuthEnabled() {
         return authEnabled;
     }
@@ -149,21 +151,21 @@ public final class MobileLedgerProfile {
     public String getAuthUserName() {
         return authUserName;
     }
-    public void setAuthUserName(CharSequence text) {
-        setAuthUserName(String.valueOf(text));
-    }
     public void setAuthUserName(String authUserName) {
         this.authUserName = authUserName;
     }
+    public void setAuthUserName(CharSequence text) {
+        setAuthUserName(String.valueOf(text));
+    }
     public String getAuthPassword() {
         return authPassword;
     }
-    public void setAuthPassword(CharSequence text) {
-        setAuthPassword(String.valueOf(text));
-    }
     public void setAuthPassword(String authPassword) {
         this.authPassword = authPassword;
     }
+    public void setAuthPassword(CharSequence text) {
+        setAuthPassword(String.valueOf(text));
+    }
     public void storeInDB() {
         SQLiteDatabase db = MLDB.getWritableDatabase();
         db.beginTransaction();
@@ -179,16 +181,18 @@ public final class MobileLedgerProfile {
             db.endTransaction();
         }
     }
-    public void storeAccount(String name) {
+    public void storeAccount(LedgerAccount acc) {
         SQLiteDatabase db = MLDB.getWritableDatabase();
 
-        do {
-            LedgerAccount acc = new LedgerAccount(name);
-            db.execSQL("replace into accounts(profile, name, name_upper, level, keep) values(?, " +
-                       "?, ?, ?, 1)",
-                    new Object[]{this.uuid, name, name.toUpperCase(), acc.getLevel()});
-            name = acc.getParentName();
-        } while (name != null);
+        // replace into is a bad idea because it would reset hidden to its default value
+        // we like the default, but for new accounts only
+        db.execSQL("update accounts set level = ?, keep = 1 where profile=? and name = ?",
+                new Object[]{acc.getLevel(), uuid, acc.getName()});
+        db.execSQL("insert into accounts(profile, name, name_upper, parent_name, level) " +
+                   "select ?,?,?,?,? where (select changes() = 0)",
+                new Object[]{uuid, acc.getName(), acc.getName().toUpperCase(), acc.getParentName(),
+                             acc.getLevel()
+                });
     }
     public void storeAccountValue(String name, String currency, Float amount) {
         SQLiteDatabase db = MLDB.getWritableDatabase();
@@ -206,7 +210,8 @@ public final class MobileLedgerProfile {
 
         db.execSQL("INSERT INTO transactions(profile, id, date, description, data_hash, keep) " +
                    "values(?,?,?,?,?,1)",
-                new Object[]{uuid, tr.getId(), tr.getDate(), tr.getDescription(), tr.getDataHash()
+                new Object[]{uuid, tr.getId(), Globals.formatLedgerDate(tr.getDate()),
+                             tr.getDescription(), tr.getDataHash()
                 });
 
         for (LedgerTransactionAccount item : tr.getAccounts()) {
@@ -218,7 +223,7 @@ public final class MobileLedgerProfile {
         }
         Log.d("profile", String.format("Transaction %d stored", tr.getId()));
     }
-    public String get_option_value(String name, String default_value) {
+    public String getOption(String name, String default_value) {
         SQLiteDatabase db = MLDB.getReadableDatabase();
         try (Cursor cursor = db.rawQuery("select value from options where profile = ? and name=?",
                 new String[]{uuid, name}))
@@ -241,9 +246,9 @@ public final class MobileLedgerProfile {
             return default_value;
         }
     }
-    public long get_option_value(String name, long default_value) {
+    public long getLongOption(String name, long default_value) {
         long longResult;
-        String result = get_option_value(name, "");
+        String result = getOption(name, "");
         if ((result == null) || result.isEmpty()) {
             Log.d("profile", String.format("Returning default value for option %s", name));
             longResult = default_value;
@@ -261,18 +266,33 @@ public final class MobileLedgerProfile {
 
         return longResult;
     }
-    public void set_option_value(String name, String value) {
+    public void setOption(String name, String value) {
         Log.d("profile", String.format("setting option %s=%s", name, value));
         SQLiteDatabase db = MLDB.getWritableDatabase();
         db.execSQL("insert or replace into options(profile, name, value) values(?, ?, ?);",
                 new String[]{uuid, name, value});
     }
-    public void set_option_value(String name, long value) {
-        set_option_value(name, String.valueOf(value));
+    public void setLongOption(String name, long value) {
+        setOption(name, String.valueOf(value));
     }
     public void removeFromDB() {
         SQLiteDatabase db = MLDB.getWritableDatabase();
-        Log.d("db", String.format("removinf progile %s from DB", uuid));
+        Log.d("db", String.format("removing progile %s from DB", uuid));
         db.execSQL("delete from profiles where uuid=?", new Object[]{uuid});
     }
+    public LedgerAccount loadAccount(String name) {
+        SQLiteDatabase db = MLDB.getReadableDatabase();
+        try (Cursor cursor = db.rawQuery("SELECT hidden from accounts where profile=? and name=?",
+                new String[]{uuid, name}))
+        {
+            if (cursor.moveToFirst()) {
+                LedgerAccount acc = new LedgerAccount(name);
+                acc.setHidden(cursor.getInt(0) == 1);
+
+                return acc;
+            }
+        }
+
+        return null;
+    }
 }