From 52df13f43daa69ef30d0aedc9044e14ea7712d7c Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Sun, 9 May 2021 10:28:10 +0200
Subject: [PATCH] Fixed #611 - "all accounts" should be on top of account
select
---
.../budgetmaster/accounts/AccountService.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/de/deadlocker8/budgetmaster/accounts/AccountService.java b/src/main/java/de/deadlocker8/budgetmaster/accounts/AccountService.java
index a1976d03a..067a1354e 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/accounts/AccountService.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/accounts/AccountService.java
@@ -46,26 +46,26 @@ public class AccountService implements Resettable, AccessAllEntities<Account>
@Override
public List<Account> getAllEntitiesAsc()
{
- List<Account> accounts = accountRepository.findAllByType(AccountType.ALL);
- accounts.addAll(accountRepository.findAllByTypeOrderByNameAsc(AccountType.CUSTOM));
+ final List<Account> accounts = accountRepository.findAllByTypeOrderByNameAsc(AccountType.CUSTOM);
accounts.sort((a1, a2) -> new NaturalOrderComparator().compare(a1.getName(), a2.getName()));
+ accounts.addAll(0, accountRepository.findAllByType(AccountType.ALL));
return accounts;
}
public List<Account> getAllActivatedAccountsAsc()
{
- List<Account> accounts = accountRepository.findAllByType(AccountType.ALL);
- accounts.addAll(accountRepository.findAllByTypeAndAccountStateOrderByNameAsc(AccountType.CUSTOM, AccountState.FULL_ACCESS));
+ List<Account> accounts = accountRepository.findAllByTypeAndAccountStateOrderByNameAsc(AccountType.CUSTOM, AccountState.FULL_ACCESS);
accounts.sort((a1, a2) -> new NaturalOrderComparator().compare(a1.getName(), a2.getName()));
+ accounts.addAll(0, accountRepository.findAllByType(AccountType.ALL));
return accounts;
}
public List<Account> getAllReadableAccounts()
{
- List<Account> accounts = accountRepository.findAllByType(AccountType.ALL);
- accounts.addAll(accountRepository.findAllByTypeAndAccountStateOrderByNameAsc(AccountType.CUSTOM, AccountState.FULL_ACCESS));
+ List<Account> accounts = accountRepository.findAllByTypeAndAccountStateOrderByNameAsc(AccountType.CUSTOM, AccountState.FULL_ACCESS);
accounts.addAll(accountRepository.findAllByTypeAndAccountStateOrderByNameAsc(AccountType.CUSTOM, AccountState.READ_ONLY));
accounts.sort((a1, a2) -> new NaturalOrderComparator().compare(a1.getName(), a2.getName()));
+ accounts.addAll(0, accountRepository.findAllByType(AccountType.ALL));
return accounts;
}
--
GitLab