diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/services/DateFormatStyle.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/services/DateFormatStyle.java index 6edfc6ce249dd3f1c45ffc670552e0d8762926a4..1303348df9a5014a61a1b2cc1bb2bfe6958b0864 100644 --- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/services/DateFormatStyle.java +++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/services/DateFormatStyle.java @@ -6,7 +6,8 @@ public enum DateFormatStyle NO_YEAR("dd.MM."), LONG("dd.MM.yyyy"), LONG_MONTH_AND_YEAR("MMMM yyyy"), - DATE_TIME("dd.MM.yyyy HH:mm"); + DATE_TIME("dd.MM.yyyy HH:mm"), + LONG_WITH_MONTH_NAME("dd. MMMM yyyy"); private final String key; diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/services/DateService.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/services/DateService.java index cfdc8152b17767fe003662a90d2fbe68ff2aa936..09dbdbaab11a5a7a68b0d8365a2461d73872202a 100644 --- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/services/DateService.java +++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/services/DateService.java @@ -44,6 +44,11 @@ public class DateService return getDateString(date, DateFormatStyle.DATE_TIME); } + public String getDateStringWithMonthName(LocalDate date) + { + return getDateString(date, DateFormatStyle.LONG_WITH_MONTH_NAME); + } + private String getDateString(LocalDate date, DateFormatStyle formatStyle) { return date.format(DateTimeFormatter.ofPattern(formatStyle.getKey()).withLocale(settingsService.getSettings().getLanguage().getLocale())); diff --git a/BudgetMasterServer/src/main/resources/static/css/transactions.css b/BudgetMasterServer/src/main/resources/static/css/transactions.css index 2f66a78c4b438dbd176aeb11c07f6ef0713449ab..8651d6d01775d3933acf4c212f5a08686fab8fac 100644 --- a/BudgetMasterServer/src/main/resources/static/css/transactions.css +++ b/BudgetMasterServer/src/main/resources/static/css/transactions.css @@ -76,10 +76,14 @@ min-width: 5.5rem; margin-top: 1.6rem; margin-bottom: 0.5rem; + color: #FFFFFFDD; + letter-spacing: 0.1rem; } .search-result .transaction-date { margin: 0; + color: var(--color-text); + letter-spacing: normal; } .new-transaction-button { diff --git a/BudgetMasterServer/src/main/resources/templates/transactions/transactions.ftl b/BudgetMasterServer/src/main/resources/templates/transactions/transactions.ftl index b2f61698cef6a6314882e7e85e80e951fb081298..0cde0acc404d29946c1fa1aba392932794bb40af 100644 --- a/BudgetMasterServer/src/main/resources/templates/transactions/transactions.ftl +++ b/BudgetMasterServer/src/main/resources/templates/transactions/transactions.ftl @@ -55,13 +55,13 @@ <#list transactions as transaction> <#assign shouldHighlight = highlightID?? && transaction.getID()?? && transaction.getID()==highlightID/> - <#assign transactionDate=dateService.getDateStringWithoutYear(transaction.date)/> + <#assign transactionDate=dateService.getDateStringWithMonthName(transaction.date)?upper_case/> <#if transactionDate != lastDate> <#if !transaction?is_first> </div> <#-- close "transaction-date-group" div from previous loop iteration --> </#if> <div class="transaction-date-group"> - <div class="col s12 left-align bold transaction-text transaction-date"> + <div class="col s12 center-align bold transaction-text transaction-date"> ${transactionDate} </div> <#assign lastDate=transactionDate/>