MK13/financer
1
0
Fork 0
Code Issues 10 Actions Activity

#10 Create period overview

Browse Source
This commit is contained in:
MK13
2021-03-04 20:12:59 +01:00
parent 33a6fa2806
commit 4e7717f1e3
19 changed files with 85 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
financer-web-client/src/main/resources/static/changelog.txt
View File

@@ -5,6 +5,8 @@ v44 -> v45:
- #8 Make push service completely optional
- #1 Add missing description of IN clause to FQL search query options detail panel
- #12 Add BETWEEN clause support to FQL and support other operators beside = for date filtering
- #16 Replace HSQLDB with H2
- #10 Add period overview
v43 -> v44:
- #8: Remove hard dependency on push-service - integrate new release of push-service

3
financer-web-client/src/main/resources/static/css/darkModeColors.css
View File

@@ -12,5 +12,8 @@
--link-color: #87ab63;
--hover-color: #1f1f2f;
--border-color: #7f7f7f;
--bad-color: #D30000;
--good-color: #00A900;
--neutral-color: #7f7f7f;
}
/* --------------------- */

3
financer-web-client/src/main/resources/static/css/lightModeColors.css
View File

@@ -12,5 +12,8 @@
--link-color: #0000EE;
--hover-color: lightgrey;
--border-color: #ddd;
--bad-color: #D30000;
--good-color: #00A900;
--neutral-color: #000000;
}
/* --------------------- */

32
financer-web-client/src/main/resources/static/css/main.css
View File

@@ -9,7 +9,7 @@
font-style: normal;
font-weight: 400;
font-display: swap;
src: url(font/SourceCodePro_Regular_400.woff2) format('woff2');
src: url(../font/SourceCodePro_Regular_400.woff2) format('woff2');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
}
@@ -18,10 +18,38 @@
font-style: normal;
font-weight: 600;
font-display: swap;
src: url(font/SourceCodePro_Bold_600.woff2) format('woff2');
src: url(../font/SourceCodePro_Bold_600.woff2) format('woff2');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
}
@font-face {
font-family: 'Material Icons';
font-style: normal;
font-weight: 400;
src: url(../font/Material_Icons.woff2) format('woff2');
}
.icon {
font-family: 'Material Icons';
vertical-align: middle;
}
.color-good {
color: var(--good-color);
}
.color-bad {
color: var(--bad-color);
}
.color-neutral {
color: var(--neutral-color);
}
#period-overview-asset-container {
display: inline;
}
body {
color: var(--text-color);
background-color: var(--background-color);

BIN
financer-web-client/src/main/resources/static/font/Material_Icons.woff2 Normal file
View File

Binary file not shown.

11
financer-web-client/src/main/resources/templates/period/periodOverview.html
View File

@@ -36,8 +36,15 @@
<td th:utext="${#numbers.formatDecimal(periodOverview.liabilitySum/100D, 1, 'DEFAULT', 2, 'DEFAULT') + currencySymbol}"/>
<td th:utext="${#numbers.formatDecimal(periodOverview.total/100D, 1, 'DEFAULT', 2, 'DEFAULT') + currencySymbol}"
th:classappend="${periodOverview.total > periodOverview.incomeSum} ? overspend"/>
<td th:if="${periodOverview.assetsSum != null}"
th:utext="${#numbers.formatDecimal(periodOverview.assetsSum/100D, 1, 'DEFAULT', 2, 'DEFAULT') + currencySymbol}"/>
<td th:if="${periodOverview.assetsSum != null}">
<div id="period-overview-asset-container">
<span th:utext="${#numbers.formatDecimal(periodOverview.assetsSum/100D, 1, 'DEFAULT', 2, 'DEFAULT') + currencySymbol}"/>
<span th:if="${periodOverview.assetTrend == T(de.financer.dto.AssetTrend).UP}" class="icon color-good">&#xe8e5;</span>
<span th:if="${periodOverview.assetTrend == T(de.financer.dto.AssetTrend).DOWN}" class="icon color-bad">&#xe8e3;</span>
<span th:if="${periodOverview.assetTrend == T(de.financer.dto.AssetTrend).EQUAL}" class="icon color-neutral">&#xe8e4;</span>
</div>
</td>
<td th:if="${periodOverview.assetsSum == null}" />
<td th:text="${periodOverview.transactionCount}"/>
</tr>