jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Release 2.24 (#5097)

Browse Source
This commit is contained in:
Kevin Papst
2024-10-11 21:56:54 +02:00
committed by GitHub
parent 5fac6a642c
commit ff9bf163ee
32 changed files with 381 additions and 463 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
templates/export/renderer/default.html.twig
View File

@@ -269,6 +269,8 @@
.items td.cost,
.items th.column-rate,
.items th.column-internalRate,
.items th.column-hourlyRate,
.items th.column-fixedRate,
.items th.column-duration
{
text-align: right;
@@ -294,7 +296,7 @@
|
<label for="date-format">
{{ 'date'|trans }}:
{% set demo_date = create_date('2020-01-01 20:00:00') %}
{% set demo_date = create_date('2024-01-01 11:00:00') %}
<select id="date-format" name="date-format">
<option value="short">{{ demo_date|date_short }}</option>
<option value="time">{{ demo_date|date_time }}</option>
@@ -303,7 +305,7 @@
|
<label for="begin-format">
{{ 'begin'|trans }}:
{% set demo_date = create_date('2020-01-01 11:00:00') %}
{% set demo_date = create_date('2024-01-01 11:00:00') %}
<select id="begin-format" name="begin-format">
<option value="plain">{{ demo_date|date_format('H:i') }}</option>
<option value="short">{{ demo_date|date_short }}</option>
@@ -313,7 +315,7 @@
|
<label for="end-format">
{{ 'end'|trans }}:
{% set demo_date = create_date('2020-01-01 18:00:00') %}
{% set demo_date = create_date('2024-01-01 18:00:00') %}
<select id="end-format" name="end-format">
<option value="plain">{{ demo_date|date_format('H:i') }}</option>
<option value="short">{{ demo_date|date_short }}</option>
@@ -635,7 +637,7 @@
<tr>
<td class="column-date text-nowrap" {% if not columns.date %}style="display: none"{% endif %}>
<span class="dateformat" data-short="{{ entry.begin|date_short }}" data-full="{{ entry.begin|date_time }}" data-time="{{ entry.begin|date_time }}">
{{ entry.begin|date_time }}
{{ entry.begin|date_short }}
</span>
</td>
<td class="column-begin text-nowrap" {% if not columns.begin %}style="display: none"{% endif %}>
@@ -708,10 +710,10 @@
{% endif %}
</td>
{% endfor %}
<td class="column-hourlyRate text-nowrap" {% if not columns.hourlyRate %}style="display: none"{% endif %}>
<td class="cost column-hourlyRate text-nowrap" {% if not columns.hourlyRate %}style="display: none"{% endif %}>
{{ entry.hourlyRate|money(entry.project.customer.currency) }}
</td>
<td class="column-fixedRate text-nowrap" {% if not columns.fixedRate %}style="display: none"{% endif %}>
<td class="cost column-fixedRate text-nowrap" {% if not columns.fixedRate %}style="display: none"{% endif %}>
{{ entry.fixedRate|money(entry.project.customer.currency) }}
</td>
<td class="duration column-duration text-nowrap" {% if not columns.duration %}style="display: none"{% endif %}>