From d0408b3eb3a14ac7a2885a3d9c03966d4c8044c1 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Tue, 23 Aug 2022 22:10:50 +0200
Subject: [PATCH] #400 - show date with month name and year + center
---
.../deadlocker8/budgetmaster/services/DateFormatStyle.java | 3 ++-
.../de/deadlocker8/budgetmaster/services/DateService.java | 5 +++++
.../src/main/resources/static/css/transactions.css | 4 ++++
.../main/resources/templates/transactions/transactions.ftl | 4 ++--
4 files changed, 13 insertions(+), 3 deletions(-)
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 6edfc6ce2..1303348df 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 cfdc8152b..09dbdbaab 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 2f66a78c4..8651d6d01 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 b2f61698c..0cde0acc4 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/>
--
GitLab