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

improved duration and minute selector (#2264)

Browse Source 
* do not close modal if form is dirty
* deprecated TimesheetConfiguration
* inject timezone in form types
* cleanup usage of UserDateTimeFactory
* allow to configure increment steps for minutes
* use 15 minutes step for datetimepicker in project edit form
* use rounding rules for increments in minute select for begin and end
* allow duration in multi user and admin timesheet forms
* make dropdown values configurable
This commit is contained in:
Kevin Papst
2021-01-17 14:04:13 +01:00
committed by GitHub
parent e2324b7d51
commit 8d72d114c7
95 changed files with 1381 additions and 510 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,6 +20,26 @@
</div>
{% endblock daterange_widget %}
{% block duration_widget %}
{% if form.vars.duration_presets is defined and form.vars.duration_presets is not empty %}
<div class="input-group">
{{ block('form_widget_simple') }}
<div class="input-group-btn">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><span class="caret"></span></button>
<ul class="dropdown-menu dropdown-menu-right pre-scrollable">
{% for value in form.vars.duration_presets %}
<li class="text-center">
<a href="#" onclick="$('#{{ form.vars.id }}').val('{{ value }}');$('#{{ form.vars.id }}').trigger('change');return false;">{{ value }}</a>
</li>
{% endfor %}
</ul>
</div>
</div>
{% else %}
{{ block('form_widget_simple') }}
{% endif %}
{% endblock duration_widget %}
{% block datetime_widget -%}
<div class="input-group">
<div class="input-group-addon">