Skip to content
Snippets Groups Projects
Commit 89cbff81 authored by Robert Goldmann's avatar Robert Goldmann
Browse files

Fixed #366 - sort account select

parent ce6cd9ae
No related branches found
No related tags found
No related merge requests found
Pipeline #331 passed
......@@ -42,14 +42,14 @@ public class AccountController extends BaseController
@RequestMapping("/accounts")
public String accounts(HttpServletRequest request, Model model)
{
model.addAttribute("accounts", accountRepository.findAllByOrderByNameAsc());
model.addAttribute("accounts", accountService.getAllAccountsAsc());
return "accounts/accounts";
}
@RequestMapping("/accounts/{ID}/requestDelete")
public String requestDeleteAccount(Model model, @PathVariable("ID") Integer ID)
{
model.addAttribute("accounts", accountRepository.findAllByOrderByNameAsc());
model.addAttribute("accounts", accountService.getAllAccountsAsc());
model.addAttribute("currentAccount", accountRepository.getOne(ID));
return "accounts/accounts";
}
......@@ -63,7 +63,7 @@ public class AccountController extends BaseController
return "redirect:/accounts";
}
model.addAttribute("accounts", accountRepository.findAllByOrderByNameAsc());
model.addAttribute("accounts", accountService.getAllAccountsAsc());
model.addAttribute("currentAccount", accountRepository.getOne(ID));
model.addAttribute("accountNotDeletable", true);
return "accounts/accounts";
......
......@@ -7,8 +7,8 @@ import de.deadlocker8.budgetmaster.database.Database;
import de.deadlocker8.budgetmaster.database.DatabaseParser;
import de.deadlocker8.budgetmaster.database.accountmatches.AccountMatchList;
import de.deadlocker8.budgetmaster.entities.Settings;
import de.deadlocker8.budgetmaster.repositories.AccountRepository;
import de.deadlocker8.budgetmaster.repositories.SettingsRepository;
import de.deadlocker8.budgetmaster.services.AccountService;
import de.deadlocker8.budgetmaster.services.DatabaseService;
import de.deadlocker8.budgetmaster.services.HelpersService;
import de.deadlocker8.budgetmaster.services.ImportService;
......@@ -58,7 +58,7 @@ public class SettingsController extends BaseController
private DatabaseService databaseService;
@Autowired
private AccountRepository accountRepository;
private AccountService accountService;
@Autowired
private ImportService importService;
......@@ -236,7 +236,7 @@ public class SettingsController extends BaseController
public String openAccountMatcher(WebRequest request, Model model)
{
model.addAttribute("database", request.getAttribute("database", WebRequest.SCOPE_SESSION));
model.addAttribute("availableAccounts", accountRepository.findAllByOrderByNameAsc());
model.addAttribute("availableAccounts", accountService.getAllAccountsAsc());
return "import";
}
......
package de.deadlocker8.budgetmaster.controller;
import de.deadlocker8.budgetmaster.entities.Transaction;
import de.deadlocker8.budgetmaster.entities.Settings;
import de.deadlocker8.budgetmaster.entities.Tag;
import de.deadlocker8.budgetmaster.entities.Transaction;
import de.deadlocker8.budgetmaster.repeating.RepeatingOption;
import de.deadlocker8.budgetmaster.repeating.RepeatingTransactionUpdater;
import de.deadlocker8.budgetmaster.repeating.endoption.*;
import de.deadlocker8.budgetmaster.repeating.modifier.*;
import de.deadlocker8.budgetmaster.repeating.modifier.RepeatingModifier;
import de.deadlocker8.budgetmaster.repeating.modifier.RepeatingModifierType;
import de.deadlocker8.budgetmaster.repositories.*;
import de.deadlocker8.budgetmaster.services.AccountService;
import de.deadlocker8.budgetmaster.services.HelpersService;
import de.deadlocker8.budgetmaster.services.TransactionService;
import de.deadlocker8.budgetmaster.utils.ResourceNotFoundException;
......@@ -37,7 +39,7 @@ public class TransactionController extends BaseController
private CategoryRepository categoryRepository;
@Autowired
private AccountRepository accountRepository;
private AccountService accountService;
@Autowired
private SettingsRepository settingsRepository;
......@@ -113,7 +115,7 @@ public class TransactionController extends BaseController
Transaction emptyTransaction = new Transaction();
model.addAttribute("currentDate", date);
model.addAttribute("categories", categoryRepository.findAllByOrderByNameAsc());
model.addAttribute("accounts", accountRepository.findAllByOrderByNameAsc());
model.addAttribute("accounts", accountService.getAllAccountsAsc());
model.addAttribute("transaction", emptyTransaction);
return "transactions/newTransaction";
}
......@@ -195,7 +197,7 @@ public class TransactionController extends BaseController
model.addAttribute("error", bindingResult);
model.addAttribute("currentDate", date);
model.addAttribute("categories", categoryRepository.findAllByOrderByNameAsc());
model.addAttribute("accounts", accountRepository.findAllByOrderByNameAsc());
model.addAttribute("accounts", accountService.getAllAccountsAsc());
model.addAttribute("transaction", transaction);
return "transactions/newTransaction";
}
......@@ -222,7 +224,7 @@ public class TransactionController extends BaseController
DateTime date = getDateTimeFromCookie(cookieDate);
model.addAttribute("currentDate", date);
model.addAttribute("categories", categoryRepository.findAllByOrderByNameAsc());
model.addAttribute("accounts", accountRepository.findAllByOrderByNameAsc());
model.addAttribute("accounts", accountService.getAllAccountsAsc());
model.addAttribute("transaction", transaction);
return "transactions/newTransaction";
}
......
......@@ -9,7 +9,7 @@ import java.util.List;
public interface AccountRepository extends JpaRepository<Account, Integer>
{
List<Account> findAllByOrderByNameAsc();
List<Account> findAllByTypeOrderByNameAsc(AccountType accountType);
Account findByName(String name);
......
......@@ -39,6 +39,13 @@ public class AccountService implements Resetable
return accountRepository;
}
public List<Account> getAllAccountsAsc()
{
List<Account> accounts = accountRepository.findAllByType(AccountType.ALL);
accounts.addAll(accountRepository.findAllByTypeOrderByNameAsc(AccountType.CUSTOM));
return accounts;
}
public void deleteAccount(int ID)
{
Account accountToDelete = accountRepository.findOne(ID);
......
......@@ -196,7 +196,7 @@ public class HelpersService
public List<Account> getAllAccounts()
{
return accountRepository.findAllByOrderByNameAsc();
return accountService.getAllAccountsAsc();
}
public Account getCurrentAccount()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment