Release 2.34 (#5465)
* fix timing issue in timesheet edit form with deactivated rounding * bump packages * only show update messages for newer plugin versions * replace deprecated method * remove internal from API * remove technical terms from translation * prevent calls to internal symfony methods * helper method to flag entry as modified * support meta-fields in weekly-hourse view * fix running timesheets were deleted in weekly-hourse
This commit is contained in:
@@ -35,6 +35,10 @@
|
||||
{{ form_row(form.duration, {row_attr: {class: 'p-0'}}) }}
|
||||
{%- endblock %}
|
||||
|
||||
{% block _quick_entry_form_rows_entry_metaFields_entry_widget %}
|
||||
{{ form_row(form, {row_attr: {class: 'p-0'}}) }}
|
||||
{%- endblock %}
|
||||
|
||||
{% block quick_entry_week_row %}
|
||||
<tr{% with {attr: row_attr|merge({class: (row_attr.class|default('') ~ ' form-group qe-entry-week-row' ~ (not valid ? ' is-invalid'))|trim})} %}{{ block('attributes') }}{% endwith %}>
|
||||
<td>
|
||||
@@ -43,6 +47,11 @@
|
||||
<td>
|
||||
{{ form_row(form.activity, {row_attr: {class: 'p-0'}}) }}
|
||||
</td>
|
||||
{% for meta in form.metaFields|sort((a, b) => a.vars.data.order <=> b.vars.data.order) %}
|
||||
<td>
|
||||
{{ form_row(meta.value, {label: false}) }}
|
||||
</td>
|
||||
{% endfor %}
|
||||
{% for timesheet in form.timesheets %}
|
||||
<td class="text-center{% if timesheet.vars.data.begin is weekend %} weekend{% endif %}{% if timesheet.vars.data.begin is today %} today{% endif %}">
|
||||
{{ form_widget(timesheet) }}
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
</td>
|
||||
<td class="{{ tables.data_table_column_class(tableName, columns, 'description') }}">
|
||||
{{ plugin.metadata.description }}
|
||||
{% if bundles[plugin.id] is defined and bundles[plugin.id]['latest_release'] is defined and bundles[plugin.id]['latest_release'] != plugin.metadata.version %}
|
||||
{% if updates[plugin.id] is defined and updates[plugin.id] == true %}
|
||||
{{ widgets.alert('warning', 'update_available'|trans({'%version%': bundles[plugin.id]['latest_release']}, 'plugins')) }}
|
||||
{% endif %}
|
||||
</td>
|
||||
|
||||
@@ -28,6 +28,9 @@
|
||||
<tr>
|
||||
<th>{{ 'project'|trans }}</th>
|
||||
<th>{{ 'activity'|trans }}</th>
|
||||
{% for field in metaColumns|sort((a, b) => a.order <=> b.order) %}
|
||||
<th style="min-width: 70px">{{ field.label }}</th>
|
||||
{% endfor %}
|
||||
{% for id, week in days %}
|
||||
<th class="text-center{% if week.day is weekend %} weekend{% endif %}{% if week.day is today %} today{% endif %}">
|
||||
{{ week.day|date_weekday }}
|
||||
@@ -43,6 +46,9 @@
|
||||
<tr class="summary">
|
||||
<td>{{ 'stats.durationTotal'|trans }}</td>
|
||||
<td></td>
|
||||
{% for field in metaColumns %}
|
||||
<td></td>
|
||||
{% endfor %}
|
||||
{% for id, week in days %}
|
||||
<td class="text-center" id="qe-totals-day-{{ loop.index0 }}"></td>
|
||||
{% endfor %}
|
||||
|
||||
Reference in New Issue
Block a user