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

link customer, project and activity in invoice listing (#3428)

Browse Source
This commit is contained in:
Kevin Papst
2022-07-22 13:26:17 +02:00
committed by GitHub
parent ad880b5b97
commit 8d695d03df
5 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
assets/sass/content.scss
View File

@@ -75,4 +75,8 @@ table.dataTable thead > tr > th.hw-min {
.label {
font-weight: normal;
}
a.link-black {
color: #000;
}

2
public/build/app.7d391c0d.css → public/build/app.dd7cccf4.css
View File

File diff suppressed because one or more lines are too long

2
public/build/entrypoints.json
View File

@@ -6,7 +6,7 @@
"build/app.429626c8.js"
],
"css": [
"build/app.7d391c0d.css"
"build/app.dd7cccf4.css"
]
},
"invoice": {

2
public/build/manifest.json
View File

@@ -1,5 +1,5 @@
{
"build/app.css": "build/app.7d391c0d.css",
"build/app.css": "build/app.dd7cccf4.css",
"build/app.js": "build/app.429626c8.js",
"build/invoice.css": "build/invoice.ccdecd42.css",
"build/invoice.js": "build/invoice.19f36eca.js",

18
templates/invoice/index.html.twig
View File

@@ -120,7 +120,11 @@
{% set currency = model.currency %}
<tr>
<td>
{{ widgets.label_customer(model.customer) }}
{% if is_granted('view', model.customer) %}
<a class="link-black" href="{{ path('customer_details', {id: model.customer.id}) }}">{{ widgets.label_customer(model.customer) }}</a>
{% else %}
{{ widgets.label_customer(model.customer) }}
{% endif %}
</td>
<td class="w-min text-center">
{{ widgets.action_button('print', {'url': '#', 'onclick': 'return singleInvoice(this)', 'title': 'button.preview'|trans, 'target': '_blank', 'class': 'btn btn-sm', 'attr': {'data-customer': model.customer.id, 'data-template': model.template.id, 'data-href': path('invoice_preview', {'customer': model.customer.id, 'token': csrf_token('invoice.preview')})}}) }}
@@ -174,11 +178,19 @@
<tr>
<td class="{{ tables.data_table_column_class(tableName, columns, 'date') }}">{{ entry.begin|date_short }}</td>
<td class="{{ tables.data_table_column_class(tableName, columns, 'project') }}">
{{ widgets.label_project(entry.project) }}
{% if is_granted('view', entry.project) %}
<a class="link-black" href="{{ path('project_details', {id: entry.project.id}) }}">{{ widgets.label_project(entry.project) }}</a>
{% else %}
{{ widgets.label_project(entry.project) }}
{% endif %}
{% if entry.activity is not null %}
<br>
<small>
{{ widgets.label_activity(entry.activity) }}
{% if is_granted('view', entry.activity) %}
<a class="link-black" href="{{ path('activity_details', {id: entry.activity.id}) }}">{{ widgets.label_activity(entry.activity) }}</a>
{% else %}
{{ widgets.label_activity(entry.activity) }}
{% endif %}
</small>
{% endif %}
</td>