From 4afa528bd9a50bb1f6cf05ee34c1167602d75d12 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Mon, 7 Apr 2025 21:28:06 +0200
Subject: [PATCH] #774 - account overview: add table header + move end date to
separate column
---
.../resources/templates/accounts/accounts.ftl | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/BudgetMasterServer/src/main/resources/templates/accounts/accounts.ftl b/BudgetMasterServer/src/main/resources/templates/accounts/accounts.ftl
index 55079c6b8..215aa88ca 100644
--- a/BudgetMasterServer/src/main/resources/templates/accounts/accounts.ftl
+++ b/BudgetMasterServer/src/main/resources/templates/accounts/accounts.ftl
@@ -25,6 +25,17 @@
<br>
<div class="container account-container">
<table class="bordered">
+ <thead>
+ <tr>
+ <th>${locale.getString("account.new.label.state")}</th>
+ <th>${locale.getString("account.new.label.endDate")}</th>
+ <th>${locale.getString("account.new.label.icon")}</th>
+ <th>${locale.getString("account.new.label.name")}</th>
+ <th>${locale.getString("transaction.new.label.description")}</th>
+ <th>${locale.getString("categories.actions")}</th>
+ </tr>
+ </thead>
+
<#list accounts as account>
<#if (account.getType().name() == "CUSTOM")>
<tr class="account-overview-row">
@@ -39,9 +50,10 @@
<a href="<@s.url '/accounts/${account.getID()?c}/setAsDefault'/>" class="btn-flat no-padding text-default tooltipped" data-position="left" data-tooltip="${locale.getString("account.tooltip.default")}"><i class="material-icons left"><#if account.isDefault()>star<#else>star_border</#if></i></a>
<i class="fas fa-edit placeholder-icon-right"></i>
</#if>
-
+ </td>
+ <td>
<#if account.getEndDate()??>
- <i class="fas fa-bell"></i>
+ <i class="fas fa-bell placeholder-icon-right"></i> ${dateService.getDateStringNormal(account.getEndDate())}
<#else>
<div class="placeholder-icon"></div>
</#if>
--
GitLab