work/timetrack
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

display finetuning

Browse Source
This commit is contained in:
Jörg Henke
2024-01-09 17:04:48 +01:00
parent 4820232b31
commit a4bcc00363
3 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -7,7 +7,7 @@ plugins {
apply plugin: 'io.spring.dependency-management' apply plugin: 'io.spring.dependency-management'
group = 'de.jottyfan' group = 'de.jottyfan'
version = '1.4.8' version = '1.4.9'
description = """timetrack""" description = """timetrack"""

30
src/main/resources/static/css/style.css
View File

@@ -277,8 +277,7 @@ body {
.emphgreen { .emphgreen {
font-weight: bolder; font-weight: bolder;
color: #136600; color: #136600;
border: 1px solid gray; border-radius: 0px 8px 8px 0px;
border-radius: 8px;
background-image: linear-gradient(to left, #e6e6e6, white); background-image: linear-gradient(to left, #e6e6e6, white);
padding: 4px; padding: 4px;
} }
@@ -286,8 +285,6 @@ body {
.emphblue { .emphblue {
font-weight: bolder; font-weight: bolder;
color: #1a5fb4; color: #1a5fb4;
border: 1px solid gray;
border-radius: 8px;
background-image: linear-gradient(to left, #e6e6e6, white); background-image: linear-gradient(to left, #e6e6e6, white);
padding: 4px; padding: 4px;
} }
@@ -295,8 +292,7 @@ body {
.emphorange { .emphorange {
font-weight: bolder; font-weight: bolder;
color: #c64600; color: #c64600;
border: 1px solid gray; border-radius: 0px 8px 8px 0px;
border-radius: 8px;
background-image: linear-gradient(to left, #e6e6e6, white); background-image: linear-gradient(to left, #e6e6e6, white);
padding: 4px; padding: 4px;
} }
@@ -304,8 +300,7 @@ body {
.emphred { .emphred {
font-weight: bolder; font-weight: bolder;
color: #a51d2d; color: #a51d2d;
border: 1px solid gray; border-radius: 0px 8px 8px 0px;
border-radius: 8px;
background-image: linear-gradient(to left, #e6e6e6, white); background-image: linear-gradient(to left, #e6e6e6, white);
padding: 4px; padding: 4px;
} }
@@ -313,12 +308,27 @@ body {
.emphpink { .emphpink {
font-weight: bolder; font-weight: bolder;
color: #613583; color: #613583;
border: 1px solid gray; border-radius: 0px 8px 8px 0px;
border-radius: 8px;
background-image: linear-gradient(to left, #e6e6e6, white); background-image: linear-gradient(to left, #e6e6e6, white);
padding: 4px; padding: 4px;
} }
.emphgray {
font-weight: bolder;
color: #5e5c64;
border-radius: 0px 8px 8px 0px;
background-image: linear-gradient(to left, #959595, #cecece);
padding: 4px;
}
.sumfield {
border: 1px solid;
border-radius: 8px;
padding: 4px;
padding-right: 0px;
margin-right: 4px;
}
.tab-pane-table { .tab-pane-table {
background-color: white; background-color: white;
padding: 8px; padding: 8px;

13
src/main/resources/templates/done/list.html
View File

@@ -126,12 +126,13 @@
</tbody> </tbody>
<tfoot> <tfoot>
<tr th:if="${daysum}"> <tr th:if="${daysum}">
<td>Start: <span class="emphgreen" th:text="${#temporals.format(daysum.daytimeFrom, 'HH:mm')}" th:if="${daysum.daytimeFrom}"></span></td> <td colspan="7"><span class="sumfield">Start: <span class="emphgreen" th:text="${#temporals.format(daysum.daytimeFrom, 'HH:mm')}" th:if="${daysum.daytimeFrom}"></span></span>
<td>Ende: <span class="emphgreen" th:text="${#temporals.format(daysum.daytimeUntil, 'HH:mm')}" th:if="${daysum.daytimeUntil}"></span></td> <span class="sumfield">Ende: <span class="emphgreen" th:text="${#temporals.format(daysum.daytimeUntil, 'HH:mm')}" th:if="${daysum.daytimeUntil}"></span></span>
<td>abrechenbar: <span class="emphblue" th:text="${#temporals.format(daysum.dayworktime, 'HH:mm')}" th:if="${daysum.dayworktime}"></span>/<span th:text="${sumtime}"></span></td> <span class="sumfield">abrechenbar: <span class="emphblue" th:text="${#temporals.format(daysum.dayworktime, 'HH:mm')}" th:if="${daysum.dayworktime}"></span><span class="emphgray" th:text="'/ ' + ${sumtime}"></span></span>
<td>Pausezeit total: <span class="emphorange" th:text="${#temporals.format(daysum.breaks, 'HH:mm')}" th:if="${daysum.breaks}"></span></td> <span class="sumfield">Pausezeit total: <span class="emphorange" th:text="${#temporals.format(daysum.breaks, 'HH:mm')}" th:if="${daysum.breaks}"></span></span>
<td>Überstunden heute: <span class="emphred" th:text="${daysum.printDayOvertime()}"></span></td> <span class="sumfield">Überstunden heute: <span class="emphred" th:text="${daysum.printDayOvertime()}"></span></span>
<td colspan="2">Überstunden total: <span class="emphpink" th:text="${daysum.printTotalOvertime()}"></span></td> <span class="sumfield">Überstunden total: <span class="emphpink" th:text="${daysum.printTotalOvertime()}"></span></span>
</td>
</tr> </tr>
<tr> <tr>
<td></td> <td></td>