X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fmodel%2FMobileLedgerProfile.java;h=925e05eb3fd95ef3ddd64efd83c3b654ead3c0b7;hp=2cd159c5e7079c840e333f56da1e5c0c6eaf99a8;hb=217da55a224e2ae899d0b50604e2e54f882ec04f;hpb=54002a662d97289a739d3cdb9888bbab58a8064f 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 2cd159c5..925e05eb 100644 --- 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 @@ -32,6 +32,7 @@ import net.ktnx.mobileledger.async.SendTransactionTask; import net.ktnx.mobileledger.utils.Globals; import net.ktnx.mobileledger.utils.Logger; import net.ktnx.mobileledger.utils.MLDB; +import net.ktnx.mobileledger.utils.Misc; import java.util.ArrayList; import java.util.Date; @@ -42,16 +43,21 @@ 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; private String authUserName; private String authPassword; - private int themeId; + 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() { @@ -64,15 +70,18 @@ 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; authUserName = origin.authUserName; authPassword = origin.authPassword; - themeId = origin.themeId; + themeHue = origin.themeHue; 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 @@ -82,7 +91,9 @@ 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 FROM " + + "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()) { @@ -97,6 +108,10 @@ public final class MobileLedgerProfile { item.orderNo = cursor.getInt(8); 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)) @@ -108,7 +123,7 @@ public final class MobileLedgerProfile { } public static void storeProfilesOrder() { SQLiteDatabase db = App.getDatabase(); - db.beginTransaction(); + db.beginTransactionNonExclusive(); try { int orderNo = 0; for (MobileLedgerProfile p : Data.profiles.getValue()) { @@ -123,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; } @@ -203,20 +242,22 @@ public final class MobileLedgerProfile { } public void storeInDB() { SQLiteDatabase db = App.getDatabase(); - db.beginTransaction(); + db.beginTransactionNonExclusive(); try { // debug("profiles", String.format("Storing profile in DB: uuid=%s, name=%s, " + // "url=%s, permit_posting=%s, authEnabled=%s, " + -// "themeId=%d", uuid, name, url, -// permitPosting ? "TRUE" : "FALSE", authEnabled ? "TRUE" : "FALSE", themeId)); +// "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) " + - "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, themeId, orderNo, - preferredAccountsFilter, futureDates.toInt() + authEnabled ? authPassword : null, themeHue, orderNo, + preferredAccountsFilter, futureDates.toInt(), apiVersion.toInt(), + showCommodityByDefault, defaultCommodity, showCommentsByDefault }); db.setTransactionSuccessful(); } @@ -242,7 +283,7 @@ public final class MobileLedgerProfile { public void storeAccountValue(SQLiteDatabase db, String name, String currency, Float amount) { db.execSQL("replace into account_values(profile, account, " + "currency, value, keep) values(?, ?, ?, ?, 1);", - new Object[]{uuid, name, currency, amount}); + new Object[]{uuid, name, Misc.emptyIsNull(currency), amount}); } public void storeTransaction(SQLiteDatabase db, LedgerTransaction tr) { tr.fillDataHash(); @@ -251,17 +292,20 @@ 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()) { db.execSQL("INSERT INTO transaction_accounts(profile, transaction_id, " + - "account_name, amount, currency) values(?, ?, ?, ?, ?)", + "account_name, amount, currency, comment) values(?, ?, ?, ?, ?, ?)", new Object[]{uuid, tr.getId(), item.getAccountName(), item.getAmount(), - item.getCurrency() + Misc.nullIsEmpty(item.getCurrency()), item.getComment() }); } // debug("profile", String.format("Transaction %d stored", tr.getId())); @@ -322,7 +366,7 @@ public final class MobileLedgerProfile { public void removeFromDB() { SQLiteDatabase db = App.getDatabase(); debug("db", String.format("removing profile %s from DB", uuid)); - db.beginTransaction(); + db.beginTransactionNonExclusive(); try { Object[] uuid_param = new Object[]{uuid}; db.execSQL("delete from profiles where uuid=?", uuid_param); @@ -389,17 +433,16 @@ public final class MobileLedgerProfile { return tr; } - public int getThemeId() { -// debug("profile", String.format("Profile.getThemeId() returning %d", themeId)); - return this.themeId; + public int getThemeHue() { +// debug("profile", String.format("Profile.getThemeHue() returning %d", themeHue)); + return this.themeHue; } - public void setThemeId(Object o) { - setThemeId(Integer.valueOf(String.valueOf(o)) - .intValue()); + public void setThemeHue(Object o) { + setThemeId(Integer.parseInt(String.valueOf(o))); } - public void setThemeId(int themeId) { -// debug("profile", String.format("Profile.setThemeId(%d) called", themeId)); - this.themeId = themeId; + public void setThemeId(int themeHue) { +// debug("profile", String.format("Profile.setThemeHue(%d) called", themeHue)); + this.themeHue = themeHue; } public void markTransactionsAsNotPresent(SQLiteDatabase db) { db.execSQL("UPDATE transactions set keep=0 where profile=?", new String[]{uuid}); @@ -488,9 +531,45 @@ public final class MobileLedgerProfile { db.endTransaction(); } } + public List getCurrencies() { + SQLiteDatabase db = App.getDatabase(); + + ArrayList result = new ArrayList<>(); + + try (Cursor c = db.rawQuery("SELECT c.id, c.name, c.position, c.has_gap FROM currencies c", + new String[]{})) + { + while (c.moveToNext()) { + Currency currency = new Currency(c.getInt(0), c.getString(1), + Currency.Position.valueOf(c.getInt(2)), c.getInt(3) == 1); + result.add(currency); + } + } + + return result; + } + Currency loadCurrencyByName(String name) { + SQLiteDatabase db = App.getDatabase(); + Currency result = tryLoadCurrencyByName(db, name); + if (result == null) + throw new RuntimeException(String.format("Unable to load currency '%s'", name)); + return result; + } + private Currency tryLoadCurrencyByName(SQLiteDatabase db, String name) { + try (Cursor cursor = db.rawQuery( + "SELECT c.id, c.name, c.position, c.has_gap FROM currencies c WHERE c.name=?", + new String[]{name})) + { + if (cursor.moveToFirst()) { + return new Currency(cursor.getInt(0), cursor.getString(1), + Currency.Position.valueOf(cursor.getInt(2)), cursor.getInt(3) == 1); + } + return null; + } + } public enum FutureDates { - None(0), OneMonth(30), TwoMonths(60), ThreeMonths(90), SixMonths(180), OneYear(365), - All(-1); + None(0), OneWeek(7), TwoWeeks(14), OneMonth(30), TwoMonths(60), ThreeMonths(90), + SixMonths(180), OneYear(365), All(-1); private static SparseArray map = new SparseArray<>(); static { @@ -511,6 +590,10 @@ public final class MobileLedgerProfile { } public String getText(Resources resources) { switch (value) { + case 7: + return resources.getString(R.string.future_dates_7); + case 14: + return resources.getString(R.string.future_dates_14); case 30: return resources.getString(R.string.future_dates_30); case 60: