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

show work times

Browse Source
This commit is contained in:
Jörg Henke
2022-05-05 14:52:21 +02:00
parent 59bfb266ae
commit 25b0288f3e
10 changed files with 714 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,7 +28,6 @@ body {
.tabdivblurred {
padding: 8px;
padding-bottom: 0px;
background-color: rgba(255, 255, 255, 0.5);
height: calc(100% - 42px);
}
@ -109,32 +108,31 @@ body {
!important;
}
.WP2 {
.billing {
color: black !important;
background: radial-gradient(#ffff00, #ffe169) !important;
border: 1px solid darkgray;
padding-top: 8px !important;
border-radius: 16px;
padding: 4px !important;
padding-left: 8px !important;
padding-right: 8px !important;
font-weight: bolder;
font-size: smaller
}
.WP2 {
background: radial-gradient(#ffff00, #ffe169) !important;
}
.WP4 {
color: black !important;
background: radial-gradient(#00ffff, #69c3ff) !important;
border: 1px solid darkgray;
padding-top: 8px !important;
}
.WP5 {
color: black !important;
background: radial-gradient(#ff0000, #e396ff) !important;
border: 1px solid darkgray;
padding-top: 8px !important;
}
.TA3 {
color: black !important;
background: radial-gradient(#99ff99, #ccffcc) !important;
border: 1px solid darkgray;
padding-top: 8px !important;
}
.left {

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

@ -6,6 +6,18 @@
</head>
<body>
<font layout:fragment="title">Arbeitszeit</font>
<ul layout:fragment="menuitem">
<li class="nav-item" sec:authorize="hasRole('timetrack_user')">
<form th:action="@{/done/list}" th:object="${doneModel}" method="post">
<div class="nav-link" style="padding-top: 0px !important">
<div class="input-group input-group-sm mb-3" style="margin-bottom: 0px !important">
<input type="date" class="form-control" th:value="*{day}" th:field="*{day}" />
<button type="submit" class="btn btn-primary btn-sm">Ok</button>
</div>
</div>
</form>
</li>
</ul>
<ul layout:fragment="menu">
<li class="nav-item" sec:authorize="hasRole('timetrack_user')"><a class="nav-link" th:href="@{/done/add}">Neuer
Eintrag</a></li>
@ -18,18 +30,104 @@
<li class="nav-item"><a class="nav-link navlinkstyle" data-bs-toggle="tab" href="#div_calendar">Kalender</a></li>
<li class="nav-item"><a class="nav-link navlinkstyle" data-bs-toggle="tab" href="#div_project">Projekt</a></li>
<li class="nav-item"><a class="nav-link navlinkstyle" data-bs-toggle="tab" href="#div_module">Modul</a></li>
<li class="nav-item"><a class="nav-link navlinkstyle" data-bs-toggle="tab" href="#div_job">Tätigkeit</a></li>
<li class="nav-item"><a class="nav-link navlinkstyle" data-bs-toggle="tab" href="#div_budget">Abrechnung</a></li>
<li class="nav-item"><a class="nav-link navlinkstyle" data-bs-toggle="tab" href="#div_job">Aufgabe</a></li>
<li class="nav-item"><a class="nav-link navlinkstyle" data-bs-toggle="tab" href="#div_billing">Abrechnung</a></li>
</ul>
<div class="tabdivblurred tab-content">
<div id="div_list" class="tab-pane active">Liste</div>
<div id="div_list" class="tab-pane active" style="background-color: white">
<table class="table table-striped table-condensed">
<thead>
<tr>
<th>Von</th>
<th>Bis</th>
<th>Projekt</th>
<th>Modul</th>
<th>Aufgabe</th>
<th>Abrechnung</th>
</tr>
</thead>
<tbody>
<tr th:each="done : ${doneList}">
<td><span th:text="${#temporals.format(done.timeFrom, 'HH:mm')}"></span></td>
<td><span th:text="${#temporals.format(done.timeUntil, 'HH:mm')}"></span></td>
<td><span th:text="${done.project.name}"></span></td>
<td><span th:text="${done.module.name}"></span></td>
<td><span th:text="${done.activity.name}"></span></td>
<td><span th:text="${done.billing.shortcut}" th:class="'billing ' + ${done.billing.csskey}"
th:if="${done.billing != null}"></span></td>
</tr>
</tbody>
</table>
</div>
<div id="div_summary" class="tab-pane fade">Zusammenfassung</div>
<div id="div_attachment" class="tab-pane fade">Anhang</div>
<div id="div_calendar" class="tab-pane fade">Kalender</div>
<div id="div_project" class="tab-pane fade">Projekt</div>
<div id="div_module" class="tab-pane fade">Modul</div>
<div id="div_job" class="tab-pane fade">Tätigkeit</div>
<div id="div_budget" class="tab-pane fade">Abrechnung</div>
<div id="div_project" class="tab-pane fade" style="background-color: white">
<table class="table table-striped table-condensed">
<thead>
<tr>
<th>Name</th>
<th>Benutzt</th>
</tr>
</thead>
<tbody>
<tr th:each="project : ${projectList}">
<td><span th:text="${project.name}"></span></td>
<td>TODO</td>
</tr>
</tbody>
</table>
</div>
<div id="div_module" class="tab-pane fade" style="background-color: white">
<table class="table table-striped table-condensed">
<thead>
<tr>
<th>Name</th>
<th>Benutzt</th>
</tr>
</thead>
<tbody>
<tr th:each="module : ${moduleList}">
<td><span th:text="${module.name}"></span></td>
<td>TODO</td>
</tr>
</tbody>
</table>
</div>
<div id="div_job" class="tab-pane fade" style="background-color: white">
<table class="table table-striped table-condensed">
<thead>
<tr>
<th>Name</th>
<th>Benutzt</th>
</tr>
</thead>
<tbody>
<tr th:each="job : ${jobList}">
<td><span th:text="${job.name}"></span></td>
<td>TODO</td>
</tr>
</tbody>
</table>
</div>
<div id="div_billing" class="tab-pane fade" style="background-color: white">
<table class="table table-striped table-condensed">
<thead>
<tr>
<th>Name</th>
<th>Symbol</th>
<th>Benutzt</th>
</tr>
</thead>
<tbody>
<tr th:each="billing : ${billingList}">
<td><span th:text="${billing.name}"></span></td>
<td><span th:text="${billing.shortcut}" th:class="'billing ' + ${billing.csskey}"></span></td>
<td>TODO</td>
</tr>
</tbody>
</table>
</div>
</div>
</main>
</body>

1
src/main/resources/templates/layout/main.html
View File

@ -38,6 +38,7 @@
<li><a class="dropdown-item" th:href="@{/logout}">[[${currentUser}]] abmelden</a></li>
</ul></li>
<li class="nav-item"><a class="nav-link titlemod"><font layout:fragment="title"></font></a></li>
<li layout:fragment="menuitem" style="list-style-type: none"></li>
<li layout:fragment="menu" style="list-style-type: none"></li>
</ul>
</div>