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

fix weekly view day format (#2893)

Browse Source 
* make duplicate project action available on details page
* move "weekly hours" form to main menu
* changed label of week chooser
* hide quick entries menu for punch mode users
This commit is contained in:
Kevin Papst
2021-11-01 20:23:17 +01:00
committed by GitHub
parent 1d32e4ecee
commit 36c08b0dea
14 changed files with 39 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
templates/form/kimai-theme.html.twig
View File

@@ -156,7 +156,13 @@
<i class="{{ 'left'|icon }}"></i>
</a>
<a class="btn btn-default" href="#" onclick="return false;">
<span id="{{ form.vars.id }}_week_number">{{ 'stats.workingTimeWeek'|trans({'%week%': week|date_format('W')}) }}</span>
<span id="{{ form.vars.id }}_week_number" data-toggle="tooltip" data-placement="top" title="{{ 'stats.workingTimeWeek'|trans({'%week%': week|date_format('W')}) }}">
{{ week|month_name(true) }}
{% if week|date_format('m') != nextWeek|date_format('m') %}
&ndash;
{{ nextWeek|month_name(true) }}
{% endif %}
</span>
</a>
<a class="btn btn-default btn-right" href="#" onclick="jQuery('#{{ form.vars.id }}').val('{{ nextWeek|report_date }}').change()" data-toggle="tooltip" data-placement="top" title="{{ 'stats.workingTimeWeek'|trans({'%week%': nextWeek|date_format('W')}) }}">
<i class="{{ 'right'|icon }}"></i>

3
templates/quick-entry/index.html.twig
View File

@@ -29,8 +29,7 @@
<th>{{ 'label.activity'|trans }}</th>
{% 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|day_name(true) }}<br>
{{ week.day|format_date('short') }}
{{ week.day|date_weekday }}
</th>
{% endfor %}
<th class="summary">{{ 'label.duration'|trans }}</th>

3
templates/reporting/report_by_user.html.twig
View File

@@ -31,8 +31,7 @@
<th>&nbsp;</th>
{% for day in days.dateTimes %}
<th class="text-center text-nowrap{% if day is weekend %} weekend{% endif %}{% if day is today %} today{% endif %}">
{{ day|day_name(true) }}<br>
{{ day|format_date('short') }}
{{ day|date_weekday }}
</th>
{% set columns = columns + 1 %}
{% set totals = totals|merge({(day|report_date): 0}) %}

3
templates/reporting/report_user_list.html.twig
View File

@@ -29,8 +29,7 @@
<th>&nbsp;</th>
{% for day in stats.0.getDateTimes() %}
<th class="text-center text-nowrap{% if day is weekend %} weekend{% endif %}{% if day is today %} today{% endif %}">
{{ day|day_name(true) }}<br>
{{ day|format_date('short') }}
{{ day|date_weekday }}
</th>
{% set totals = totals|merge({(day|report_date): 0}) %}
{% endfor %}