detail pages for customers and projects (#1371)

templates/project/actions.html.twig

@@ -18,6 +18,9 @@
     {% set actions = {} %}
 
     {% if project.id is not empty %}
+        {% if view != 'details' and is_granted('view', project) %}
+            {% set actions = actions|merge({'details': path('project_details', {'id': project.id})}) %}
+        {% endif %}
         {% if is_granted('edit', project) %}
             {% set class = '' %}
             {% if view != 'edit' %}
@@ -25,11 +28,15 @@
             {% endif %}
             {% set actions = actions|merge({'edit': {'url': path('admin_project_edit', {'id': project.id}), 'class': class}}) %}
         {% endif %}
-        {% if is_granted('budget', project) %}
-            {% set actions = actions|merge({'report': {'url': path('admin_project_budget', {'id': project.id})}}) %}
-        {% endif %}
         {% if is_granted('permissions', project) %}
-            {% set actions = actions|merge({'permissions': {'url': path('admin_project_permissions', {'id': project.id})}}) %}
+            {% set class = '' %}
+            {% if view != 'permissions' %}
+                {% set class = 'modal-ajax-form' %}
+            {% endif %}
+            {% set actions = actions|merge({'permissions': {'url': path('admin_project_permissions', {'id': project.id}), 'class': class}}) %}
+        {% endif %}
+        {% if actions|length > 0 %}
+            {% set actions = actions|merge({'divider': null}) %}
         {% endif %}
         {% if is_granted('view_activity') %}
             {% set actions = actions|merge({'activity': path('admin_activity', {'customer': project.customer.id, 'project': project.id})}) %}
@@ -45,12 +52,12 @@
         {% endif %}
     {% endif %}
 
-    {% if view != 'index' %}
+    {% if view != 'index' and view != 'custom' %}
         {% set actions = actions|merge({'back': path('admin_project')}) %}
     {% endif %}
 
     {% set event = trigger('actions.project', {'actions': actions, 'view': view, 'project': project}) %}
-    {% if view == 'index' %}
+    {% if view == 'index' or view == 'custom' %}
         {{ widgets.table_actions(event.payload.actions) }}
     {% else %}
         {{ widgets.entity_actions(event.payload.actions) }}

templates/project/budget.html.twig

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

templates/project/details.html.twig

@@ -0,0 +1,151 @@
+{% extends 'base.html.twig' %}
+{% import "macros/widgets.html.twig" as widgets %}
+{% import "project/actions.html.twig" as actions %}
+
+{% block page_title %}{{ 'admin_project.title'|trans }}{% endblock %}
+{% block page_actions %}{{ actions.project(project, 'details') }}{% endblock %}
+
+{% block main %}
+    {% set can_edit = is_granted('edit', project) %}
+
+    {% embed '@AdminLTE/Widgets/box-widget.html.twig' %}
+        {% import "macros/widgets.html.twig" as widgets %}
+        {% import "customer/actions.html.twig" as customerActions %}
+        {% block box_attributes %}id="project_details_box"{% endblock %}
+        {% block box_tools %}
+            {% if can_edit %}
+                <a class="modal-ajax-form open-edit btn btn-box-tool" data-href="{{ path('admin_project_edit', {'id': project.id}) }}" data-toggle="tooltip" data-placement="top" title="{{ 'action.edit'|trans }}"><i class="{{ 'edit'|icon }}"></i></a>
+            {% endif %}
+        {% endblock %}
+        {% block box_title %}
+            {{ widgets.label_project(project) }}
+        {% endblock %}
+        {% block box_body %}
+            {% if project.comment is not empty %}
+                {{ project.comment|comment2html(true) }}
+            {% endif %}
+            <table class="table table-hover">
+                {% if not project.visible %}
+                    <tr>
+                        <th>{{ 'label.visible'|trans }}</th>
+                        <td>
+                            {{ widgets.label_boolean(project.visible) }}
+                        </td>
+                    </tr>
+                {% endif %}
+                <tr>
+                    <th>{{ 'label.customer'|trans }}</th>
+                    <td>
+                        {{ widgets.label_customer(project.customer) }}
+                        {% if project.customer.teams|length == 0 %}
+                            {{ widgets.icon('unlocked') }}
+                        {% endif %}
+                        &nbsp;
+                        {{ customerActions.customer(project.customer, 'custom') }}
+                    </td>
+                </tr>
+                {% if is_granted('details', project) %}
+                    <tr>
+                        <th>{{ 'label.orderNumber'|trans }}</th>
+                        <td>
+                            {{ project.orderNumber }}
+                        </td>
+                    </tr>
+                    <tr>
+                        <th>{{ 'label.orderDate'|trans }}</th>
+                        <td>
+                            {% if project.orderDate is not empty %}
+                                {{ project.orderDate|date_full }}
+                            {% else %}
+                                &ndash;
+                            {% endif %}
+                        </td>
+                    </tr>
+                    <tr>
+                        <th>{{ 'label.project_start'|trans }}</th>
+                        <td>
+                            {% if project.start is not empty %}
+                                {{ project.start|date_full }}
+                            {% else %}
+                                &ndash;
+                            {% endif %}
+                        </td>
+                    </tr>
+                    <tr>
+                        <th>{{ 'label.project_end'|trans }}</th>
+                        <td>
+                            {% if project.end is not empty %}
+                                {{ project.end|date_full }}
+                            {% else %}
+                                &ndash;
+                            {% endif %}
+                        </td>
+                    </tr>
+                    {% if can_edit %}
+                        <tr>
+                            <th>{{ 'label.fixedRate'|trans }}</th>
+                            <td>
+                                {% if project.fixedRate is not empty %}
+                                    {{ project.fixedRate|money(project.customer.currency) }}
+                                {% else %}
+                                    &ndash;
+                                {% endif %}
+                            </td>
+                        </tr>
+                        <tr>
+                            <th>{{ 'label.hourlyRate'|trans }}</th>
+                            <td>
+                                {% if project.hourlyRate is not empty %}
+                                    {{ project.hourlyRate|money(project.customer.currency) }}
+                                {% else %}
+                                    &ndash;
+                                {% endif %}
+                            </td>
+                        </tr>
+                    {% endif %}
+                    {% for metaField in project.visibleMetaFields %}
+                        <tr>
+                            <th>{{ metaField.name }}</th>
+                            <td>{{ widgets.form_type_value(metaField.type, metaField.value, project) }}</td>
+                        </tr>
+                    {% endfor %}
+                {% endif %}
+            </table>
+        {% endblock %}
+    {% endembed %}
+
+    {{ render(controller('App\\Controller\\ProjectController::activitiesAction', {'project': project.id, 'page': 1})) }}
+
+    {% if stats is not null %}
+        {{ include('project/embed_budget.html.twig', {'project': project, 'stats': stats}) }}
+    {% endif %}
+
+    {% if teams is not null%}
+        {% set options = {'teams': teams, 'team': team} %}
+        {% if is_granted('permissions', project) %}
+            {% set options = options|merge({'route_create': path('project_team_create', {'id': project.id}), 'route_edit': path('admin_project_permissions', {'id': project.id})}) %}
+        {% endif %}
+        {% if project.customer.teams|length > 0 %}
+            {% set options = options|merge({'empty_message': 'team.project_visibility_inherited'}) %}
+        {% endif %}
+        {{ include('embeds/teams.html.twig', options) }}
+    {% endif %}
+
+    {% if comments is not null %}
+        {% set options = {'form': commentForm, 'comments': comments} %}
+        {% if can_edit %}
+            {% set options = options|merge({'route_pin': 'project_comment_pin', 'route_delete': 'project_comment_delete'}) %}
+        {% endif %}
+        {{ include('embeds/comments.html.twig', options) }}
+    {% endif %}
+
+{% endblock %}
+
+{% block javascripts %}
+    {{ parent() }}
+    <script type="text/javascript">
+        document.addEventListener('kimai.initialized', function() {
+            KimaiReloadPageWidget.create('kimai.projectTeamUpdate kimai.projectUpdate kimai.teamUpdate kimai.customerUpdate ');
+        });
+    </script>
+{% endblock %}

templates/project/embed_activities.html.twig

@@ -0,0 +1,29 @@
+{% if activities|length > 0 %}
+    {% embed '@AdminLTE/Widgets/box-widget.html.twig' with {'project': project, 'activities': activities, 'page': page} %}
+        {% import "activity/actions.html.twig" as actions %}
+        {% block box_title %}{{ 'menu.admin_activity'|trans }}{% endblock %}
+        {% block box_attributes %}
+            id="activity_list_box"  data-href="{{ path('project_activities', {'id': project.id}) }}" data-reload="kimai.activityUpdate"
+        {% endblock %}
+        {% block box_tools %}
+            {{ pagerfanta(activities, 'twitter_bootstrap3_translated', { proximity: 1, css_container_class: 'pagination pagination-sm inline', routeName: 'project_activities', routeParams: {'id': project.id} }) }}
+        {% endblock %}
+        {% block box_body_class %}no-padding{% endblock %}
+        {% block box_tools_attributes %}data-page="{{ page }}"{% endblock %}
+        {% block box_body %}
+            <table class="table table-hover dataTable">
+                <tbody>
+                {% for activity in activities %}
+                    <tr>
+                        <td>{{ activity.name }}</td>
+                        <td class="actions">{{ actions.activity(activity, 'custom') }}</td>
+                    </tr>
+                {% endfor %}
+                </tbody>
+            </table>
+        {% endblock %}
+    {% endembed %}
+    <script type="text/javascript">
+        KimaiPaginatedBoxWidget.create('#activity_list_box');
+    </script>
+{% endif %}

templates/project/embed_budget.html.twig

@@ -0,0 +1,21 @@
+{% 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 = {
+            '%project%': '<strong>' ~ project.name ~ '</strong>',
+            '%customer%': '<strong>' ~ project.customer.name ~ '</strong>',
+            '%records%': '<strong>' ~ stats.recordAmount ~ '</strong>',
+            '%activities%': '<strong>' ~ stats.activityAmount ~ '</strong>',
+            '%duration%': '<strong>' ~ stats.recordDuration|duration ~ '</strong>'
+        } %}
+        
+        <p>
+            {{ 'admin_project.short_stats'|trans(params)|raw }}
+        </p>
+
+        {{ progress.progressbar(project.budget, stats.recordRate, 'label.budget'|trans, stats.recordRate|money(project.customer.currency) ~ ' / ' ~ project.budget|money(project.customer.currency) ) }}
+        {{ progress.progressbar(project.timeBudget, stats.recordDuration, 'label.timeBudget'|trans, stats.recordDuration|duration ~ ' / ' ~ project.timeBudget|duration ) }}
+    {% endblock %}
+{% endembed %}

templates/project/index.html.twig

@@ -4,12 +4,11 @@
 {% import "macros/toolbar.html.twig" as toolbar %}
 {% import "project/actions.html.twig" as actions %}
 
+{% set showVisibility = query.visibility != 1 %}
 {% set columns = {
     'name': 'alwaysVisible',
     'customer': 'hidden-xs',
-    'comment': 'hidden-xs hidden-sm',
-    'orderNumber': 'hidden-xs hidden-sm',
-    'orderDate': 'hidden-xs hidden-sm',
+    'comment': {'class': 'hidden-xs hidden-sm', 'title': 'label.description'|trans},
 } %}
 {% for field in metaColumns %}
     {% set columns = columns|merge({
@@ -18,7 +17,13 @@
 {% endfor %}
 {% set columns = columns|merge({
     'team': {'class': 'text-center', 'orderBy': false},
-    'visible': {'class': 'text-center', 'orderBy': false},
+}) %}
+{% if showVisibility %}
+    {% set columns = columns|merge({
+        'visible': {'class': 'text-center', 'orderBy': false},
+    }) %}
+{% endif %}
+{% set columns = columns|merge({
     'actions': 'actions alwaysVisible',
 }) %}
 
@@ -37,21 +42,15 @@
     {% if entries.count == 0 %}
         {{ widgets.callout('warning', 'error.no_entries_found') }}
     {% else %}
-        {{ tables.datatable_header(tableName, columns, query, {'reload': 'kimai.projectUpdate'}) }}
+        {{ tables.datatable_header(tableName, columns, query, {'reload': 'kimai.projectUpdate kimai.projectTeamUpdate'}) }}
 
         {% for entry in entries %}
-            <tr{% if is_granted('edit', entry) %} class="modal-ajax-form open-edit" data-href="{{ path('admin_project_edit', {'id': entry.id}) }}"{% endif %}>
+            <tr class="alternative-link open-edit" data-href="{{ path('project_details', {'id': entry.id}) }}">
                 <td>{{ widgets.label_color_dot('project', true, entry.name, null, entry.color) }}</td>
                 <td class="{{ tables.data_table_column_class(tableName, columns, 'customer') }}">
                     {{ widgets.label_customer(entry.customer) }}
                 </td>
-                <td class="{{ tables.data_table_column_class(tableName, columns, 'comment') }}">{{ entry.comment|comment2html }}</td>
-                <td class="{{ tables.data_table_column_class(tableName, columns, 'orderNumber') }}">{{ entry.orderNumber }}</td>
-                <td class="{{ tables.data_table_column_class(tableName, columns, 'orderDate') }}">
-                    {% if entry.orderDate is not empty %}
-                        {{ entry.orderDate|date_short }}
-                    {% endif %}
-                </td>
+                <td class="{{ tables.data_table_column_class(tableName, columns, 'comment') }}">{{ entry.comment|comment2html() }}</td>
                 {% for field in metaColumns %}
                     <td class="text-nowrap {{ tables.data_table_column_class(tableName, columns, 'mf_' ~ field.name) }}">
                         {{ tables.datatable_meta_column(entry, field) }}
@@ -64,7 +63,9 @@
                         {{ widgets.icon('unlocked') }}
                     {% endif %}
                 </td>
-                <td class="{{ tables.data_table_column_class(tableName, columns, 'visible') }}">{{ widgets.label_visible(entry.visible) }}</td>
+                {% if showVisibility %}
+                    <td class="{{ tables.data_table_column_class(tableName, columns, 'visible') }}">{{ widgets.label_visible(entry.visible) }}</td>
+                {% endif %}
                 <td class="actions">
                     {{ actions.project(entry, 'index') }}
                 </td>