jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Weekly hours improvements (#4631)

Browse Source 
* fix table padding
* reduced minimum quick-entry recent activity row amount
* use activity favorites in weekly hours
This commit is contained in:
Kevin Papst
2024-02-12 14:20:17 +01:00
committed by GitHub
parent 85a16a9363
commit 58cbf1776f
5 changed files with 52 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
templates/form/blocks.html.twig
View File

@@ -31,13 +31,17 @@
{%- endif -%}
{%- endblock choice_widget_expanded %}
{% block _quick_entry_form_rows_entry_timesheets_entry_widget %}
{{ form_row(form.duration, {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>
{{ form_row(form.project) }}
{{ form_row(form.project, {row_attr: {class: 'p-0'}}) }}
</td>
<td>
{{ form_row(form.activity) }}
{{ form_row(form.activity, {row_attr: {class: 'p-0'}}) }}
</td>
{% 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 %}">
@@ -189,7 +193,7 @@
<div class="duration-widget">
{% if (form.vars.duration_presets is defined and form.vars.duration_presets is not empty) and (form.vars.disabled is same as (false)) %}
<div class="input-group input-group-flat">
{% if form.vars.icon is not null %}
{% if form.vars.icon is defined and form.vars.icon is not null %}
<span class="input-group-text">
{{ icon(form.vars.icon) }}
</span>
@@ -216,7 +220,7 @@
</div>
</div>
{% else %}
{% if icon is not empty %}
{% if icon is defined and icon is not empty %}
<div class="input-group input-group-flat">
<span class="input-group-text">
<i class="{{ icon|icon(false, icon) }}"></i>