Next major version 2 with PHP 8.1, Symfony 6, Tabler UI, 2FA ... (#2902)

2022-12-31 21:19:55 +01:00
parent 95e06746bd
commit 90a0fd8a22
2164 changed files with 83700 additions and 86426 deletions
--- a/templates/activity/actions.html.twig
+++ b/templates/activity/actions.html.twig
@@ -1,9 +1,3 @@
-{% macro activities(view, query) %}
-    {% import "macros/widgets.html.twig" as widgets %}
-    {% set event = actions(app.user, 'activities', view, {'query': query}) %}
-    {{ widgets.page_actions(event.actions) }}
-{% endmacro %}
-
 {% macro activity(activity, view, isTable) %}
    {% import "macros/widgets.html.twig" as widgets %}
    {% set event = actions(app.user, 'activity', view, {'activity': activity}) %}
--- a/templates/activity/delete.html.twig
+++ b/templates/activity/delete.html.twig
@@ -1,23 +1,14 @@
-{% extends app.request.xmlHttpRequest ? 'form.html.twig' : 'base.html.twig' %}
-{% import "activity/actions.html.twig" as actions %}
-
-{% block page_title %}{{ 'activities'|trans }}{% endblock %}
-{% block page_actions %}{{ actions.activity(activity, 'delete') }}{% endblock %}
+{% extends kimai_context.modalRequest ? 'form.html.twig' : 'base.html.twig' %}

 {% block main %}
-
-    {% set inUse = (stats.counter > 0) %}
-
    {% set params = {
        '%records%': stats.counter,
        '%duration%': stats.duration|duration
    } %}
-
-    {{ include(app.request.xmlHttpRequest ? 'default/_form_delete_modal.html.twig' : 'default/_form_delete.html.twig', {
+    {{ include(kimai_context.modalRequest ? 'default/_form_delete_modal.html.twig' : 'default/_form_delete.html.twig', {
        'message': ("delete_warning.short_stats"|trans(params) ~ "admin_entity.delete_confirm"|trans),
        'form': form,
-        'used': inUse,
+        'used': (stats.counter > 0),
        'back': path('admin_activity')
    }) }}
-
 {% endblock %}
--- a/templates/activity/details.html.twig
+++ b/templates/activity/details.html.twig
@@ -1,9 +1,5 @@
 {% extends 'base.html.twig' %}
 {% import "macros/widgets.html.twig" as widgets %}
-{% import "activity/actions.html.twig" as actions %}
-
-{% block page_title %}{{ 'activities'|trans }}{% endblock %}
-{% block page_actions %}{{ actions.activity(activity, 'activity_details') }}{% endblock %}

 {% block main %}
    {% set can_edit = is_granted('edit', activity) %}
@@ -12,7 +8,7 @@
        {% set currency = activity.project.customer.currency %}
    {% endif %}

-    {% embed '@AdminLTE/Widgets/box-widget.html.twig' %}
+    {% embed '@theme/embeds/card.html.twig' %}
        {% import "macros/widgets.html.twig" as widgets %}
        {% import "customer/actions.html.twig" as customerActions %}
        {% import "project/actions.html.twig" as projectActions %}
@@ -22,20 +18,20 @@
        {% endblock %}
        {% block box_tools %}
            {% if can_edit %}
-                <a class="modal-ajax-form open-edit btn btn-default btn-sm" 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>
+                {{ widgets.card_tool_button('edit', {'class': 'modal-ajax-form open-edit', 'title': 'action.edit', 'url': path('admin_activity_edit', {'id': activity.id})}) }}
            {% endif %}
        {% endblock %}
-        {% block box_body_class %}no-padding{% endblock %}
+        {% block box_body_class %}p-0{% endblock %}
        {% block box_body %}
            {% if activity.comment is not empty %}
-                <div class="comment">
+                <div class="comment p-3">
                    {{ activity.comment|comment2html(true) }}
                </div>
            {% endif %}
            <table class="table table-hover dataTable">
                {% if not activity.visible %}
                    <tr class="{{ widgets.class_activity_row(activity, now) }}">
-                        <th>{{ 'label.visible'|trans }}</th>
+                        <th>{{ 'visible'|trans }}</th>
                        <td colspan="3">
                            {{ widgets.label_boolean(activity.visible) }}
                        </td>
@@ -43,7 +39,7 @@
                {% endif %}
                {% if not activity.billable %}
                    <tr>
-                        <th>{{ 'label.billable'|trans }}</th>
+                        <th>{{ 'billable'|trans }}</th>
                        <td colspan="3">
                            {{ widgets.label_boolean(activity.billable) }}
                        </td>
@@ -51,7 +47,7 @@
                {% endif %}
                {% if not activity.global %}
                    <tr {{ widgets.customer_row_attr(activity.project.customer, now) }}>
-                        <th>{{ 'label.customer'|trans }}</th>
+                        <th>{{ 'customer'|trans }}</th>
                        <td>
                            {{ widgets.label_customer(activity.project.customer) }}
                        </td>
@@ -63,7 +59,7 @@
                        </td>
                    </tr>
                    <tr {{ widgets.project_row_attr(activity.project, now) }}>
-                        <th>{{ 'label.project'|trans }}</th>
+                        <th>{{ 'project'|trans }}</th>
                        <td>
                            {{ widgets.label_project(activity.project) }}
                        </td>
@@ -85,8 +81,12 @@
        {% endblock %}
    {% endembed %}

+    {% if can_edit %}
+        {{ include('embeds/rates-table.html.twig', {'id': 'activity_rates_box', 'entity': activity, 'create_url': path('admin_activity_rate_add', {'id': activity.id}), 'delete_route': 'delete_activity_rate', 'currency': currency, 'edit_route': 'admin_activity_rate_edit'}) }}
+    {% endif %}
+
    {% if stats is not null %}
-        {% set currency = kimai_config.getCustomerDefaultCurrency() %}
+        {% set currency = kimai_config.customerDefaultCurrency %}
        {% if activity.project is not null %}
            {% set currency = activity.project.customer.currency %}
        {% endif %}
@@ -97,10 +97,6 @@
        {{ render(controller(controller, {'activity': activity, 'page': 1})) }}
    {% endfor %}

-    {% if can_edit %}
-        {{ include('embeds/rates-table.html.twig', {'id': 'activity_rates_box', 'entity': activity, 'create_url': path('admin_activity_rate_add', {'id': activity.id}), 'delete_route': 'delete_activity_rate', 'currency': currency}) }}
-    {% endif %}
-
    {% if teams is not null %}
        {% set options = {'teams': teams, 'team': team} %}
        {% if is_granted('permissions', activity) %}
--- a/templates/activity/edit.html.twig
+++ b/templates/activity/edit.html.twig
@@ -1,11 +1,7 @@
-{% extends app.request.xmlHttpRequest ? 'form.html.twig' : 'base.html.twig' %}
-{% import "activity/actions.html.twig" as actions %}
-
-{% block page_title %}{{ 'activities'|trans }}{% endblock %}
-{% block page_actions %}{{ actions.activity(activity, 'edit') }}{% endblock %}
+{% extends kimai_context.modalRequest ? 'form.html.twig' : 'base.html.twig' %}

 {% block main %}
-    {% set formEditTemplate = app.request.xmlHttpRequest ? 'default/_form_modal.html.twig' : 'default/_form.html.twig' %}
+    {% set formEditTemplate = kimai_context.modalRequest ? 'default/_form_modal.html.twig' : 'default/_form.html.twig' %}
    {% set formOptions = {
        'title': (activity.id is null ? 'create-activity'|trans({}, 'actions') : 'edit'|trans({}, 'actions')),
        'form': form,
@@ -14,10 +10,10 @@
    {% embed formEditTemplate with formOptions %}
        {% block form_body %}
            <div class="row">
-                <div class="col-md-10">
+                <div class="col-md-9">
                    {{ form_row(form.name) }}
                </div>
-                <div class="col-md-2">
+                <div class="col-md-3">
                    {{ form_row(form.color) }}
                </div>
            </div>
@@ -45,8 +41,12 @@
                    </div>
                </div>
            {% endif %}
-            {% if form.invoiceText is defined %}
-                {{ form_row(form.invoiceText) }}
+            {% if form.teams is defined %}
+                <div class="row">
+                    <div class="col-12">
+                        {{ form_row(form.teams) }}
+                    </div>
+                </div>
            {% endif %}
            <div class="row">
                <div class="col-md-6">
@@ -57,11 +57,19 @@
                </div>
            </div>
            {% if form.metaFields is defined and form.metaFields is not empty %}
-                {% for meta in form.metaFields|sort((a, b) => a.vars.data.order <=> b.vars.data.order) %}
-                    {{ form_row(meta) }}
-                {% endfor %}
+                {{ form_row(form.metaFields) }}
            {% endif %}
-            {{ form_widget(form) }}
+            {% embed '@theme/embeds/card.html.twig' with {collapsed: true} %}
+                {% import "macros/widgets.html.twig" as widgets %}
+                {% block box_title %}{{ 'invoices'|trans }}{% endblock %}
+                {% block box_body_class %}{% endblock %}
+                {% block box_body %}
+                    {% if form.invoiceText is defined %}
+                        {{ form_row(form.invoiceText) }}
+                    {% endif %}
+                {% endblock %}
+            {% endembed %}
+            {{ form_rest(form) }}
        {% endblock %}
    {% endembed %}
 {% endblock %}
--- a/templates/activity/index.html.twig
+++ b/templates/activity/index.html.twig
@@ -1,96 +1,46 @@
-{% extends 'base.html.twig' %}
+{% extends 'datatable.html.twig' %}
 {% import "macros/widgets.html.twig" as widgets %}
-{% import "macros/datatables.html.twig" as tables %}
-{% import "macros/search.html.twig" as search %}
 {% import "activity/actions.html.twig" as actions %}

-{% set columns = {
-    'name': {'class': 'alwaysVisible'},
-    'project': {'class': 'hidden-xs'},
-    'comment': {'class': 'hidden-xs hidden-sm', 'title': 'label.description'|trans},
-} %}
-{% for field in metaColumns %}
-    {% set columns = columns|merge({
-        ('mf_' ~ field.name): {'title': field.label|trans, 'class': 'hidden-xs hidden-sm mf_' ~ field.name, 'orderBy': false}
-    }) %}
-{% endfor %}
-{% if is_granted('budget_money', 'activity') %}
-    {% set columns = columns|merge({
-        'budget': {'class': 'hidden-xs hidden-sm hidden text-right w-min', 'title': 'label.budget'|trans},
-    }) %}
-{% endif %}
-{% if is_granted('budget_time', 'activity') %}
-    {% set columns = columns|merge({
-        'timeBudget': {'class': 'hidden-xs hidden-sm hidden text-right w-min', 'title': 'label.timeBudget'|trans},
-    }) %}
-{% endif %}
-{% set columns = columns|merge({
-    'team': {'class': 'text-center w-min', 'orderBy': false},
-    'visible': {'class': 'text-center hidden w-min'},
-    'actions': {'class': 'actions alwaysVisible'},
-}) %}
+{% block datatable_row_attr %} {{ widgets.activity_row_attr(entry, now) }}{% endblock %}

-{% set tableName = 'activity_admin' %}
-
-{% block page_title %}{{ 'activities'|trans }}{% endblock %}
-{% block page_search %}{{ search.searchModal(toolbarForm) }}{% endblock %}
-{% block page_actions %}{{ actions.activities('index', query) }}{% endblock %}
-
-{% block main_before %}
-    {{ tables.data_table_column_modal(tableName, columns) }}
-{% endblock %}
-
-{% block main %}
-
-    {% if entries.count == 0 %}
-        {{ widgets.nothing_found('kimai.activityUpdate') }}
-    {% else %}
-        {{ tables.datatable_header(tableName, columns, query, {'reload': 'kimai.activityUpdate kimai.activityDelete kimai.activityTeamUpdate'}) }}
-
-        {% for entry in entries %}
-            <tr {{ widgets.activity_row_attr(entry, now) }}>
-                <td class="{{ tables.data_table_column_class(tableName, columns, 'name') }}">
-                    {{ widgets.label_name(entry.name, entry.color) }}
-                </td>
-                <td class="{{ tables.data_table_column_class(tableName, columns, 'project') }}">
-                    {# only none-global activities have a project and customer assigned #}
-                    {% if entry.project %}
-                        {{ widgets.label_project(entry.project) }}
-                        {% if entry.project.customer %}
-                            <br>
-                            <small>
-                                {{ widgets.label_customer(entry.project.customer) }}
-                            </small>
-                        {% endif %}
-                    {% endif %}
-                </td>
-                <td class="{{ tables.data_table_column_class(tableName, columns, 'comment') }}">{{ entry.comment|comment1line }}</td>
-                {% for field in metaColumns %}
-                    <td class="{{ tables.data_table_column_class(tableName, columns, 'mf_' ~ field.name) }}">
-                        {{ tables.datatable_meta_column(entry, field) }}
-                    </td>
-                {% endfor %}
-                <td class="{{ tables.data_table_column_class(tableName, columns, 'budget') }}">
-                    {% if entry.hasBudget() and is_granted('budget', entry) %}
-                        {{ entry.budget|money((entry.project is null ? defaultCurrency : entry.project.customer.currency)) }}
-                    {% else %}
-                        &ndash;
-                    {% endif %}
-                </td>
-                <td class="{{ tables.data_table_column_class(tableName, columns, 'timeBudget') }}">
-                    {% if entry.hasTimeBudget() and is_granted('time', entry) %}
-                        {{ entry.timeBudget|duration }}
-                    {% else %}
-                        &ndash;
-                    {% endif %}
-                </td>
-                <td class="{{ tables.data_table_column_class(tableName, columns, 'team') }}">{{ widgets.badge_team_access(entry.teams) }}</td>
-                <td class="{{ tables.data_table_column_class(tableName, columns, 'visible') }}">{{ widgets.label_visible(entry.visible) }}</td>
-                <td class="{{ tables.data_table_column_class(tableName, columns, 'actions') }}">{{ actions.activity(entry, 'index') }}</td>
-            </tr>
-        {% endfor %}
-
-        {{ tables.data_table_footer(entries, 'admin_activity_paginated') }}
+{% block datatable_column_value %}
+    {% if column == 'name' %}
+        {{ widgets.label_name(entry.name, entry.color|colorize(entry.name)) }}
+    {% elseif column == 'project' %}
+        {# only none-global activities have a project and customer assigned #}
+        {% if entry.project %}
+            {{ widgets.label_project(entry.project) }}
+            {% if entry.project.customer %}
+                <br>
+                <small>
+                    {{ widgets.label_customer(entry.project.customer) }}
+                </small>
+            {% endif %}
+        {% endif %}
+    {% elseif column == 'comment' %}
+        {{ entry.comment|comment1line }}
+    {% elseif column == 'budget' %}
+        {% if entry.hasBudget() and is_granted('budget', entry) %}
+            {{ entry.budget|money((entry.project is null ? defaultCurrency : entry.project.customer.currency)) }}
+        {% else %}
+            &ndash;
+        {% endif %}
+    {% elseif column == 'timeBudget' %}
+        {% if entry.hasTimeBudget() and is_granted('time', entry) %}
+            {{ entry.timeBudget|duration }}
+        {% else %}
+            &ndash;
+        {% endif %}
+    {% elseif column == 'billable' %}
+        {{ widgets.label_boolean(entry.billable) }}
+    {% elseif column == 'team' %}
+        {{ widgets.badge_team_access(entry.teams) }}
+    {% elseif column == 'visible' %}
+        {{ widgets.label_visible(entry.visible) }}
+    {% elseif column == 'actions' %}
+        {{ actions.activity(entry, 'index') }}
+    {% elseif column starts with 'mf_' %}
+        {{ widgets.meta_field_value(entry, data) }}
    {% endif %}
-
 {% endblock %}
--- a/templates/activity/permissions.html.twig
+++ b/templates/activity/permissions.html.twig
@@ -1,11 +1,7 @@
-{% extends app.request.xmlHttpRequest ? 'form.html.twig' : 'base.html.twig' %}
-{% import "activity/actions.html.twig" as actions %}
-
-{% block page_title %}{{ 'activities'|trans }}{% endblock %}
-{% block page_actions %}{{ actions.activity(activity, 'permissions') }}{% endblock %}
+{% extends kimai_context.modalRequest ? 'form.html.twig' : 'base.html.twig' %}

 {% block main %}
-    {{ include(app.request.xmlHttpRequest ? 'default/_form_modal.html.twig' : 'default/_form.html.twig', {
+    {{ include(kimai_context.modalRequest ? 'default/_form_modal.html.twig' : 'default/_form.html.twig', {
        'title': ('permissions'|trans({}, 'actions')) ~ ': ' ~ activity.name,
        'form': form,
        'back': path('activity_details', {'id': activity.id})
--- a/templates/activity/rates.html.twig
+++ b/templates/activity/rates.html.twig
@@ -1,11 +1,7 @@
-{% extends app.request.xmlHttpRequest ? 'form.html.twig' : 'base.html.twig' %}
-{% import "activity/actions.html.twig" as actions %}
-
-{% block page_title %}{{ 'activities'|trans }}{% endblock %}
-{% block page_actions %}{{ actions.activity(activity, 'rates') }}{% endblock %}
+{% extends kimai_context.modalRequest ? 'form.html.twig' : 'base.html.twig' %}

 {% block main %}
-    {{ include(app.request.xmlHttpRequest ? 'default/_form_modal.html.twig' : 'default/_form.html.twig', {
+    {{ include(kimai_context.modalRequest ? 'default/_form_modal.html.twig' : 'default/_form.html.twig', {
        'title': activity.name,
        'form': form,
        'back': path('admin_activity')