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

Fixed #343 - show localized name of catgeories rest and none

parent b3c24a04
Branches
Tags
No related merge requests found
Pipeline #297 passed
Stage: build
Stage: test
Show whitespace changes
Inline Side-by-side
src/main/resources/templates/categories/categories.ftl
+ 7
− 4
View file @ e4e3c094
...@@ -8,6 +8,8 @@ ...@@ -8,6 +8,8 @@
<#import "../navbar.ftl" as navbar> <#import "../navbar.ftl" as navbar>
<@navbar.navbar "categories"/> <@navbar.navbar "categories"/>
<#import "categoriesFunctions.ftl" as categoriesFunctions>
<main> <main>
<div class="card main-card background-color"> <div class="card main-card background-color">
<div class="container"> <div class="container">
...@@ -21,18 +23,19 @@ ...@@ -21,18 +23,19 @@
<div class="container"> <div class="container">
<table class="bordered"> <table class="bordered">
<#list categories as category> <#list categories as category>
<#assign categoryName=categoriesFunctions.getCategoryName(category)>
<tr> <tr>
<td> <td>
<div class="category-circle" style="background-color: ${category.color}"> <div class="category-circle" style="background-color: ${category.color}">
<span style="color: ${category.getAppropriateTextColor()}"> <span style="color: ${category.getAppropriateTextColor()}">
${category.name?capitalize[0]} ${categoryName?capitalize[0]}
</span> </span>
</div> </div>
</td> </td>
<td>${category.name}</td> <td>${categoryName}</td>
<td> <td>
<a href="/categories/${category.ID}/edit" class="btn-flat no-padding text-color"><i class="material-icons left">edit</i></a> <a href="/categories/${category.ID}/edit" class="btn-flat no-padding text-color"><i class="material-icons left">edit</i></a>
<#if (category.type.name() == "CUSTOM")> <#if (category.getType().name() == "CUSTOM")>
<a href="/categories/${category.ID}/requestDelete" class="btn-flat no-padding text-color"><i class="material-icons left">delete</i></a> <a href="/categories/${category.ID}/requestDelete" class="btn-flat no-padding text-color"><i class="material-icons left">delete</i></a>
</#if> </#if>
</td> </td>
......
src/main/resources/templates/categories/categoriesFunctions.ftl 0 → 100644
+ 13
− 0
View file @ e4e3c094
<#function getCategoryName category>
<#if category?? && category.getName()??>
<#if category.getType().name() == "NONE">
<#return locale.getString("category.none")>
<#elseif category.getType().name() == "REST">
<#return locale.getString("category.rest")>
<#else>
<#return category.getName()>
</#if>
<#else>
<#return "">
</#if>
</#function>
\ No newline at end of file
src/main/resources/templates/categories/newCategory.ftl
+ 6
− 2
View file @ e4e3c094
...@@ -9,6 +9,8 @@ ...@@ -9,6 +9,8 @@
<#import "../navbar.ftl" as navbar> <#import "../navbar.ftl" as navbar>
<@navbar.navbar "categories"/> <@navbar.navbar "categories"/>
<#import "categoriesFunctions.ftl" as categoriesFunctions>
<main> <main>
<div class="card main-card background-color"> <div class="card main-card background-color">
<div class="container"> <div class="container">
...@@ -26,7 +28,9 @@ ...@@ -26,7 +28,9 @@
<#-- name --> <#-- name -->
<div class="row"> <div class="row">
<div class="input-field col s12 m12 l8 offset-l2"> <div class="input-field col s12 m12 l8 offset-l2">
<input id="category-name" type="text" name="name" <@validation.validation "name"/> value="<#if category.getName()??>${category.getName()}</#if>"> <#assign categoryName=categoriesFunctions.getCategoryName(category)>
<input id="category-name" type="text" name="name" <@validation.validation "name"/> value="${categoryName}">
<label for="category-name">${locale.getString("category.new.label.name")}</label> <label for="category-name">${locale.getString("category.new.label.name")}</label>
</div> </div>
</div> </div>
......
src/main/resources/templates/transactions/newTransaction.ftl
+ 8
− 4
View file @ e4e3c094
...@@ -9,6 +9,8 @@ ...@@ -9,6 +9,8 @@
<#import "../navbar.ftl" as navbar> <#import "../navbar.ftl" as navbar>
<@navbar.navbar "transactions"/> <@navbar.navbar "transactions"/>
<#import "../categories/categoriesFunctions.ftl" as categoriesFunctions>
<main> <main>
<div class="card main-card background-color"> <div class="card main-card background-color">
<div class="container"> <div class="container">
...@@ -63,16 +65,18 @@ ...@@ -63,16 +65,18 @@
<div class="input-field col s12 m12 l8 offset-l2"> <div class="input-field col s12 m12 l8 offset-l2">
<select id="transaction-category" name="category" <@validation.validation "category"/>> <select id="transaction-category" name="category" <@validation.validation "category"/>>
<#list categories as category> <#list categories as category>
<#assign categoryName=categoriesFunctions.getCategoryName(category)>
<#if transaction.getCategory()??> <#if transaction.getCategory()??>
<#if transaction.getCategory().getID() == category.getID()> <#if transaction.getCategory().getID() == category.getID()>
<option selected value="${category.getID()}">${category.getName()}</option> <option selected value="${category.getID()}">${categoryName}</option>
<#elseif category.getType() != "REST"> <#elseif category.getType() != "REST">
<option value="${category.getID()}">${category.getName()}</option> <option value="${category.getID()}">${categoryName}</option>
</#if> </#if>
<#elseif category.getType() == "NONE"> <#elseif category.getType() == "NONE">
<option selected value="${category.getID()}">${category.getName()}</option> <option selected value="${category.getID()}">${categoryName}</option>
<#elseif category.getType() != "REST"> <#elseif category.getType() != "REST">
<option value="${category.getID()}">${category.getName()}</option> <option value="${category.getID()}">${categoryName}</option>
</#if> </#if>
</#list> </#list>
</select> </select>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment