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

highlight invisible items (#2493)

Browse Source
This commit is contained in:
Kevin Papst
2021-04-07 19:14:33 +02:00
committed by GitHub
parent 68bb01d064
commit cdad5913ca
27 changed files with 218 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
templates/activity/details.html.twig
View File

@@ -34,7 +34,7 @@
{% endif %}
<table class="table table-hover dataTable">
{% if not activity.visible %}
<tr>
<tr class="{{ widgets.class_activity_row(activity, now) }}">
<th>{{ 'label.visible'|trans }}</th>
<td colspan="3">
{{ widgets.label_boolean(activity.visible) }}
@@ -42,7 +42,7 @@
</tr>
{% endif %}
{% if not activity.global %}
<tr>
<tr class="{{ widgets.class_customer_row(activity.project.customer, now) }}">
<th>{{ 'label.customer'|trans }}</th>
<td>
{{ widgets.label_customer(activity.project.customer) }}
@@ -54,7 +54,7 @@
{{ customerActions.customer(activity.project.customer, 'custom') }}
</td>
</tr>
<tr>
<tr class="{{ widgets.class_project_row(activity.project, now) }}">
<th>{{ 'label.project'|trans }}</th>
<td>
{{ widgets.label_project(activity.project) }}

8
templates/activity/index.html.twig
View File

@@ -40,7 +40,13 @@
{{ tables.datatable_header(tableName, columns, query, {'reload': 'kimai.activityUpdate kimai.activityTeamUpdate'}) }}
{% for entry in entries %}
<tr{% if is_granted('view', entry) %} class="alternative-link open-edit" data-href="{{ path('activity_details', {'id': entry.id}) }}"{% endif %}>
{% set class = widgets.class_activity_row(entry, now) %}
{% set dataHref = '' %}
{% if is_granted('view', entry) %}
{% set class = class ~ ' alternative-link open-edit' %}
{% set dataHref = path('activity_details', {'id': entry.id}) %}
{% endif %}
<tr class="{{ class }}" data-href="{{ dataHref }}">
<td class="{{ tables.data_table_column_class(tableName, columns, 'name') }}">{{ widgets.label_color_dot('activity', true, entry.name, null, entry.color) }}</td>
<td class="{{ tables.data_table_column_class(tableName, columns, 'project') }}">
{# only none-global activities have a project and customer assigned #}