added table-column ordering (#1086)

This commit is contained in:
Kevin Papst
2019-09-09 23:47:42 +02:00
committed by GitHub
parent d041a3f4f9
commit a651e55dc9
82 changed files with 932 additions and 516 deletions

View File

@@ -8,13 +8,13 @@
{% set tableName = 'timesheet' %}
{% set canSeeRate = is_granted('view_rate_own_timesheet') %}
{% set columns = {
'date': 'alwaysVisible',
'date': {'class': 'alwaysVisible', 'orderBy': 'begin'},
} %}
{% if showStartEndTime %}
{% set columns = columns|merge({
'starttime': '',
'endtime': 'hidden-xs'
'starttime': {'class': '', 'orderBy': 'begin'},
'endtime': {'class': 'hidden-xs', 'orderBy': 'end'}
}) %}
{% endif %}
{% set columns = columns|merge({'duration': ''}) %}
@@ -26,7 +26,7 @@
'project': 'hidden-xs hidden-sm hidden-md',
'activity': 'hidden-xs hidden-sm',
'description': 'hidden-xs hidden-sm',
'tags': 'hidden-xs hidden-sm',
'tags': {'class': 'hidden-xs hidden-sm', 'orderBy': false},
'actions': 'actions alwaysVisible',
}) %}
@@ -43,7 +43,7 @@
{% if entries.count == 0 %}
{{ widgets.callout('warning', 'error.no_entries_found') }}
{% else %}
{{ tables.data_table_header(tableName, columns, showSummary, 'kimai.timesheetUpdate') }}
{{ tables.datatable_header(tableName, columns, query, {'striped': not showSummary, 'reload': 'kimai.timesheetUpdate'}) }}
{% set day = null %}
{% set dayDuration = 0 %}