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

save default search options (#2445)

Browse Source 
* set default times for daterange objects
* allow to show order and order by fields
* move search to modal
* more options for page size
* save export visibility in cookie
This commit is contained in:
Kevin Papst
2021-03-20 01:10:45 +01:00
committed by GitHub
parent 954ba7c937
commit 87d07ffaaf
83 changed files with 903 additions and 410 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
templates/macros/toolbar.html.twig
View File

@@ -1,5 +1,5 @@
{% macro toolbar(form, collapsible, displayInitial) %}
{% deprecated 'The macro "toolbar" is deprecated since 1.2 and will be removed with 2.0, use dropDownSearch() instead' %}
{% deprecated 'The macro "toolbar" is deprecated since 1.2 and will be removed with 2.0, use search.searchModal() instead' %}
<div class="toolbar no-print">
{% if collapsible %}<div class="collapse{% if displayInitial %} collapse.show in{% endif %}" id="{{ collapsible }}">{% endif %}
{{ form_start(form, { 'attr': {'class': 'navbar-form'}}) }}
@@ -10,45 +10,27 @@
{% endmacro %}
{% macro dropDownSearch(form) %}
{% form_theme form 'form/search-form.html.twig' %}
{{ form_start(form, { 'attr': {'class': 'form-horizontal header-search hidden-xs'}}) }}
{% set searchTermClass = 'dropdown-toggle input-sm' %}
{% if not form.searchTerm.vars.valid %}
{% set searchTermClass = searchTermClass ~ ' search-has-error' %}
{% endif %}
{% if not form.vars.valid %}
{% set searchTermClass = searchTermClass ~ ' has-error' %}
{% endif %}
<div class="dropdown">
<div class="form-group">
<div class="input-group">
<div class="input-group-addon {% if not form.vars.valid %} has-error{% endif %}">
<i class="{{ 'search'|icon }}"></i>
{% deprecated 'The macro "dropDownSearch" is deprecated since 1.4 and will be removed with 2.0, use search.searchModal() instead' %}
<div class="modal fade" id="modal_search" tabindex="-1" role="dialog" aria-labelledby="modal_search_label">
<div class="modal-dialog" role="document">
{% form_theme form 'form/search-form.html.twig' %}
{{ form_start(form, {'attr': {'class': 'form-narrow searchform'}}) }}
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="{{ 'action.close'|trans }}"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title" id="modal_search_label">
{{ 'search'|trans }}
</h4>
</div>
<div class="modal-body">
{{ form(form) }}
</div>
<div class="modal-footer">
<button type="submit" class="btn btn-primary pull-left" data-type="submit">{{ 'search'|trans }}</button>
<button type="button" class="btn btn-default btn-cancel" data-dismiss="modal">{{ 'action.close'|trans }}</button>
</div>
{{ form_widget(form.searchTerm, {'attr': {'placeholder': 'search'|trans, 'autocomplete': 'off', 'data-toggle': 'dropdown', 'class': searchTermClass, 'aria-haspopup': 'true', 'aria-expanded': 'true'}}) }}
<ul class="dropdown-menu pre-scrollable" role="menu" aria-labelledby="searchTerm">
<li>
<div class="container-fluid">
{% if not form.searchTerm.vars.valid %}
{{ form_errors(form.searchTerm) }}
<br>
{% endif %}
{{ form_widget(form) }}
<div class="form-group">
<div class="col-sm-3 col-xs-4"></div>
<div class="col-sm-9 col-xs-8">
{% if not theme_config('auto_reload_datatable') %}
{# FIXME this should trigger the datatable reload and not "really" submit the form #}
<input type="submit" value="{{ 'search'|trans }}" class="btn btn-primary" />
{% endif %}
<a href="#" class="search-cancel pull-right">{{ 'action.close'|trans }}</a>
</div>
</div>
</div>
</li>
</ul>
</div>
{{ form_end(form) }}
</div>
</div>
{{ form_end(form) }}
{% endmacro %}