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

added daterange-picker and localized date-inputs (#540)

Browse Source
This commit is contained in:
Kevin Papst
2019-02-03 21:24:30 +01:00
committed by GitHub
parent aae9183de6
commit 062735c9e3
37 changed files with 1058 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
templates/base.html.twig
View File

@@ -94,8 +94,22 @@
{# we do not call parent() as we use a custom built for the frontend assets and don't want the default <script> #}
<script type="text/javascript">
$(document).ready(function () {
$.kimai.init({locale: '{{ app.request.locale }}', confirmDelete: '{{ 'confirm.delete'|trans }}'});
//$.kimai.pauseRecord('li.messages-menu ul.menu li');
$.kimai.init({
locale: '{{ app.request.locale }}',
confirmDelete: '{{ 'confirm.delete'|trans }}',
apply: '{{ 'daterangepicker.apply'|trans({}, 'daterangepicker') }}',
cancel: '{{ 'daterangepicker.cancel'|trans({}, 'daterangepicker') }}',
today: '{{ 'daterangepicker.today'|trans({}, 'daterangepicker') }}',
yesterday: '{{ 'daterangepicker.yesterday'|trans({}, 'daterangepicker') }}',
lastWeek: '{{ 'daterangepicker.lastWeek'|trans({}, 'daterangepicker') }}',
thisWeek: '{{ 'daterangepicker.thisWeek'|trans({}, 'daterangepicker') }}',
lastMonth: '{{ 'daterangepicker.lastMonth'|trans({}, 'daterangepicker') }}',
thisMonth: '{{ 'daterangepicker.thisMonth'|trans({}, 'daterangepicker') }}',
lastYear: '{{ 'daterangepicker.lastYear'|trans({}, 'daterangepicker') }}',
thisYear: '{{ 'daterangepicker.thisYear'|trans({}, 'daterangepicker') }}',
customRange: '{{ 'daterangepicker.customRange'|trans({}, 'daterangepicker') }}'
});
{# $.kimai.pauseRecord('li.messages-menu ul.menu li'); #}
});
</script>
{% endblock %}

2
templates/dashboard/section-chart.html.twig
View File

@@ -94,7 +94,7 @@
{% for widget in section.widgets|slice(1, width) %}
{% set data = widget.data %}
{% if widget.dataType == constant('App\\Model\\Widget::DATA_TYPE_DURATION') %}
{% set data = widget.data|duration('full') %}
{% set data = widget.data|duration %}
{% elseif widget.dataType == constant('App\\Model\\Widget::DATA_TYPE_MONEY') %}
{% set data = widget.data|money %}
{% endif %}

2
templates/dashboard/section-simple.html.twig
View File

@@ -17,7 +17,7 @@
{% set data = widget.data %}
{% if widget.dataType == constant('App\\Model\\Widget::DATA_TYPE_DURATION') %}
{% set data = widget.data|duration('full') %}
{% set data = widget.data|duration %}
{% elseif widget.dataType == constant('App\\Model\\Widget::DATA_TYPE_MONEY') %}
{% set data = widget.data|money %}
{% endif %}

12
templates/form/kimai-theme.html.twig
View File

@@ -7,3 +7,15 @@
{% endif %}
{{ parent() }}
{% endblock form_label %}
{% block daterange_widget %}
<div class="input-group">
<div class="input-group-addon">
<i class="far fa-calendar-alt"></i>
</div>
{% set attr = attr|merge({'data-daterangepickerenable':'on'}) %}
{{ block('form_widget_simple') }}
</div>
{% endblock daterange_widget %}