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

dynamically update title and visible durations for running records (#752)

Browse Source
This commit is contained in:
Kevin Papst
2019-05-05 03:01:25 +02:00
committed by GitHub
parent 65df1ff909
commit aa113cc300
14 changed files with 486 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
templates/base.html.twig
View File

@@ -189,6 +189,9 @@
});
{# $.kimai.pauseRecord('li.messages-menu ul.menu li'); #}
});
document.addEventListener('DOMContentLoaded', function() {
new KimaiActiveRecordsDuration('[data-since]').updateRecords().registerUpdates(5000);
});
</script>
{% set event = trigger(constant('App\\Event\\ThemeEvent::JAVASCRIPT')) %}
{{ event.content|raw }}

5
templates/navbar/active-entries.html.twig
View File

@@ -19,7 +19,10 @@
</div>
<h4>
<span>{{ entry.activity.name }}</span>
<small><i class="{{ 'timesheet'|icon }}"></i> {{ entry|duration }}</small>
<small>
<i class="{{ 'timesheet'|icon }}"></i>
<span data-title="true" data-since="{{ entry.begin.format(constant('DATE_ISO8601')) }}" data-format="{{ get_format_duration() }}">{{ entry|duration }}</span>
</small>
</h4>
<p>{{ entry.project.name }} ({{ entry.project.customer.name }})</p>
</a>

4
templates/timesheet-team/index.html.twig
View File

@@ -59,7 +59,9 @@
{% if not duration_only %}
<td class="text-nowrap {{ tables.data_table_column_class(tableName, columns, 'endtime') }}">&dash;</td>
{% endif %}
<td class="text-nowrap {{ tables.data_table_column_class(tableName, columns, 'duration') }}"><i>{{ entry|duration }}</i></td>
<td class="text-nowrap {{ tables.data_table_column_class(tableName, columns, 'duration') }}">
<i data-since="{{ entry.begin.format(constant('DATE_ISO8601')) }}" data-format="{{ get_format_duration() }}">{{ entry|duration }}</i>
</td>
{% endif %}
<td class="text-nowrap {{ tables.data_table_column_class(tableName, columns, 'rate') }}">
{% if not entry.end or not is_granted('view_rate', entry) %}

4
templates/timesheet/index.html.twig
View File

@@ -77,7 +77,9 @@
{% if not duration_only %}
<td class="text-nowrap {{ tables.data_table_column_class(tableName, columns, 'endtime') }}">&dash;</td>
{% endif %}
<td class="text-nowrap {{ tables.data_table_column_class(tableName, columns, 'duration') }}"><i>{{ entry|duration }}</i></td>
<td class="text-nowrap {{ tables.data_table_column_class(tableName, columns, 'duration') }}">
<i data-since="{{ entry.begin.format(constant('DATE_ISO8601')) }}" data-format="{{ get_format_duration() }}">{{ entry|duration }}</i>
</td>
{% if canSeeRate %}
<td class="{{ tables.data_table_column_class(tableName, columns, 'rate') }}">&dash;</td>
{% endif %}