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

Release 2.18 (#4878)

Browse Source
This commit is contained in:
Kevin Papst
2024-06-16 13:15:49 +02:00
committed by GitHub
parent 8792a1df09
commit 987b46bf8f
46 changed files with 1768 additions and 814 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
templates/quick-entry/index.html.twig
View File

@@ -6,15 +6,21 @@
{% embed '@theme/embeds/card.html.twig' %}
{% import "macros/widgets.html.twig" as widgets %}
{% block box_attributes %}id="quick_entry_box"{% endblock %}
{% block box_class %}mt-2{% endblock %}
{% block box_before %}
{{ form_start(form, {attr: {id: 'quick-entries-form', class: 'form-dataTable quick-entries'}}) }}
{{ form_widget(form._token) }}
{% endblock %}
{% block box_after %}{{ form_end(form) }}{% endblock %}
{% block box_title %}
{{ form_widget(form.date) }}
{{ form_errors(form) }}
{% endblock %}
{% block box_after %}
<input type="submit" value="{{ 'action.save'|trans }}" class="btn btn-primary" />
<button type="button" class="btn btn-success add-item-link" data-collection-prototype="{{ form.rows.vars.id }}" data-collection-holder="ts-collection">
{{ icon('create', true) }}
{{ 'action.add'|trans }}
</button>
{{ form_end(form) }}
{% endblock %}
{# "table-responsive" does not work, because that would render dropdowns at the bottom behind the container #}
{% block box_body_class %}p-0 maybe-table-responsive{% endblock %}
{% block box_body %}
@@ -46,13 +52,6 @@
</tfoot>
</table>
{% endblock %}
{% block box_footer %}
<input type="submit" value="{{ 'action.save'|trans }}" class="btn btn-primary" />
<button type="button" class="btn btn-success add-item-link" data-collection-prototype="{{ form.rows.vars.id }}" data-collection-holder="ts-collection">
{{ icon('create', true) }}
{{ 'action.add'|trans }}
</button>
{% endblock %}
{% endembed %}
{% endblock %}

20
templates/widget/widget-paginatedworkingtimechart.html.twig
View File

@@ -31,35 +31,35 @@
{% endblock %}
{% block box_footer %}
<div class="row">
<div class="col-sm-3 col-xs-6">
<div class="col-sm-3 col-xs-6 mt-1 mb-2 mb-md-0">
<div class="text-center">
<h5>{{ data.day|duration }}</h5>
<h5 class="mb-1">{{ data.day|duration }}</h5>
<span>{{ 'stats.workingTimeToday'|trans({'%day%': 'now'|date_short}) }}</span>
</div>
</div>
<div class="col-sm-3 col-xs-6">
<div class="col-sm-3 col-xs-6 mt-1 mb-2 mb-md-0">
<div class="text-center">
<h5>{{ data.week|duration }}</h5>
<h5 class="mb-1">{{ data.week|duration }}</h5>
<span>{{ 'stats.workingTimeWeek'|trans({'%week%': data.begin|date_format('W')}) }}</span>
</div>
</div>
<div class="col-sm-3 col-xs-6">
<div class="col-sm-3 col-xs-6 mt-1 mb-2 mb-md-0">
<div class="text-center">
<h5>{{ data.month|duration }}</h5>
<h5 class="mb-1">{{ data.month|duration }}</h5>
<span>{{ 'stats.workingTimeMonth'|trans({'%month%': data.thisMonth|month_name, '%year%': data.thisMonth|date_format('Y')}) }}</span>
</div>
</div>
{% if data.financial is not null %}
<div class="col-sm-3 col-xs-6">
<div class="col-sm-3 col-xs-6 mt-1 mb-2 mb-md-0">
<div class="text-center">
<h5>{{ data.financial|duration }}</h5>
<h5 class="mb-1">{{ data.financial|duration }}</h5>
<span>{{ 'stats.workingTimeFinancialYear'|trans }}</span>
</div>
</div>
{% else %}
<div class="col-sm-3 col-xs-6">
<div class="col-sm-3 col-xs-6 mt-1 mb-2 mb-md-0">
<div class="text-center">
<h5>{{ data.year|duration }}</h5>
<h5 class="mb-1">{{ data.year|duration }}</h5>
<span>{{ 'stats.workingTimeYear'|trans({'%year%': data.thisMonth|date_format('Y')}) }}</span>
</div>
</div>