#}
{{ entry.name }} {% if entry.company is not empty %}({{ entry.company }}){% endif %}
{{ entry.comment }}
{{ entry.country|country }}
- {{ entry.number }}
+ {{ entry.number }}
{{ entry.currency }} {{ entry.currency|currency }}
{{ widgets.label_visible(entry.visible) }}
- {% set actionButtons = {} %}
- {% if is_granted('edit', entry) %}
- {% set actionButtons = {'edit': path('admin_customer_edit', {'id': entry.id})}|merge(actionButtons) %}
- {% endif %}
- {% if is_granted('view_project') %}
- {% set actionButtons = actionButtons|merge({'project': path('admin_project', {'customer': entry.id})}) %}
- {% endif %}
- {% if is_granted('delete', entry) %}
- {% set actionButtons = actionButtons|merge({'trash': path('admin_customer_delete', {'id': entry.id})}) %}
- {% endif %}
- {{ widgets.button_group(actionButtons) }}
+ {{ actions.customer(entry, 'index') }}
{% endfor %}
diff --git a/templates/export/renderer/default.html.twig b/templates/export/renderer/default.html.twig
index f255e6ed..5eb39707 100644
--- a/templates/export/renderer/default.html.twig
+++ b/templates/export/renderer/default.html.twig
@@ -91,8 +91,8 @@
'label.activity',
'label.description',
'label.exported',
- 'label.hourly_rate',
- 'label.fixed_rate',
+ 'label.hourlyRate',
+ 'label.fixedRate',
'label.duration',
'label.rate',
] %}
diff --git a/templates/invoice/renderer/default.html.twig b/templates/invoice/renderer/default.html.twig
index b55a1b18..f8b28bc5 100644
--- a/templates/invoice/renderer/default.html.twig
+++ b/templates/invoice/renderer/default.html.twig
@@ -28,9 +28,9 @@
{{ 'invoice.due_days'|trans }}: {{ model.dueDate|date_short }}
{% if model.customer.number is not empty %}
- {{ 'label.customer_number'|trans }}: {{ model.customer.number }}
+ {{ 'label.number'|trans }}: {{ model.customer.number }}
{% endif %}
{% if model.query.project is not empty and model.query.project.orderNumber is not empty %}
- {{ 'label.order_number'|trans }}: {{ model.query.project.orderNumber }}
+ {{ 'label.orderNumber'|trans }}: {{ model.query.project.orderNumber }}
{% endif %}
diff --git a/templates/invoice/renderer/freelancer.html.twig b/templates/invoice/renderer/freelancer.html.twig
index c425686c..d2fdb2cd 100644
--- a/templates/invoice/renderer/freelancer.html.twig
+++ b/templates/invoice/renderer/freelancer.html.twig
@@ -53,7 +53,7 @@
{% if model.query.project is not empty and model.query.project.orderNumber is not empty %}
- {{ 'label.order_number'|trans }}
+ {{ 'label.orderNumber'|trans }}
{{ model.query.project.orderNumber }}
diff --git a/templates/invoice/renderer/timesheet.html.twig b/templates/invoice/renderer/timesheet.html.twig
index 1796de65..5e97d354 100644
--- a/templates/invoice/renderer/timesheet.html.twig
+++ b/templates/invoice/renderer/timesheet.html.twig
@@ -42,7 +42,7 @@
{% if model.query.project is not empty and model.query.project.orderNumber is not empty %}
- {{ 'label.order_number'|trans }}
+ {{ 'label.orderNumber'|trans }}
{{ model.query.project.orderNumber }}
diff --git a/templates/macros/actions.html.twig b/templates/macros/actions.html.twig
new file mode 100644
index 00000000..0881abbb
--- /dev/null
+++ b/templates/macros/actions.html.twig
@@ -0,0 +1,222 @@
+{# This file contains twig macros used to display possible actions for all available entities #}
+{% macro activities(view) %}
+ {% import "macros/widgets.html.twig" as widgets %}
+ {% set actions = {'filter': '#collapseActivityAdmin', 'visibility': '#modal_activity_admin'} %}
+
+ {% if is_granted('create_activity') %}
+ {% set actions = actions|merge({'create': path('admin_activity_create')}) %}
+ {% endif %}
+
+ {% set event = trigger('actions.activities', {'actions': actions, 'view': view}) %}
+ {{ widgets.page_actions(event.payload.actions) }}
+{% endmacro %}
+
+{% macro activity(activity, view) %}
+ {% import "macros/widgets.html.twig" as widgets %}
+ {% set actions = {} %}
+
+ {% if activity.id is not empty %}
+ {% if is_granted('edit', activity) %}
+ {% set actions = actions|merge({'edit': path('admin_activity_edit', {'id': activity.id})}) %}
+ {% endif %}
+ {% if is_granted('delete', activity) %}
+ {% set actions = actions|merge({'trash': path('admin_activity_delete', {'id': activity.id})}) %}
+ {% endif %}
+ {% endif %}
+
+ {% if view != 'index' %}
+ {% set actions = actions|merge({'list': path('admin_activity')}) %}
+ {% endif %}
+
+ {% set event = trigger('actions.activity', {'actions': actions, 'view': view, 'activity': activity}) %}
+ {% if view == 'index' %}
+ {{ widgets.button_group(event.payload.actions) }}
+ {% else %}
+ {{ widgets.page_actions(event.payload.actions) }}
+ {% endif %}
+{% endmacro %}
+
+{% macro projects(view) %}
+ {% import "macros/widgets.html.twig" as widgets %}
+ {% set actions = {'filter': '#collapseProjectAdmin', 'visibility': '#modal_project_admin'} %}
+
+ {% if is_granted('create_project') %}
+ {% set actions = actions|merge({'create': path('admin_project_create')}) %}
+ {% endif %}
+
+ {% set event = trigger('actions.projects', {'actions': actions, 'view': view}) %}
+ {{ widgets.page_actions(event.payload.actions) }}
+{% endmacro %}
+
+{% macro project(project, view) %}
+ {% import "macros/widgets.html.twig" as widgets %}
+ {% set actions = {} %}
+
+ {% if project.id is not empty %}
+ {% if is_granted('edit', project) %}
+ {% set actions = actions|merge({'edit': path('admin_project_edit', {'id': project.id})}) %}
+ {% endif %}
+ {% if is_granted('view_activity') %}
+ {% set actions = actions|merge({'activity': path('admin_activity', {'customer': project.customer.id, 'project': project.id})}) %}
+ {% endif %}
+ {% if is_granted('delete', project) %}
+ {% set actions = actions|merge({'trash': path('admin_project_delete', {'id': project.id})}) %}
+ {% endif %}
+ {% endif %}
+
+ {% if view != 'index' %}
+ {% set actions = actions|merge({'list': path('admin_project')}) %}
+ {% endif %}
+
+ {% set event = trigger('actions.project', {'actions': actions, 'view': view, 'project': project}) %}
+ {% if view == 'index' %}
+ {{ widgets.button_group(event.payload.actions) }}
+ {% else %}
+ {{ widgets.page_actions(event.payload.actions) }}
+ {% endif %}
+{% endmacro %}
+
+{% macro customers(view) %}
+ {% import "macros/widgets.html.twig" as widgets %}
+
+ {% set actions = {'filter': '#collapseCustomerAdmin', 'visibility': '#modal_customer_admin'} %}
+ {% if is_granted('create_customer') %}
+ {% set actions = actions|merge({'create': path('admin_customer_create')}) %}
+ {% endif %}
+
+ {% set event = trigger('actions.customers', {'actions': actions, 'view': view}) %}
+ {{ widgets.page_actions(event.payload.actions) }}
+{% endmacro %}
+
+{% macro customer(customer, view) %}
+ {% import "macros/widgets.html.twig" as widgets %}
+ {% set actions = {} %}
+
+ {% if customer.id is not empty %}
+ {% if is_granted('edit', customer) %}
+ {% set actions = actions|merge({'edit': path('admin_customer_edit', {'id': customer.id})}) %}
+ {% endif %}
+ {% if is_granted('view_project') %}
+ {% set actions = actions|merge({'project': path('admin_project', {'customer': customer.id})}) %}
+ {% endif %}
+ {% if is_granted('delete', customer) %}
+ {% set actions = actions|merge({'trash': path('admin_customer_delete', {'id': customer.id})}) %}
+ {% endif %}
+ {% endif %}
+
+ {% if view != 'index' %}
+ {% set actions = actions|merge({'list': path('admin_customer')}) %}
+ {% endif %}
+
+ {% set event = trigger('actions.customer', {'actions': actions, 'view': view, 'customer': customer}) %}
+ {% if view == 'index' %}
+ {{ widgets.button_group(event.payload.actions) }}
+ {% else %}
+ {{ widgets.page_actions(event.payload.actions) }}
+ {% endif %}
+{% endmacro %}
+
+{% macro timesheets(view) %}
+ {% import "macros/widgets.html.twig" as widgets %}
+
+ {% set actions = {'filter': '#collapseTimesheet'} %}
+ {% if is_granted('export_own_timesheet') %}
+ {% set actions = actions|merge({'download': {'onclick': 'return exportTimesheet()'}}) %}
+ {% endif %}
+ {% set actions = actions|merge({'visibility': '#modal_timesheet'}) %}
+ {% set actions = actions|merge({'calendar': path('calendar')}) %}
+ {% if is_granted('create_own_timesheet') %}
+ {% set actions = actions|merge({'create': {'url': path('timesheet_create'), 'class': 'modal-ajax-form'}}) %}
+ {% endif %}
+
+ {% set event = trigger('actions.timesheets', {'actions': actions, 'view': view}) %}
+ {{ widgets.page_actions(event.payload.actions) }}
+{% endmacro %}
+
+{% macro timesheet(timesheet, view) %}
+ {% import "macros/widgets.html.twig" as widgets %}
+ {% set actions = {} %}
+
+ {% if timesheet.id is not empty %}
+ {% if timesheet.end %}
+ {% if is_granted('start', timesheet) %}
+ {% set actions = actions|merge({'repeat': path('timesheet_start', {'id' : timesheet.id})}) %}
+ {% endif %}
+ {% else %}
+ {% if is_granted('stop', timesheet) %}
+ {% set actions = actions|merge({'stop': path('timesheet_stop', {'id' : timesheet.id})}) %}
+ {% endif %}
+ {% endif %}
+
+ {% if is_granted('edit', timesheet) %}
+ {% set class = '' %}
+ {% if view != 'edit' %}
+ {% set class = 'modal-ajax-form' %}
+ {% endif %}
+ {% set actions = actions|merge({'edit': {'url': path('timesheet_edit', {'id': timesheet.id}), 'class': class}}) %}
+ {% endif %}
+
+ {% if is_granted('delete', timesheet) %}
+ {% set actions = actions|merge({'trash': path('timesheet_delete', {'id' : timesheet.id})}) %}
+ {% endif %}
+ {% endif %}
+
+ {% if view != 'index' %}
+ {% set actions = actions|merge({'list': path('timesheet')}) %}
+ {% endif %}
+
+ {% set event = trigger('actions.timesheet', {'actions': actions, 'view': view, 'timesheet': timesheet}) %}
+ {% if view == 'index' %}
+ {{ widgets.button_group(event.payload.actions) }}
+ {% else %}
+ {{ widgets.page_actions(event.payload.actions) }}
+ {% endif %}
+{% endmacro %}
+
+{% macro timesheets_team(view) %}
+ {% import "macros/widgets.html.twig" as widgets %}
+
+ {% set actions = {'filter': '#collapseTimesheetAdmin'} %}
+ {% if is_granted('export_own_timesheet') %}
+ {% set actions = actions|merge({'download': 'onclick:return exportTimesheet()'}) %}
+ {% endif %}
+ {% set actions = actions|merge({'visibility': '#modal_timesheet_admin'}) %}
+ {% if is_granted('create_other_timesheet') %}
+ {% set actions = actions|merge({'create': {'url': path('admin_timesheet_create'), 'class': 'modal-ajax-form'}}) %}
+ {% endif %}
+
+ {% set event = trigger('actions.timesheets_team', {'actions': actions, 'view': view}) %}
+ {{ widgets.page_actions(event.payload.actions) }}
+{% endmacro %}
+
+{% macro timesheet_team(timesheet, view) %}
+ {% import "macros/widgets.html.twig" as widgets %}
+ {% set actions = {} %}
+
+ {% if timesheet.id is not empty %}
+ {% if not timesheet.end and is_granted('stop', timesheet) %}
+ {% set actions = actions|merge({'stop': path('admin_timesheet_stop', {'id' : timesheet.id})}) %}
+ {% endif %}
+ {% if is_granted('edit', timesheet) %}
+ {% set class = '' %}
+ {% if view != 'edit' %}
+ {% set class = 'modal-ajax-form' %}
+ {% endif %}
+ {% set actions = actions|merge({'edit': {'url': path('admin_timesheet_edit', {'id': timesheet.id}), 'class': class}}) %}
+ {% endif %}
+ {% if is_granted('delete', timesheet) %}
+ {% set actions = actions|merge({'trash': path('admin_timesheet_delete', {'id' : timesheet.id})}) %}
+ {% endif %}
+ {% endif %}
+
+ {% if view != 'index' %}
+ {% set actions = actions|merge({'list': path('admin_timesheet')}) %}
+ {% endif %}
+
+ {% set event = trigger('actions.timesheet_team', {'actions': actions, 'view': view, 'timesheet': timesheet}) %}
+ {% if view == 'index' %}
+ {{ widgets.button_group(event.payload.actions) }}
+ {% else %}
+ {{ widgets.page_actions(event.payload.actions) }}
+ {% endif %}
+{% endmacro %}
diff --git a/templates/admin/project_delete.html.twig b/templates/project/delete.html.twig
similarity index 87%
rename from templates/admin/project_delete.html.twig
rename to templates/project/delete.html.twig
index c418cf1c..d99884be 100644
--- a/templates/admin/project_delete.html.twig
+++ b/templates/project/delete.html.twig
@@ -1,9 +1,11 @@
{% extends 'base.html.twig' %}
{% import "macros/widgets.html.twig" as widgets %}
{% import "macros/datatables.html.twig" as tables %}
+{% import "macros/actions.html.twig" as actions %}
{% block page_title %}{{ 'admin_project.title'|trans }}{% endblock %}
{% block page_subtitle %}{{ 'admin_project.subtitle'|trans }}{% endblock %}
+{% block page_actions %}{{ actions.project(project, 'delete') }}{% endblock %}
{% block main %}
diff --git a/templates/admin/project_edit.html.twig b/templates/project/edit.html.twig
similarity index 73%
rename from templates/admin/project_edit.html.twig
rename to templates/project/edit.html.twig
index 8975853d..8a0914f4 100644
--- a/templates/admin/project_edit.html.twig
+++ b/templates/project/edit.html.twig
@@ -1,7 +1,10 @@
{% extends app.request.xmlHttpRequest ? 'form.html.twig' : 'base.html.twig' %}
+{% import "macros/widgets.html.twig" as widgets %}
+{% import "macros/actions.html.twig" as actions %}
{% block page_title %}{{ 'admin_project.title'|trans }}{% endblock %}
{% block page_subtitle %}{{ 'admin_project.subtitle'|trans }}{% endblock %}
+{% block page_actions %}{{ actions.project(project, 'edit') }}{% endblock %}
{% block main %}
{{ include(app.request.xmlHttpRequest ? 'default/_form_modal.html.twig' : 'default/_form.html.twig', {
diff --git a/templates/admin/project.html.twig b/templates/project/index.html.twig
similarity index 63%
rename from templates/admin/project.html.twig
rename to templates/project/index.html.twig
index 81b2baae..3a910d2b 100644
--- a/templates/admin/project.html.twig
+++ b/templates/project/index.html.twig
@@ -2,16 +2,11 @@
{% import "macros/widgets.html.twig" as widgets %}
{% import "macros/datatables.html.twig" as tables %}
{% import "macros/toolbar.html.twig" as toolbar %}
+{% import "macros/actions.html.twig" as actions %}
{% block page_title %}{{ 'admin_project.title'|trans }}{% endblock %}
{% block page_subtitle %}{{ 'admin_project.subtitle'|trans }} {{ 'subtitle.amount'|trans({'%count%': entries.count}) }}{% endblock %}
-{% block page_actions %}
- {% set actions = {'filter': '#collapseProjectAdmin', 'visibility': '#modal_project_admin'} %}
- {% if is_granted('create_project') %}
- {% set actions = actions|merge({'create': path('admin_project_create')}) %}
- {% endif %}
- {{ widgets.page_actions(actions) }}
-{% endblock %}
+{% block page_actions %}{{ actions.projects('index') }}{% endblock %}
{% block main_before %}
{{ toolbar.toolbar(toolbarForm, 'collapseProjectAdmin', showFilter) }}
@@ -45,17 +40,7 @@
{{ entry.budget|money(entry.customer.currency) }}
{{ widgets.label_visible(entry.visible) }}
- {% set actionButtons = {} %}
- {% if is_granted('edit', entry) %}
- {% set actionButtons = {'edit': path('admin_project_edit', {'id': entry.id})}|merge(actionButtons) %}
- {% endif %}
- {% if is_granted('view_activity') %}
- {% set actionButtons = actionButtons|merge({'activity': path('admin_activity', {'customer': entry.customer.id, 'project': entry.id})}) %}
- {% endif %}
- {% if is_granted('delete', entry) %}
- {% set actionButtons = actionButtons|merge({'trash': path('admin_project_delete', {'id': entry.id})}) %}
- {% endif %}
- {{ widgets.button_group(actionButtons) }}
+ {{ actions.project(entry, 'index') }}
{% endfor %}
diff --git a/templates/timesheet-team/edit.html.twig b/templates/timesheet-team/edit.html.twig
new file mode 100644
index 00000000..2c0179e5
--- /dev/null
+++ b/templates/timesheet-team/edit.html.twig
@@ -0,0 +1,15 @@
+{% extends app.request.xmlHttpRequest ? 'form.html.twig' : 'base.html.twig' %}
+{% import "macros/widgets.html.twig" as widgets %}
+{% import "macros/actions.html.twig" as actions %}
+
+{% block page_title %}{{ 'admin_timesheet.title'|trans }}{% endblock %}
+{% block page_subtitle %}{{ 'admin_timesheet.subtitle'|trans }}{% endblock %}
+{% block page_actions %}{{ actions.timesheet_team(timesheet, 'edit') }}{% endblock %}
+
+{% block main %}
+ {{ include(app.request.xmlHttpRequest ? 'default/_form_modal.html.twig' : 'default/_form.html.twig', {
+ 'title': (timesheet.id ? 'timesheet.edit'|trans : 'create'|trans),
+ 'form': form,
+ 'back': path('admin_timesheet')
+ }) }}
+{% endblock %}
diff --git a/templates/admin/timesheet_export.html.twig b/templates/timesheet-team/export.html.twig
similarity index 100%
rename from templates/admin/timesheet_export.html.twig
rename to templates/timesheet-team/export.html.twig
diff --git a/templates/admin/timesheet.html.twig b/templates/timesheet-team/index.html.twig
similarity index 67%
rename from templates/admin/timesheet.html.twig
rename to templates/timesheet-team/index.html.twig
index 59bf5943..14684767 100644
--- a/templates/admin/timesheet.html.twig
+++ b/templates/timesheet-team/index.html.twig
@@ -2,20 +2,11 @@
{% import "macros/widgets.html.twig" as widgets %}
{% import "macros/datatables.html.twig" as tables %}
{% import "macros/toolbar.html.twig" as toolbar %}
+{% import "macros/actions.html.twig" as actions %}
{% block page_title %}{{ 'admin_timesheet.title'|trans }}{% endblock %}
{% block page_subtitle %}{{ 'admin_timesheet.subtitle'|trans }}{% endblock %}
-{% block page_actions %}
- {% set actions = {'filter': '#collapseTimesheetAdmin'} %}
- {% if is_granted('export_own_timesheet') %}
- {% set actions = actions|merge({'download': 'onclick:return exportTimesheet()'}) %}
- {% endif %}
- {% set actions = actions|merge({'visibility': '#modal_timesheet_admin'}) %}
- {% if is_granted('create_other_timesheet') %}
- {% set actions = actions|merge({'create': {'url': path('admin_timesheet_create'), 'class': 'modal-ajax-form'}}) %}
- {% endif %}
- {{ widgets.page_actions(actions) }}
-{% endblock %}
+{% block page_actions %}{{ actions.timesheets_team('index') }}{% endblock %}
{% block main_before %}
{{ toolbar.toolbar(toolbarForm, 'collapseTimesheetAdmin', showFilter) }}
@@ -74,28 +65,20 @@
{% endif %}
- {{ widgets.label_customer(entry.project.customer) }}
+ {{ widgets.label_customer(entry.project.customer) }}
- {{ widgets.label_project(entry.project) }}
+ {{ widgets.label_project(entry.project) }}
- {{ widgets.label_activity(entry.activity) }}
+ {{ widgets.label_activity(entry.activity) }}
+
+
+ {{ widgets.label_user(entry.user) }}
- {{ widgets.label_user(entry.user) }} {{ entry.description|nl2br }}
- {% set actionButtons = {} %}
- {% if is_granted('edit', entry) %}
- {% set actionButtons = actionButtons|merge({'edit': {'url': path('admin_timesheet_edit', {'id': entry.id, 'page': page}), 'class': 'modal-ajax-form'}}) %}
- {% endif %}
- {% if not entry.end and is_granted('stop', entry) %}
- {% set actionButtons = {'stop': path('admin_timesheet_stop', {'id' : entry.id})}|merge(actionButtons) %}
- {% endif %}
- {% if is_granted('delete', entry) %}
- {% set actionButtons = actionButtons|merge({'trash': path('admin_timesheet_delete', {'id' : entry.id, 'page': page})}) %}
- {% endif %}
- {{ widgets.button_group(actionButtons) }}
+ {{ actions.timesheet_team(entry, 'index') }}
{% endfor %}
diff --git a/templates/timesheet/edit.html.twig b/templates/timesheet/edit.html.twig
index 2f7c2e83..7ece6b58 100644
--- a/templates/timesheet/edit.html.twig
+++ b/templates/timesheet/edit.html.twig
@@ -1,11 +1,14 @@
{% extends app.request.xmlHttpRequest ? 'form.html.twig' : 'base.html.twig' %}
+{% import "macros/widgets.html.twig" as widgets %}
+{% import "macros/actions.html.twig" as actions %}
{% block page_title %}{{ 'timesheet.title'|trans }}{% endblock %}
{% block page_subtitle %}{{ 'timesheet.subtitle'|trans }}{% endblock %}
+{% block page_actions %}{{ actions.timesheet(timesheet, 'edit') }}{% endblock %}
{% block main %}
{{ include(app.request.xmlHttpRequest ? 'default/_form_modal.html.twig' : 'default/_form.html.twig', {
- 'title': (entry.id ? 'timesheet.edit'|trans : 'create'|trans),
+ 'title': (timesheet.id ? 'timesheet.edit'|trans : 'create'|trans),
'form': form,
'back': path('timesheet')
}) }}
diff --git a/templates/timesheet/index.html.twig b/templates/timesheet/index.html.twig
index ff1a1965..5072acac 100644
--- a/templates/timesheet/index.html.twig
+++ b/templates/timesheet/index.html.twig
@@ -2,43 +2,11 @@
{% import "macros/widgets.html.twig" as widgets %}
{% import "macros/datatables.html.twig" as tables %}
{% import "macros/toolbar.html.twig" as toolbar %}
-
-{% macro summary(day, duration, dayRates, columns) %}
-
- {{ day }}
- {{ duration|duration }}
- {% if is_granted('view_rate_own_timesheet') %}
-
- {% for currency, rate in dayRates %}
- {{ rate|money(currency) }}
- {% if not loop.last %}
-
-
-{% endmacro %}
+{% import "macros/actions.html.twig" as actions %}
{% block page_title %}{{ 'timesheet.title'|trans }}{% endblock %}
{% block page_subtitle %}{{ 'timesheet.subtitle'|trans }}{% endblock %}
-{% block page_actions %}
- {% set actions = {'filter': '#collapseTimesheet'} %}
- {% if is_granted('export_own_timesheet') %}
- {% set actions = actions|merge({'download': {'onclick': 'return exportTimesheet()'}}) %}
- {% endif %}
- {% set actions = actions|merge({'visibility': '#modal_timesheet'}) %}
- {% set actions = actions|merge({'calendar': path('calendar')}) %}
- {% if is_granted('create_own_timesheet') %}
- {% set actions = actions|merge({'create': {'url': path('timesheet_create'), 'class': 'modal-ajax-form'}}) %}
- {% endif %}
- {{ widgets.page_actions(actions) }}
-{% endblock %}
+{% block page_actions %}{{ actions.timesheets('index') }}{% endblock %}
{% block main_before %}
{{ toolbar.toolbar(toolbarForm, 'collapseTimesheet', showFilter) }}
@@ -117,25 +85,7 @@
{{ widgets.label_activity(entry.activity) }}
{{ entry.description|desc2html }}
- {% set actionButtons = {} %}
- {% if is_granted('edit', entry) %}
- {% set actionButtons = actionButtons|merge({'edit': {'url': path('timesheet_edit', {'id': entry.id, 'page': page}), 'class': 'modal-ajax-form'}}) %}
- {% endif %}
-
- {% if entry.end %}
- {% if is_granted('start', entry) %}
- {% set actionButtons = {'repeat': path('timesheet_start', {'id' : entry.id})}|merge(actionButtons) %}
- {% endif %}
- {% else %}
- {% if is_granted('stop', entry) %}
- {% set actionButtons = {'stop': path('timesheet_stop', {'id' : entry.id})}|merge(actionButtons) %}
- {% endif %}
- {% endif %}
-
- {% if is_granted('delete', entry) %}
- {% set actionButtons = actionButtons|merge({'trash': path('timesheet_delete', {'id' : entry.id, 'page': page})}) %}
- {% endif %}
- {{ widgets.button_group(actionButtons) }}
+ {{ actions.timesheet(entry, 'index') }}
{% if entry.end %}
@@ -169,3 +119,25 @@
}
{% endblock %}
+
+{% macro summary(day, duration, dayRates, columns) %}
+
+ {{ day }}
+ {{ duration|duration }}
+ {% if is_granted('view_rate_own_timesheet') %}
+
+ {% for currency, rate in dayRates %}
+ {{ rate|money(currency) }}
+ {% if not loop.last %}
+
+
+{% endmacro %}
diff --git a/templates/admin/user_delete.html.twig b/templates/user/delete.html.twig
similarity index 100%
rename from templates/admin/user_delete.html.twig
rename to templates/user/delete.html.twig
diff --git a/templates/admin/user_edit.html.twig b/templates/user/edit.html.twig
similarity index 100%
rename from templates/admin/user_edit.html.twig
rename to templates/user/edit.html.twig
diff --git a/templates/admin/user.html.twig b/templates/user/index.html.twig
similarity index 100%
rename from templates/admin/user.html.twig
rename to templates/user/index.html.twig
diff --git a/templates/user/profile.html.twig b/templates/user/profile.html.twig
index d4997f37..bb2c8699 100644
--- a/templates/user/profile.html.twig
+++ b/templates/user/profile.html.twig
@@ -133,7 +133,7 @@
{{ 'label.username'|trans }} {{ user.username }} {{ 'profile.first_entry'|trans }} {{ stats.firstEntry|date_short }} {{ 'label.hourly_rate'|trans }} {{ user.preferenceValue('hourly_rate') }} {{ 'label.hourlyRate'|trans }} {{ user.preferenceValue('hourly_rate') }} {{ 'label.now'|trans }} {{ local_time|date_short }} {{ local_time|time }}