added user-specific rates (#1455)

templates/activity/actions.html.twig

@@ -18,6 +18,9 @@
     {% set actions = {} %}
 
     {% if activity.id is not empty %}
+        {% if view != 'details' and is_granted('view', activity) %}
+            {% set actions = actions|merge({'details': path('activity_details', {'id': activity.id})}) %}
+        {% endif %}
         {% if is_granted('edit', activity) %}
             {% set class = '' %}
             {% if view != 'edit' %}
@@ -25,9 +28,6 @@
             {% endif %}
             {% set actions = actions|merge({'edit': {'url': path('admin_activity_edit', {'id': activity.id}), 'class': class}}) %}
         {% endif %}
-        {% if is_granted('budget', activity) %}
-            {% set actions = actions|merge({'report': {'url': path('admin_activity_budget', {'id': activity.id})}}) %}
-        {% endif %}
         {% if actions|length > 0 %}
             {% set actions = actions|merge({'divider': null}) %}
         {% endif %}

templates/activity/budget.html.twig

@@ -1,42 +0,0 @@
-{% extends 'base.html.twig' %}
-{% import "activity/actions.html.twig" as actions %}
-
-{% block page_title %}{{ 'admin_activity.title'|trans }}{% endblock %}
-{% block page_actions %}{{ actions.activity(activity, 'delete') }}{% endblock %}
-
-{% block main %}
-
-    {% set params = {
-        '%activity%': '<strong>' ~ activity.name ~ '</strong>',
-        '%project%': '<strong>-</strong>',
-        '%customer%': '<strong>-</strong>',
-        '%records%': '<strong>' ~ stats.recordAmount ~ '</strong>',
-        '%duration%': '<strong>' ~ stats.recordDuration|duration ~ '</strong>'
-    } %}
-
-    {% if activity.project is not null %}
-        {% set params = params|merge({
-            '%project%': '<strong>' ~ activity.project.name ~ '</strong>',
-            '%customer%': '<strong>' ~ activity.project.customer.name ~ '</strong>',
-        }) %}
-    {% endif %}
-
-    {% embed '@AdminLTE/Widgets/box-widget.html.twig' %}
-        {% import "macros/progressbar.html.twig" as progress %}
-        {% block box_title %}{{ activity.name }}{% endblock %}
-        {% block box_body %}
-            <p>
-                {{ 'admin_activity.short_stats'|trans(params)|raw }}
-            </p>
-
-            {% set currency = null %}
-            {% if activity.project is not null %}
-                {% set currency = activity.project.customer.currency %}
-            {% endif %}
-
-            {{ progress.progressbar(activity.budget, stats.recordRate, 'label.budget'|trans, stats.recordRate|money(currency) ~ ' / ' ~ activity.budget|money(currency) ) }}
-            {{ progress.progressbar(activity.timeBudget, stats.recordDuration, 'label.timeBudget'|trans, stats.recordDuration|duration ~ ' / ' ~ activity.timeBudget|duration ) }}
-        {% endblock %}
-    {% endembed %}
-
-{% endblock %}

templates/activity/details.html.twig

@@ -0,0 +1,149 @@
+{% extends 'base.html.twig' %}
+{% import "macros/widgets.html.twig" as widgets %}
+{% import "activity/actions.html.twig" as actions %}
+
+{% block page_title %}{{ 'admin_activity.title'|trans }}{% endblock %}
+{% block page_actions %}{{ actions.activity(activity, 'details') }}{% endblock %}
+
+{% block main %}
+    {% set can_edit = is_granted('edit', activity) %}
+    {% set currency = null %}
+    {% if activity.project is not null %}
+        {% set currency = activity.project.customer.currency %}
+    {% endif %}
+
+    {% embed '@AdminLTE/Widgets/box-widget.html.twig' %}
+        {% import "macros/widgets.html.twig" as widgets %}
+        {% import "customer/actions.html.twig" as customerActions %}
+        {% import "project/actions.html.twig" as projectActions %}
+        {% block box_attributes %}id="activity_details_box"{% endblock %}
+        {% block box_title %}
+            {{ widgets.label_activity(activity) }}
+        {% endblock %}
+        {% block box_tools %}
+            {% if can_edit %}
+                <a class="modal-ajax-form open-edit btn btn-box-tool" data-href="{{ path('admin_activity_edit', {'id': activity.id}) }}" data-toggle="tooltip" data-placement="top" title="{{ 'action.edit'|trans }}"><i class="{{ 'edit'|icon }}"></i></a>
+            {% endif %}
+        {% endblock %}
+        {% block box_body %}
+            {% if activity.comment is not empty %}
+                {{ activity.comment|comment2html(true) }}
+            {% endif %}
+            <table class="table table-hover">
+                {% if not activity.visible %}
+                    <tr>
+                        <th>{{ 'label.visible'|trans }}</th>
+                        <td>
+                            {{ widgets.label_boolean(activity.visible) }}
+                        </td>
+                    </tr>
+                {% endif %}
+                {% if not activity.global %}
+                    <tr>
+                        <th>{{ 'label.customer'|trans }}</th>
+                        <td>
+                            {{ widgets.label_customer(activity.project.customer) }}
+                            {% if activity.project.customer.teams|length == 0 %}
+                                {{ widgets.icon('unlocked') }}
+                            {% endif %}
+                            &nbsp;
+                            {{ customerActions.customer(activity.project.customer, 'custom') }}
+                        </td>
+                    </tr>
+                    <tr>
+                        <th>{{ 'label.project'|trans }}</th>
+                        <td>
+                            {{ widgets.label_project(activity.project) }}
+                            {% if activity.project.teams|length == 0 %}
+                                {{ widgets.icon('unlocked') }}
+                            {% endif %}
+                            &nbsp;
+                            {{ projectActions.project(activity.project, 'custom') }}
+                        </td>
+                    </tr>
+                {% endif %}
+                {% for metaField in activity.visibleMetaFields %}
+                    <tr>
+                        <th>{{ metaField.label }}</th>
+                        <td>{{ widgets.form_type_value(metaField.type, metaField.value, activity) }}</td>
+                    </tr>
+                {% endfor %}
+            </table>
+        {% endblock %}
+    {% endembed %}
+
+    {% if stats is not null %}
+        {{ include('activity/embed_budget.html.twig', {'activity': activity, 'stats': stats}) }}
+    {% endif %}
+
+    {% if can_edit %}
+        {% embed '@AdminLTE/Widgets/box-widget.html.twig' %}
+            {% import "macros/widgets.html.twig" as widgets %}
+            {% block box_attributes %}id="activity_rates_box"{% endblock %}
+            {% block box_title %}
+                {{ 'rates.title'|trans }}
+            {% endblock %}
+            {% block box_tools %}
+                <a class="modal-ajax-form open-edit btn btn-box-tool" data-href="{{ path('admin_activity_rate_add', {'id': activity.id}) }}" data-toggle="tooltip" data-placement="top" title="{{ 'create'|trans }}"><i class="{{ 'create'|icon }}"></i></a>
+            {% endblock %}
+            {% block box_body %}
+                {% if rates is empty %}
+                    {{ 'rates.empty'|trans }}
+                {% else %}
+                    <table class="table dataTable" >
+                        <thead>
+                        <tr>
+                            <th>
+                                {{ 'label.user'|trans }}
+                            </th>
+                            <th>
+                                {{ 'label.hourlyRate'|trans }}
+                            </th>
+                            <th>
+                                {{ 'label.fixedRate'|trans }}
+                            </th>
+                            <th class="actions"></th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        {% for rate in rates %}
+                            <tr>
+                                <td>
+                                    {% if rate.user is not null %}
+                                        {{ widgets.user_avatar(rate.user) }}
+                                    {% else %}
+                                        &ndash;
+                                    {% endif %}
+                                </td>
+                                <td>
+                                    {% if not rate.fixed %}
+                                        {{ rate.rate|money(currency) }}
+                                    {% endif %}
+                                </td>
+                                <td>
+                                    {% if rate.fixed %}
+                                        {{ rate.rate|money(currency) }}
+                                    {% endif %}
+                                </td>
+                                <td class="actions">
+                                    <a href="{{ path('admin_activity_rate_delete', {'id': activity.id, 'rate': rate.id}) }}" class="confirmation-link btn btn-default btn-xs" data-question="confirm.delete"><i class="{{ 'delete'|icon }}"></i></a>
+                                </td>
+                            </tr>
+                        {% endfor %}
+                        </tbody>
+                    </table>
+                {% endif %}
+            {% endblock %}
+        {% endembed %}
+    {% endif %}
+
+{% endblock %}
+
+{% block javascripts %}
+    {{ parent() }}
+    <script type="text/javascript">
+        document.addEventListener('kimai.initialized', function() {
+            KimaiReloadPageWidget.create('kimai.activityUpdate kimai.teamUpdate kimai.projectTeamUpdate kimai.projectUpdate');
+        });
+    </script>
+{% endblock %}

templates/activity/edit.html.twig

@@ -25,33 +25,19 @@
             {{ form_row(form.comment) }}
             {{ form_row(form.customer) }}
             {{ form_row(form.project) }}
-            <fieldset>
-                {#<legend>Financial data</legend>#}
-                <div class="row">
-                    <div class="col-md-6">
-                        {{ form_row(form.fixedRate) }}
-                    </div>
-                    <div class="col-md-6">
-                        {{ form_row(form.hourlyRate) }}
-                    </div>
+            {% if form.budget is defined %}
+            <div class="row">
+                <div class="col-md-6">
+                    {{ form_row(form.budget) }}
                 </div>
-                {% if form.budget is defined %}
-                <div class="row">
-                    <div class="col-md-6">
-                        {{ form_row(form.budget) }}
-                    </div>
-                    <div class="col-md-6">
-                        {{ form_row(form.timeBudget) }}
-                    </div>
+                <div class="col-md-6">
+                    {{ form_row(form.timeBudget) }}
                 </div>
-                {% endif %}
-            </fieldset>
+            </div>
+            {% endif %}
             {{ form_row(form.visible) }}
             {% if form.metaFields is defined and form.metaFields is not empty %}
-                <fieldset>
-                    {#<legend>Custom fields</legend>#}
-                    {{ form_row(form.metaFields) }}
-                </fieldset>
+                {{ form_row(form.metaFields) }}
             {% endif %}
             {{ form_widget(form) }}
         {% endblock %}

templates/activity/embed_budget.html.twig

@@ -0,0 +1,33 @@
+{% embed '@AdminLTE/Widgets/box-widget.html.twig' %}
+    {% import "macros/progressbar.html.twig" as progress %}
+    {% block box_title %}{{ 'label.budget'|trans }}{% endblock %}
+    {% block box_attributes %}id="budget_box"{% endblock %}
+    {% block box_body %}
+        {% set params = {
+            '%activity%': '<strong>' ~ activity.name ~ '</strong>',
+            '%project%': '<strong>-</strong>',
+            '%customer%': '<strong>-</strong>',
+            '%records%': '<strong>' ~ stats.recordAmount ~ '</strong>',
+            '%duration%': '<strong>' ~ stats.recordDuration|duration ~ '</strong>'
+        } %}
+
+        {% if activity.project is not null %}
+            {% set params = params|merge({
+                '%project%': '<strong>' ~ activity.project.name ~ '</strong>',
+                '%customer%': '<strong>' ~ activity.project.customer.name ~ '</strong>',
+            }) %}
+        {% endif %}
+
+        <p>
+            {{ 'admin_activity.short_stats'|trans(params)|raw }}
+        </p>
+
+        {% set currency = null %}
+        {% if activity.project is not null %}
+            {% set currency = activity.project.customer.currency %}
+        {% endif %}
+
+        {{ progress.progressbar(activity.budget, stats.recordRate, 'label.budget'|trans, stats.recordRate|money(currency) ~ ' / ' ~ activity.budget|money(currency) ) }}
+        {{ progress.progressbar(activity.timeBudget, stats.recordDuration, 'label.timeBudget'|trans, stats.recordDuration|duration ~ ' / ' ~ activity.timeBudget|duration ) }}
+    {% endblock %}
+{% endembed %}

templates/activity/index.html.twig

@@ -42,7 +42,7 @@
         {{ tables.datatable_header(tableName, columns, query, {'reload': 'kimai.activityUpdate'}) }}
 
         {% for entry in entries %}
-            <tr{% if is_granted('edit', entry) %} class="modal-ajax-form open-edit" data-href="{{ path('admin_activity_edit', {'id': entry.id}) }}"{% endif %}>
+            <tr{% if is_granted('view', entry) %} class="alternative-link open-edit" data-href="{{ path('activity_details', {'id': entry.id}) }}"{% endif %}>
                 <td>{{ 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 #}

templates/activity/rates.html.twig

@@ -0,0 +1,13 @@
+{% extends app.request.xmlHttpRequest ? 'form.html.twig' : 'base.html.twig' %}
+{% import "activity/actions.html.twig" as actions %}
+
+{% block page_title %}{{ 'admin_activity.title'|trans }}{% endblock %}
+{% block page_actions %}{{ actions.activity(activity, 'rates') }}{% endblock %}
+
+{% block main %}
+    {{ include(app.request.xmlHttpRequest ? 'default/_form_modal.html.twig' : 'default/_form.html.twig', {
+        'title': activity.name,
+        'form': form,
+        'back': path('admin_activity')
+    }) }}
+{% endblock %}