diff --git a/src/Controller/QuickEntryController.php b/src/Controller/QuickEntryController.php
index a31eb115..77845cd1 100644
--- a/src/Controller/QuickEntryController.php
+++ b/src/Controller/QuickEntryController.php
@@ -25,7 +25,7 @@ use Symfony\Component\Routing\Annotation\Route;
* Controller used to enter times in weekly form.
*
* @Route(path="/quick_entry")
- * @Security("is_granted('view_own_timesheet')")
+ * @Security("is_granted('edit_own_timesheet')")
*/
class QuickEntryController extends AbstractController
{
@@ -42,7 +42,6 @@ class QuickEntryController extends AbstractController
/**
* @Route(path="/{begin}", name="quick_entry", methods={"GET", "POST"})
- * @Security("is_granted('edit_own_timesheet')")
*/
public function quickEntry(Request $request, ?string $begin = null)
{
diff --git a/src/EventSubscriber/Actions/ProjectSubscriber.php b/src/EventSubscriber/Actions/ProjectSubscriber.php
index 6ed66c79..ccabf0ef 100644
--- a/src/EventSubscriber/Actions/ProjectSubscriber.php
+++ b/src/EventSubscriber/Actions/ProjectSubscriber.php
@@ -68,13 +68,13 @@ class ProjectSubscriber extends AbstractActionsSubscriber
'class' => 'modal-ajax-form'
]);
}
+ }
- if ($this->isGranted('edit', $project)) {
- $event->addAction(
- 'copy',
- ['url' => $this->path('admin_project_duplicate', ['id' => $project->getId()])]
- );
- }
+ if ($this->isGranted('edit', $project) && $this->isGranted('create_project')) {
+ $event->addAction(
+ 'copy',
+ ['url' => $this->path('admin_project_duplicate', ['id' => $project->getId()])]
+ );
}
if (($event->isIndexView() || $event->isView('customer_details')) && $this->isGranted('delete', $project)) {
diff --git a/src/EventSubscriber/Actions/QuickEntrySubscriber.php b/src/EventSubscriber/Actions/QuickEntrySubscriber.php
index c00876b7..83cd1740 100644
--- a/src/EventSubscriber/Actions/QuickEntrySubscriber.php
+++ b/src/EventSubscriber/Actions/QuickEntrySubscriber.php
@@ -20,10 +20,6 @@ class QuickEntrySubscriber extends AbstractActionsSubscriber
public function onActions(PageActionsEvent $event): void
{
- if ($this->isGranted('view_own_timesheet')) {
- $event->addBack($this->path('timesheet'));
- }
-
$event->addHelp($this->documentationLink('weekly-times.html'));
}
}
diff --git a/src/EventSubscriber/Actions/TimesheetsSubscriber.php b/src/EventSubscriber/Actions/TimesheetsSubscriber.php
index e97442fa..b71a539b 100644
--- a/src/EventSubscriber/Actions/TimesheetsSubscriber.php
+++ b/src/EventSubscriber/Actions/TimesheetsSubscriber.php
@@ -35,7 +35,6 @@ class TimesheetsSubscriber extends AbstractActionsSubscriber
if ($this->isGranted('create_own_timesheet')) {
$event->addCreate($this->path('timesheet_create'));
- $event->addAction('quick_entry', ['url' => $this->path('quick_entry'), 'class' => 'create-ts', 'icon' => 'weekly-times']);
}
$event->addHelp($this->documentationLink('timesheet.html'));
diff --git a/src/EventSubscriber/MenuSubscriber.php b/src/EventSubscriber/MenuSubscriber.php
index 449e99a8..039bfb4d 100644
--- a/src/EventSubscriber/MenuSubscriber.php
+++ b/src/EventSubscriber/MenuSubscriber.php
@@ -10,6 +10,7 @@
namespace App\EventSubscriber;
use App\Event\ConfigureMainMenuEvent;
+use App\Timesheet\TrackingModeService;
use App\Twig\IconExtension;
use App\Utils\MenuItemModel;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
@@ -21,10 +22,12 @@ use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
final class MenuSubscriber implements EventSubscriberInterface
{
private $security;
+ private $trackingModeService;
- public function __construct(AuthorizationCheckerInterface $security)
+ public function __construct(AuthorizationCheckerInterface $security, TrackingModeService $trackingModeService)
{
$this->security = $security;
+ $this->trackingModeService = $trackingModeService;
}
public static function getSubscribedEvents(): array
@@ -49,9 +52,18 @@ final class MenuSubscriber implements EventSubscriberInterface
if ($auth->isGranted('view_own_timesheet')) {
$timesheets = new MenuItemModel('timesheet', 'menu.timesheet', 'timesheet', [], $icons->icon('timesheet'));
- $timesheets->setChildRoutes(['timesheet_export', 'timesheet_edit', 'timesheet_create', 'timesheet_multi_update', 'quick_entry']);
+ $timesheets->setChildRoutes(['timesheet_export', 'timesheet_edit', 'timesheet_create', 'timesheet_multi_update']);
$menu->addItem($timesheets);
+ if ($auth->isGranted('edit_own_timesheet')) {
+ $mode = $this->trackingModeService->getActiveMode();
+ if ($mode->canEditDuration() || $mode->canEditEnd()) {
+ $menu->addItem(
+ new MenuItemModel('quick_entry', 'quick_entry.title', 'quick_entry', [], $icons->icon('weekly-times'))
+ );
+ }
+ }
+
$menu->addItem(
new MenuItemModel('calendar', 'calendar.title', 'calendar', [], $icons->icon('calendar'))
);
diff --git a/src/Twig/LocaleFormatExtensions.php b/src/Twig/LocaleFormatExtensions.php
index 06759d27..a932d23a 100644
--- a/src/Twig/LocaleFormatExtensions.php
+++ b/src/Twig/LocaleFormatExtensions.php
@@ -56,6 +56,7 @@ final class LocaleFormatExtensions extends AbstractExtension
new TwigFilter('date_time', [$this, 'dateTime']),
new TwigFilter('date_full', [$this, 'dateTimeFull']),
new TwigFilter('date_format', [$this, 'dateFormat']),
+ new TwigFilter('date_weekday', [$this, 'dateWeekday']),
new TwigFilter('time', [$this, 'time']),
new TwigFilter('hour24', [$this, 'hour24']),
new TwigFilter('duration', [$this, 'duration']),
@@ -188,6 +189,11 @@ final class LocaleFormatExtensions extends AbstractExtension
return $this->getFormatter()->dateFormat($date, $format);
}
+ public function dateWeekday(DateTime $date): string
+ {
+ return $this->dayName($date, true) . ', ' . $this->getFormatter()->dateFormat($date, 'd');
+ }
+
/**
* @param DateTime|string $date
* @return string
diff --git a/templates/form/kimai-theme.html.twig b/templates/form/kimai-theme.html.twig
index 0c03181e..0a454627 100644
--- a/templates/form/kimai-theme.html.twig
+++ b/templates/form/kimai-theme.html.twig
@@ -156,7 +156,13 @@
- {{ 'stats.workingTimeWeek'|trans({'%week%': week|date_format('W')}) }}
+
+ {{ week|month_name(true) }}
+ {% if week|date_format('m') != nextWeek|date_format('m') %}
+ –
+ {{ nextWeek|month_name(true) }}
+ {% endif %}
+
diff --git a/templates/quick-entry/index.html.twig b/templates/quick-entry/index.html.twig
index 4417898b..231a638d 100644
--- a/templates/quick-entry/index.html.twig
+++ b/templates/quick-entry/index.html.twig
@@ -29,8 +29,7 @@
| {{ 'label.activity'|trans }} |
{% for id, week in days %}
- {{ week.day|day_name(true) }}
- {{ week.day|format_date('short') }}
+ {{ week.day|date_weekday }}
|
{% endfor %}
{{ 'label.duration'|trans }} |
diff --git a/templates/reporting/report_by_user.html.twig b/templates/reporting/report_by_user.html.twig
index ece4c086..0fadb6c8 100644
--- a/templates/reporting/report_by_user.html.twig
+++ b/templates/reporting/report_by_user.html.twig
@@ -31,8 +31,7 @@
|
{% for day in days.dateTimes %}
- {{ day|day_name(true) }}
- {{ day|format_date('short') }}
+ {{ day|date_weekday }}
|
{% set columns = columns + 1 %}
{% set totals = totals|merge({(day|report_date): 0}) %}
diff --git a/templates/reporting/report_user_list.html.twig b/templates/reporting/report_user_list.html.twig
index 9cfe6972..baffb75a 100644
--- a/templates/reporting/report_user_list.html.twig
+++ b/templates/reporting/report_user_list.html.twig
@@ -29,8 +29,7 @@
|
{% for day in stats.0.getDateTimes() %}
- {{ day|day_name(true) }}
- {{ day|format_date('short') }}
+ {{ day|date_weekday }}
|
{% set totals = totals|merge({(day|report_date): 0}) %}
{% endfor %}
diff --git a/tests/Controller/QuickEntryControllerTest.php b/tests/Controller/QuickEntryControllerTest.php
index 1c6fdf38..25b8596f 100644
--- a/tests/Controller/QuickEntryControllerTest.php
+++ b/tests/Controller/QuickEntryControllerTest.php
@@ -52,7 +52,6 @@ class QuickEntryControllerTest extends ControllerBaseTest
self::assertCount(10, $columns);
$this->assertPageActions($client, [
- 'back' => $this->createUrl('/timesheet/'),
'help' => 'https://www.kimai.org/documentation/weekly-times.html'
]);
}
@@ -95,7 +94,6 @@ class QuickEntryControllerTest extends ControllerBaseTest
self::assertCount(10, $columns);
$this->assertPageActions($client, [
- 'back' => $this->createUrl('/timesheet/'),
'help' => 'https://www.kimai.org/documentation/weekly-times.html'
]);
}
diff --git a/tests/Controller/TimesheetControllerTest.php b/tests/Controller/TimesheetControllerTest.php
index f8f13836..2dede1e8 100644
--- a/tests/Controller/TimesheetControllerTest.php
+++ b/tests/Controller/TimesheetControllerTest.php
@@ -44,7 +44,6 @@ class TimesheetControllerTest extends ControllerBaseTest
'visibility' => '#',
'download toolbar-action modal-ajax-form' => $this->createUrl('/timesheet/export/'),
'create modal-ajax-form' => $this->createUrl('/timesheet/create'),
- 'quick_entry create-ts' => $this->createUrl('/quick_entry'),
'help' => 'https://www.kimai.org/documentation/timesheet.html'
]);
}
diff --git a/tests/Twig/LocaleFormatExtensionsTest.php b/tests/Twig/LocaleFormatExtensionsTest.php
index b560ee93..c87bc36a 100644
--- a/tests/Twig/LocaleFormatExtensionsTest.php
+++ b/tests/Twig/LocaleFormatExtensionsTest.php
@@ -52,7 +52,7 @@ class LocaleFormatExtensionsTest extends TestCase
public function testGetFilters()
{
$filters = [
- 'month_name', 'day_name', 'date_short', 'date_time', 'date_full', 'date_format', 'time', 'hour24',
+ 'month_name', 'day_name', 'date_short', 'date_time', 'date_full', 'date_format', 'date_weekday', 'time', 'hour24',
'duration', 'chart_duration', 'duration_decimal', 'money', 'currency', 'country', 'language', 'amount'
];
$i = 0;
diff --git a/translations/messages.de.xlf b/translations/messages.de.xlf
index 9d791df1..aa9b6f78 100644
--- a/translations/messages.de.xlf
+++ b/translations/messages.de.xlf
@@ -1265,7 +1265,7 @@
-->
quick_entry.title
- Wöchentliche Arbeitsstunden
+ Wochen-Arbeitsstunden