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

eucansharetimes

Browse Source
This commit is contained in:
Jörg Henke
2022-07-06 15:07:38 +02:00
parent 7497108717
commit a4029cb71d
3 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/de/jottyfan/timetrack/spring/done/SummaryBean.java
View File

@ -24,6 +24,20 @@ public class SummaryBean implements Serializable {
this.maxDayWorktime = maxDayWorktime; this.maxDayWorktime = maxDayWorktime;
} }
public String getBillingTime(String key) {
Duration duration = Duration.ZERO;
for (DoneBean bean : list) {
if (key == null && bean.getBilling() == null) {
duration = duration.plus(bean.getTimeDiffDuration());
} else if (bean.getBilling() != null && bean.getBilling().getShortcut().equals(key)) {
duration = duration.plus(bean.getTimeDiffDuration());
}
}
int minutes = duration.toMinutesPart();
int minutesPercent = Float.valueOf((5f / 3f) * minutes).intValue();
return String.format("%d,%d h", duration.toHoursPart(), minutesPercent);
}
/** /**
* @return the start * @return the start
*/ */

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

@ -153,6 +153,11 @@ body {
text-align: right; text-align: right;
} }
.distfat {
margin-left: 8px;
font-weight: bolder;
}
.prompt { .prompt {
margin: 4px; margin: 4px;
padding: 4px !important; padding: 4px !important;

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

@ -25,8 +25,6 @@
<main layout:fragment="content"> <main layout:fragment="content">
<ul class="nav nav-tabs navback" role="tablist"> <ul class="nav nav-tabs navback" role="tablist">
<li class="nav-item"><a class="nav-link navlinkstyle active" data-bs-toggle="tab" href="#div_list">Liste</a></li> <li class="nav-item"><a class="nav-link navlinkstyle active" data-bs-toggle="tab" href="#div_list">Liste</a></li>
<li class="nav-item"><a class="nav-link navlinkstyle" data-bs-toggle="tab" href="#div_summary">Zusammenfassung</a></li>
<li class="nav-item"><a class="nav-link navlinkstyle" data-bs-toggle="tab" href="#div_attachment">Anhang</a></li>
<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_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_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_module">Modul</a></li>
@ -67,12 +65,18 @@
<td>Pausezeit total: <span class="emphorange" th:text="${sum.pause}"></span></td> <td>Pausezeit total: <span class="emphorange" th:text="${sum.pause}"></span></td>
<td>Überstunden: <span class="emphred" th:text="${sum.overdue}"></span></td> <td>Überstunden: <span class="emphred" th:text="${sum.overdue}"></span></td>
</tr> </tr>
<tr>
<td></td>
<td><span th:if="${sum.getBillingTime('WP2') != '0,0 h'}"><span class="billing WP2">WP2</span><span th:text="${sum.getBillingTime('WP2')}" class="distfat"></span></span></td>
<td><span th:if="${sum.getBillingTime('WP4') != '0,0 h'}"><span class="billing WP4">WP4</span><span th:text="${sum.getBillingTime('WP4')}" class="distfat"></span></span></td>
<td><span th:if="${sum.getBillingTime('WP5') != '0,0 h'}"><span class="billing WP5">WP5</span><span th:text="${sum.getBillingTime('WP5')}" class="distfat"></span></span></td>
<td><span th:if="${sum.getBillingTime('TA3') != '0,0 h'}"><span class="billing TA3">TA3</span><span th:text="${sum.getBillingTime('TA3')}" class="distfat"></span></span></td>
<td><span class="billing">X</span><span th:text="${sum.getBillingTime(null)}" class="distfat"></span></td>
</tr>
</tfoot> </tfoot>
</table> </table>
</div> </div>
<div id="div_summary" class="tab-pane fade">Zusammenfassung</div> <div id="div_calendar" class="tab-pane fade">Kalender: TODO</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 tab-pane-table"> <div id="div_project" class="tab-pane fade tab-pane-table">
<table id="project_table" class="table table-striped table-condensed"> <table id="project_table" class="table table-striped table-condensed">
<thead> <thead>