Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reallign from master #4

Merged
merged 3 commits into from
Jan 18, 2025
Merged

Reallign from master #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
841e97e
Fix order in entity for payee and Tag
wolfsolver Jan 17, 2025
4378a18
Merge pull request #2084 from moneymanagerex/fix_order_in_entity
wolfsolver Jan 17, 2025
d4d15ad
Merge branch 'refactor_category_to_base_list' into master
wolfsolver Jan 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/main/java/com/money/manager/ex/payee/PayeeListFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ public class PayeeListFragment
// private static final long MENU_ITEM_ADD = 1;
private static final int ID_LOADER_PAYEE = 0;

private static final String SORT_BY_USAGE = "(SELECT COUNT(*) FROM CHECKINGACCOUNT_V1 WHERE PAYEE_V1.PAYEEID = CHECKINGACCOUNT_V1.PAYEEID AND (CHECKINGACCOUNT_V1.DELETEDTIME IS NULL OR CHECKINGACCOUNT_V1.DELETEDTIME = '') ) DESC";
private static final String SORT_BY_NAME = "UPPER(" + Payee.PAYEENAME + ")";
private static final String SORT_BY_USAGE = "(SELECT COUNT(*) FROM CHECKINGACCOUNT_V1 WHERE PAYEE_V1.PAYEEID = CHECKINGACCOUNT_V1.PAYEEID AND (CHECKINGACCOUNT_V1.DELETEDTIME IS NULL OR CHECKINGACCOUNT_V1.DELETEDTIME = '') ) DESC";

private Context mContext;
private String mCurFilter;
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/money/manager/ex/tag/TagListFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public class TagListFragment extends BaseListFragment
private static final int ID_LOADER_TAG = 0;

private static final String SORT_BY_NAME = "UPPER(" + Tag.TAGNAME + ")";
private static final String SORT_BY_USAGE = "(SELECT COUNT(*) FROM TAGLINK_V1 WHERE TAGID = TAGLINK_V1.TAGID ) DESC";
private static final String SORT_BY_USAGE = "(SELECT COUNT(*) FROM TAGLINK_V1 WHERE TAG_V1.TAGID = TAGLINK_V1.TAGID ) DESC";

private Context mContext;
private String mCurFilter;
Expand Down
Loading