diff --git a/BudgetMasterServer/src/main/resources/static/css/style.css b/BudgetMasterServer/src/main/resources/static/css/style.css index ff2ce6f44f157afb95b0f878f92fd83dd6b54b63..28e881f4d640ec6e06fbb3018a0dc155397b8f2a 100644 --- a/BudgetMasterServer/src/main/resources/static/css/style.css +++ b/BudgetMasterServer/src/main/resources/static/css/style.css @@ -375,9 +375,18 @@ input[type="radio"]:checked + span::after, [type="radio"].with-gap:checked + spa border: 3px solid var(--color-grey); } +.global-account-select-option-column-2 { + display: flex; + flex-direction: column; + margin-left: 2rem; +} + .global-account-select-option-name { font-size: 1.4rem; - margin-left: 2rem; +} + +.global-account-select-option-balance { + font-size: 1.4rem; } .global-account-select-option-content { diff --git a/BudgetMasterServer/src/main/resources/templates/globalAccountSelectModal.ftl b/BudgetMasterServer/src/main/resources/templates/globalAccountSelectModal.ftl index e04f1ab3101c819bee8682833b1d063cea48e227..d2c87f95afbaa4f5ab3148abb6392a1dbfcc2f49 100644 --- a/BudgetMasterServer/src/main/resources/templates/globalAccountSelectModal.ftl +++ b/BudgetMasterServer/src/main/resources/templates/globalAccountSelectModal.ftl @@ -3,6 +3,7 @@ <#import "helpers/header.ftl" as header> <#import "helpers/customSelectMacros.ftl" as customSelectMacros> +<@header.globals/> <div id="modalGlobalAccountSelect" class="modal modal-fixed-footer background-color-light"> <div class="modal-content"> @@ -39,7 +40,15 @@ </#if> <div class="global-account-select-option-content"> <@customSelectMacros.accountIcon account accountName "category-circle-preview account-icon-big"/> - <div class="global-account-select-option-name truncate">${accountName}</div> + <div class="global-account-select-option-column-2"> + <div class="global-account-select-option-name truncate">${accountName}</div> + <#assign accountBudget = helpers.getAccountBudgetByID(account.getID())/> + <#if accountBudget <= 0> + <div class="global-account-select-option-balance ${redTextColor}">${currencyService.getCurrencyString(accountBudget)}</div> + <#else> + <div class="global-account-select-option-balance ${greenTextColor}">${currencyService.getCurrencyString(accountBudget)}</div> + </#if> + </div> </div> </div> </a> diff --git a/BudgetMasterServer/src/main/resources/templates/helpers/navbar.ftl b/BudgetMasterServer/src/main/resources/templates/helpers/navbar.ftl index 977ab1f0a14d6e09e1179b8337bd96091baf5b5e..f3925e9f957d4bf422f9f0fdbd99bf7d39368202 100644 --- a/BudgetMasterServer/src/main/resources/templates/helpers/navbar.ftl +++ b/BudgetMasterServer/src/main/resources/templates/helpers/navbar.ftl @@ -102,7 +102,7 @@ <div class="truncate global-account-select-name text-default">${accountName}</div> <div> - <#assign accountBudget = helpers.getAccountBudget()/> + <#assign accountBudget = helpers.getCurrentAccountBudget()/> <#if accountBudget <= 0> <div class="global-account-select-budget ${redTextColor}">${currencyService.getCurrencyString(accountBudget)}</div> <#else>