timesheet controller refactoring (#796)

templates/invoice/index.html.twig

@@ -79,28 +79,12 @@
         {% if is_granted('create_invoice') %}
             <div class="row no-print">
                 <div class="col-xs-12">
-                    <button type="button" id="print-invoice-button" class="btn btn-success pull-right">
+                    <a href="{{ path('invoice_print') }}" class="btn btn-success pull-right toolbar-action">
                         <i class="{{ 'print'|icon }}"></i> {{ 'button.print'|trans }}
-                    </button>
+                    </a>
                 </div>
             </div>
         {% endif %}
     {% endif %}
 
 {% endblock %}
-
-{% block javascripts %}
-    {{ parent() }}
-    {% if is_granted('create_invoice') %}
-    <script type="text/javascript">
-        document.addEventListener('kimai.initialized', function() {
-            $("body").on('click', '#print-invoice-button', function() {
-                var prevAction = $( "#invoice-print-form" ).attr('action');
-                $( "#invoice-print-form" ).attr('target', '_blank').attr('action', '{{ path('invoice_print') }}');
-                $( "#invoice-print-form" ).submit();
-                $( "#invoice-print-form" ).removeAttr('target').attr('action', prevAction);
-            });
-        });
-    </script>
-    {% endif %}
-{% endblock %}

templates/macros/actions.html.twig

@@ -208,7 +208,7 @@
 
     {% set actions = {'filter': '#collapseTimesheet'} %}
     {% if is_granted('export_own_timesheet') %}
-        {% set actions = actions|merge({'download': {'onclick': 'return exportTimesheet()'}}) %}
+        {% set actions = actions|merge({'download': {'url': path('timesheet_export'), 'class': 'toolbar-action'}}) %}
     {% endif %}
     {% set actions = actions|merge({'visibility': '#modal_timesheet'}) %}
     {% if is_granted('create_own_timesheet') %}
@@ -264,7 +264,7 @@
 
     {% set actions = {'filter': '#collapseTimesheetAdmin'} %}
     {% if is_granted('export_own_timesheet') %}
-        {% set actions = actions|merge({'download': 'onclick:return exportTimesheet()'}) %}
+        {% set actions = actions|merge({'download': {'url': path('admin_timesheet_export'), 'class': 'toolbar-action'}}) %}
     {% endif %}
     {% set actions = actions|merge({'visibility': '#modal_timesheet_admin'}) %}
     {% if is_granted('create_other_timesheet') %}

templates/timesheet-team/export.html.twig

@@ -42,7 +42,7 @@
                 {% for entry in entries %}
                     {% set timeWorked = timeWorked + entry.duration %}
                     <tr>
-                        <td>{{ entry.begin|date_short }}</td>
+                        <td class="text-nowrap">{{ entry.begin|date_short }}</td>
                         {% if query.user is empty %}
                             <td>{{ widgets.username(entry.user) }}</td>
                         {% endif %}
@@ -58,7 +58,7 @@
                                 {{ 'label.customer'|trans }}: {{ entry.project.customer.name }}
                             </span>
                         </td>
-                        <td>{{ entry.duration|duration }}</td>
+                        <td class="text-nowrap">{{ entry.duration|duration }}</td>
                     </tr>
                 {% endfor %}
                 </tbody>

templates/timesheet-team/index.html.twig

@@ -4,13 +4,17 @@
 {% import "macros/toolbar.html.twig" as toolbar %}
 {% import "macros/actions.html.twig" as actions %}
 
+{% set tableName = 'timesheet_admin' %}
 {% set duration_only = is_duration_only() %}
 {% set columns = {
     'date': 'alwaysVisible',
 } %}
 
 {% if not duration_only %}
-    {% set columns = columns|merge({'starttime': 'hidden-xs', 'endtime': 'hidden-xs'}) %}
+    {% set columns = columns|merge({
+        'starttime': 'hidden-xs',
+        'endtime': 'hidden-xs'
+    }) %}
 {% endif %}
 
 {% set columns = columns|merge({
@@ -25,8 +29,6 @@
     'actions': 'actions alwaysVisible',
 }) %}
 
-{% set tableName = 'timesheet_admin' %}
-
 {% block page_title %}{{ 'admin_timesheet.title'|trans }}{% endblock %}
 {% block page_subtitle %}{{ 'admin_timesheet.subtitle'|trans }}{% endblock %}
 {% block page_actions %}{{ actions.timesheets_team('index') }}{% endblock %}
@@ -49,21 +51,23 @@
 
                 {% if not duration_only %}
                     <td class="text-nowrap {{ tables.data_table_column_class(tableName, columns, 'starttime') }}">{{ entry.begin|time }}</td>
+                    <td class="text-nowrap {{ tables.data_table_column_class(tableName, columns, 'endtime') }}">
+                        {% if entry.end %}
+                            {{ entry.end|time }}
+                        {% else %}
+                            &dash;
+                        {% endif %}
+                    </td>
                 {% endif %}
 
                 {% if entry.end %}
-                    {% if not duration_only %}
-                        <td class="text-nowrap {{ tables.data_table_column_class(tableName, columns, 'endtime') }}">{{ entry.end|time }}</td>
-                    {% endif %}
                     <td class="text-nowrap {{ tables.data_table_column_class(tableName, columns, 'duration') }}">{{ entry.duration|duration }}</td>
                 {% else %}
-                    {% if not duration_only %}
-                        <td class="text-nowrap {{ tables.data_table_column_class(tableName, columns, 'endtime') }}">&dash;</td>
-                    {% endif %}
                     <td class="text-nowrap {{ tables.data_table_column_class(tableName, columns, 'duration') }}">
                         <i data-since="{{ entry.begin.format(constant('DATE_ISO8601')) }}" data-format="{{ get_format_duration() }}">{{ entry|duration }}</i>
                     </td>
                 {% endif %}
+
                 <td class="text-nowrap {{ tables.data_table_column_class(tableName, columns, 'rate') }}">
                     {% if not entry.end or not is_granted('view_rate', entry) %}
                         &dash;
@@ -86,7 +90,7 @@
                 <td class="{{ tables.data_table_column_class(tableName, columns, 'description') }}">{{ entry.description|nl2br }}</td>
                 <td class="{{ tables.data_table_column_class(tableName, columns, 'tags') }}">{{ widgets.tag_list(entry.tags) }}</td>
                 <td class="actions">
-                    {{ actions.timesheet_team(entry, 'index') }}
+                    {{- actions.timesheet_team(entry, 'index') -}}
                 </td>
             </tr>
         {% endfor %}
@@ -95,17 +99,3 @@
     {% endif %}
 
 {% endblock %}
-
-{% block javascripts %}
-    {{ parent() }}
-    <script type="text/javascript">
-        function exportTimesheet() {
-            var form = $("div.toolbar form.navbar-form");
-            var prevAction = form.attr('action');
-            form.attr('target', '_blank').attr('action', '{{ path('admin_timesheet_export') }}');
-            form.submit();
-            form.removeAttr('target').attr('action', prevAction);
-            return false;
-        }
-    </script>
-{% endblock %}

templates/timesheet/export.html.twig

@@ -37,7 +37,7 @@
                 {% for entry in entries %}
                     {% set timeWorked = timeWorked + entry.duration %}
                     <tr>
-                        <td>{{ entry.begin|date_short }}</td>
+                        <td class="text-nowrap">{{ entry.begin|date_short }}</td>
                         <td>
                             {% if entry.description is not empty %}
                             <div>
@@ -50,7 +50,7 @@
                                 {{ 'label.customer'|trans }}: {{ entry.project.customer.name }}
                             </span>
                         </td>
-                        <td>{{ entry.duration|duration }}</td>
+                        <td class="text-nowrap">{{ entry.duration|duration }}</td>
                     </tr>
                 {% endfor %}
                 </tbody>

templates/timesheet/index.html.twig

@@ -11,6 +11,7 @@
 {% set columns = {
     'date': 'alwaysVisible',
 } %}
+
 {% if not duration_only %}
     {% set columns = columns|merge({
         'starttime': '',
@@ -40,6 +41,7 @@
 {% endblock %}
 
 {% block main %}
+
     {% if entries.count == 0 %}
         {{ widgets.callout('warning', 'error.no_entries_found') }}
     {% else %}
@@ -64,26 +66,31 @@
 
                 {% if not duration_only %}
                     <td class="text-nowrap {{ tables.data_table_column_class(tableName, columns, 'starttime') }}">{{ entry.begin|time }}</td>
+                    <td class="text-nowrap {{ tables.data_table_column_class(tableName, columns, 'endtime') }}">
+                        {% if entry.end %}
+                            {{ entry.end|time }}
+                        {% else %}
+                            &dash;
+                        {% endif %}
+                    </td>
                 {% endif %}
 
                 {% if entry.end %}
-                    {% if not duration_only %}
-                        <td class="text-nowrap {{ tables.data_table_column_class(tableName, columns, 'endtime') }}">{{ entry.end|time }}</td>
-                    {% endif %}
                     <td class="text-nowrap {{ tables.data_table_column_class(tableName, columns, 'duration') }}">{{ entry.duration|duration }}</td>
-                    {% if canSeeRate %}
-                        <td class="text-nowrap {{ tables.data_table_column_class(tableName, columns, 'rate') }}">{{ entry.rate|money(entry.project.customer.currency) }}</td>
-                    {% endif %}
                 {% else %}
-                    {% if not duration_only %}
-                        <td class="text-nowrap {{ tables.data_table_column_class(tableName, columns, 'endtime') }}">&dash;</td>
-                    {% endif %}
                     <td class="text-nowrap {{ tables.data_table_column_class(tableName, columns, 'duration') }}">
                         <i data-since="{{ entry.begin.format(constant('DATE_ISO8601')) }}" data-format="{{ get_format_duration() }}">{{ entry|duration }}</i>
                     </td>
-                    {% if canSeeRate %}
-                        <td class="{{ tables.data_table_column_class(tableName, columns, 'rate') }}">&dash;</td>
+                {% endif %}
+
+                {% if canSeeRate %}
+                <td class="text-nowrap {{ tables.data_table_column_class(tableName, columns, 'rate') }}">
+                    {% if not entry.end %}
+                        &dash;
+                    {% else %}
+                        {{ entry.rate|money(entry.project.customer.currency) }}
                     {% endif %}
+                </td>
                 {% endif %}
 
                 <td class="{{ tables.data_table_column_class(tableName, columns, 'customer') }}">{{ widgets.label_customer(entry.project.customer) }}</td>
@@ -113,20 +120,6 @@
 
 {% endblock %}
 
-{% block javascripts %}
-    {{ parent() }}
-    <script type="text/javascript">
-        function exportTimesheet() {
-            var form = $("div.toolbar form.navbar-form");
-            var prevAction = form.attr('action');
-            form.attr('target', '_blank').attr('action', '{{ path('timesheet_export') }}');
-            form.submit();
-            form.removeAttr('target').attr('action', prevAction);
-            return false;
-        }
-    </script>
-{% endblock %}
-
 {% macro summary(day, duration, dayRates, columns, canSeeRate, duration_only, tableName) %}
     {% import "macros/datatables.html.twig" as tables %}
     <tr class="summary info">