Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
BudgetMaster
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Robert Goldmann
BudgetMaster
Commits
073e92ff
Commit
073e92ff
authored
6 years ago
by
Robert Goldmann
Browse files
Options
Downloads
Patches
Plain Diff
Fixed #4120 -
https://github.com/deadlocker8/BudgetMaster/issues/420
parent
f411371e
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Pipeline
#977
passed
6 years ago
Stage: build
Stage: test
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/resources/templates/transactions/transactions.ftl
+23
-9
23 additions, 9 deletions
src/main/resources/templates/transactions/transactions.ftl
src/main/resources/templates/transactions/transactionsMacros.ftl
+7
-7
7 additions, 7 deletions
...n/resources/templates/transactions/transactionsMacros.ftl
with
30 additions
and
16 deletions
src/main/resources/templates/transactions/transactions.ftl
+
23
−
9
View file @
073e92ff
...
@@ -50,18 +50,32 @@
...
@@ -50,18 +50,32 @@
<#-- transactions list -->
<#-- transactions list -->
<br>
<br>
<#list transactions as transaction>
<#list transactions as transaction>
<div class="hide-on-large-only">
<div class="row valign-wrapper transaction-row">
<div class="row valign-wrapper transaction-row">
<div class="col s3
l1
center-align bold transaction-text">
<div class="col s3 center-align bold transaction-text">
$
{
helpers
.getDateStringWithoutYear
(
transaction
.date
)}
$
{
helpers
.getDateStringWithoutYear
(
transaction
.date
)}
</div>
</div>
<@transactionsMacros.transactionRepeating transaction/>
<@transactionsMacros.transactionRepeating transaction/>
<@transactionsMacros.transactionButtons transaction/>
<@transactionsMacros.transactionButtons transaction/>
</div>
</div>
<div class="row valign-wrapper">
<div class="row valign-wrapper">
<@transactionsMacros.transactionCategory transaction/>
<@transactionsMacros.transactionCategory transaction
"center-align"
/>
<@transactionsMacros.transactionNameAndDescription transaction/>
<@transactionsMacros.transactionNameAndDescription transaction/>
<@transactionsMacros.transactionAmount transaction.getAmount()/>
<@transactionsMacros.transactionAmount transaction.getAmount()/>
</div>
</div>
</div>
<div class="hide-on-med-and-down">
<div class="row valign-wrapper transaction-row">
<div class="col l1 xl1 bold transaction-text">
$
{
helpers
.getDateStringWithoutYear
(
transaction
.date
)}
</div>
<@transactionsMacros.transactionCategory transaction "left-align"/>
<@transactionsMacros.transactionRepeating transaction/>
<@transactionsMacros.transactionNameAndDescription transaction/>
<@transactionsMacros.transactionAmount transaction.getAmount()/>
<@transactionsMacros.transactionButtons transaction/>
</div>
</div>
<hr>
<hr>
</#list>
</#list>
...
...
This diff is collapsed.
Click to expand it.
src/main/resources/templates/transactions/transactionsMacros.ftl
+
7
−
7
View file @
073e92ff
<#
import
"/spring.ftl" as s>
<#
import
"/spring.ftl" as s>
<#
macro
transactionRepeating transaction>
<#
macro
transactionRepeating transaction>
<div class="col s1 l1">
<div class="col s1 l1
xl1
">
<i class="material-icons <#if !transaction.isRepeating()>invisible</#if>">repeat</i>
<i class="material-icons <#if !transaction.isRepeating()>invisible</#if>">repeat</i>
</div>
</div>
</#
macro
>
</#
macro
>
<#
macro
transactionCategory transaction>
<#
macro
transactionCategory transaction
alignment
>
<div class="col s3 l1
center-align
">
<div class="col s3 l1
xl1 $
{
alignment
}
">
<div class="hide-on-med-and-down">
<div class="hide-on-med-and-down">
<div class="category-circle" style="background-color: $
{
transaction
.category.color
}
">
<div class="category-circle" style="background-color: $
{
transaction
.category.color
}
">
<span style="color: $
{
transaction
.category.getAppropriateTextColor
()}
">
<span style="color: $
{
transaction
.category.getAppropriateTextColor
()}
">
...
@@ -26,7 +26,7 @@
...
@@ -26,7 +26,7 @@
</#
macro
>
</#
macro
>
<#
macro
transactionNameAndDescription transaction>
<#
macro
transactionNameAndDescription transaction>
<div class="col s5 l
7
">
<div class="col s5 l
4 xl5
">
<div class="truncate transaction-text">$
{
transaction
.name
}
</div>
<div class="truncate transaction-text">$
{
transaction
.name
}
</div>
<div class="hide-on-med-and-down">
<div class="hide-on-med-and-down">
<#if transaction.description??>
<#if transaction.description??>
...
@@ -38,14 +38,14 @@
...
@@ -38,14 +38,14 @@
<#
macro
transactionAmount amount>
<#
macro
transactionAmount amount>
<#if amount <= 0>
<#if amount <= 0>
<div class="col s4 bold $
{
redTextColor
}
no-wrap right-align transaction-text">$
{
helpers
.getCurrencyString
(
amount
)}
</div>
<div class="col s4
l3 xl3
bold $
{
redTextColor
}
no-wrap right-align transaction-text">$
{
helpers
.getCurrencyString
(
amount
)}
</div>
<#else>
<#else>
<div class="col s4 bold $
{
greenTextColor
}
no-wrap right-align transaction-text">$
{
helpers
.getCurrencyString
(
amount
)}
</div>
<div class="col s4
l3 xl3
bold $
{
greenTextColor
}
no-wrap right-align transaction-text">$
{
helpers
.getCurrencyString
(
amount
)}
</div>
</#if>
</#if>
</#
macro
>
</#
macro
>
<#
macro
transactionButtons transaction>
<#
macro
transactionButtons transaction>
<div class="col s8 l1
0
right-align transaction-buttons">
<div class="col s8 l
2 xl
1 right-align transaction-buttons
no-wrap
">
<#if (transaction.category.type.name() != "REST")>
<#if (transaction.category.type.name() != "REST")>
<a href="<@s.url '/transactions/$
{
transaction
.ID
?
c
}
/edit'/>" class="btn-flat no-padding text-color"><i class="material-icons left">edit</i></a>
<a href="<@s.url '/transactions/$
{
transaction
.ID
?
c
}
/edit'/>" class="btn-flat no-padding text-color"><i class="material-icons left">edit</i></a>
<a href="<@s.url '/transactions/$
{
transaction
.ID
?
c
}
/requestDelete'/>" class="btn-flat no-padding text-color"><i class="material-icons left no-margin">delete</i></a>
<a href="<@s.url '/transactions/$
{
transaction
.ID
?
c
}
/requestDelete'/>" class="btn-flat no-padding text-color"><i class="material-icons left no-margin">delete</i></a>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment