rework transaction date handling

[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 956878e9b12bd0065df61074b6d8001e161e39d2..925e05eb3fd95ef3ddd64efd83c3b654ead3c0b7 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/model/MobileLedgerProfile.java
+++ b/app/src/main/java/net/ktnx/mobileledger/model/MobileLedgerProfile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2019 Damyan Ivanov.
+ * Copyright © 2020 Damyan Ivanov.
  * This file is part of MoLe.
  * MoLe is free software: you can distribute it and/or modify it
  * under the term of the GNU General Public License as published by
@@ -43,9 +43,13 @@ import java.util.UUID;
 import static net.ktnx.mobileledger.utils.Logger.debug;
 
 public final class MobileLedgerProfile {
+    // N.B. when adding new fields, update the copy-constructor below
     private String uuid;
     private String name;
     private boolean permitPosting;
+    private boolean showCommentsByDefault;
+    private boolean showCommodityByDefault;
+    private String defaultCommodity;
     private String preferredAccountsFilter;
     private String url;
     private boolean authEnabled;
@@ -53,6 +57,7 @@ public final class MobileLedgerProfile {
     private String authPassword;
     private int themeHue;
     private int orderNo = -1;
+    // N.B. when adding new fields, update the copy-constructor below
     private FutureDates futureDates = FutureDates.None;
     private SendTransactionTask.API apiVersion = SendTransactionTask.API.auto;
     public MobileLedgerProfile() {
@@ -65,6 +70,8 @@ public final class MobileLedgerProfile {
         uuid = origin.uuid;
         name = origin.name;
         permitPosting = origin.permitPosting;
+        showCommentsByDefault = origin.showCommentsByDefault;
+        showCommodityByDefault = origin.showCommodityByDefault;
         preferredAccountsFilter = origin.preferredAccountsFilter;
         url = origin.url;
         authEnabled = origin.authEnabled;
@@ -74,6 +81,7 @@ public final class MobileLedgerProfile {
         orderNo = origin.orderNo;
         futureDates = origin.futureDates;
         apiVersion = origin.apiVersion;
+        defaultCommodity = origin.defaultCommodity;
     }
     // loads all profiles into Data.profiles
     // returns the profile with the given UUID
@@ -83,8 +91,10 @@ public final class MobileLedgerProfile {
         SQLiteDatabase db = App.getDatabase();
         try (Cursor cursor = db.rawQuery("SELECT uuid, name, url, use_authentication, auth_user, " +
                                          "auth_password, permit_posting, theme, order_no, " +
-                                         "preferred_accounts_filter, future_dates, api_version " +
-                                         "FROM " + "profiles order by order_no", null))
+                                         "preferred_accounts_filter, future_dates, api_version, " +
+                                         "show_commodity_by_default, default_commodity, " +
+                                         "show_comments_by_default FROM " +
+                                         "profiles order by order_no", null))
         {
             while (cursor.moveToNext()) {
                 MobileLedgerProfile item = new MobileLedgerProfile(cursor.getString(0));
@@ -99,6 +109,9 @@ public final class MobileLedgerProfile {
                 item.setPreferredAccountsFilter(cursor.getString(9));
                 item.setFutureDates(cursor.getInt(10));
                 item.setApiVersion(cursor.getInt(11));
+                item.setShowCommodityByDefault(cursor.getInt(12) == 1);
+                item.setDefaultCommodity(cursor.getString(13));
+                item.setShowCommentsByDefault(cursor.getInt(14) == 1);
                 list.add(item);
                 if (item.getUuid()
                         .equals(currentProfileUUID))
@@ -125,6 +138,30 @@ public final class MobileLedgerProfile {
             db.endTransaction();
         }
     }
+    public boolean getShowCommentsByDefault() {
+        return showCommentsByDefault;
+    }
+    public void setShowCommentsByDefault(boolean newValue) {
+        this.showCommentsByDefault = newValue;
+    }
+    public boolean getShowCommodityByDefault() {
+        return showCommodityByDefault;
+    }
+    public void setShowCommodityByDefault(boolean showCommodityByDefault) {
+        this.showCommodityByDefault = showCommodityByDefault;
+    }
+    public String getDefaultCommodity() {
+        return defaultCommodity;
+    }
+    public void setDefaultCommodity(String defaultCommodity) {
+        this.defaultCommodity = defaultCommodity;
+    }
+    public void setDefaultCommodity(CharSequence defaultCommodity) {
+        if (defaultCommodity == null)
+            this.defaultCommodity = null;
+        else
+            this.defaultCommodity = String.valueOf(defaultCommodity);
+    }
     public SendTransactionTask.API getApiVersion() {
         return apiVersion;
     }
@@ -212,13 +249,15 @@ public final class MobileLedgerProfile {
 //                                            "themeHue=%d", uuid, name, url,
 //                    permitPosting ? "TRUE" : "FALSE", authEnabled ? "TRUE" : "FALSE", themeHue));
             db.execSQL("REPLACE INTO profiles(uuid, name, permit_posting, url, " +
-                       "use_authentication, auth_user, " +
-                       "auth_password, theme, order_no, preferred_accounts_filter, future_dates, " +
-                       "api_version) " + "VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
+                       "use_authentication, auth_user, auth_password, theme, order_no, " +
+                       "preferred_accounts_filter, future_dates, api_version, " +
+                       "show_commodity_by_default, default_commodity, show_comments_by_default) " +
+                       "VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
                     new Object[]{uuid, name, permitPosting, url, authEnabled,
                                  authEnabled ? authUserName : null,
                                  authEnabled ? authPassword : null, themeHue, orderNo,
-                                 preferredAccountsFilter, futureDates.toInt(), apiVersion.toInt()
+                                 preferredAccountsFilter, futureDates.toInt(), apiVersion.toInt(),
+                                 showCommodityByDefault, defaultCommodity, showCommentsByDefault
                     });
             db.setTransactionSuccessful();
         }
@@ -253,10 +292,13 @@ public final class MobileLedgerProfile {
         db.execSQL("DELETE from transaction_accounts WHERE profile = ? and transaction_id=?",
                 new Object[]{uuid, tr.getId()});
 
-        db.execSQL("INSERT INTO transactions(profile, id, date, description, data_hash, keep) " +
-                   "values(?,?,?,?,?,1)",
-                new Object[]{uuid, tr.getId(), Globals.formatLedgerDate(tr.getDate()),
-                             tr.getDescription(), tr.getDataHash()
+        db.execSQL(
+                "INSERT INTO transactions(profile, id, year, month, day, description, "+
+                "comment, data_hash, keep) " +
+                "values(?,?,?,?,?,?,?,?,1)",
+                new Object[]{uuid, tr.getId(), tr.getDate().year, tr.getDate().month,
+                             tr.getDate().day, tr.getDescription(),
+                             tr.getComment(), tr.getDataHash()
                 });
 
         for (LedgerTransactionAccount item : tr.getAccounts()) {
@@ -396,7 +438,7 @@ public final class MobileLedgerProfile {
         return this.themeHue;
     }
     public void setThemeHue(Object o) {
-        setThemeId(Integer.valueOf(String.valueOf(o)));
+        setThemeId(Integer.parseInt(String.valueOf(o)));
     }
     public void setThemeId(int themeHue) {
 //        debug("profile", String.format("Profile.setThemeHue(%d) called", themeHue));