From db0e555eaea6cc54a536a14c7932aa9d654fa773 Mon Sep 17 00:00:00 2001 From: Kevin Papst Date: Wed, 7 Dec 2022 18:44:17 +0100 Subject: [PATCH] weekly timesheet uses automatic billable mode, auto responsiveness (#3679) --- src/Controller/QuickEntryController.php | 12 ++++++------ templates/quick-entry/index.html.twig | 9 ++++++++- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/Controller/QuickEntryController.php b/src/Controller/QuickEntryController.php index ac99280f..84ff6c0d 100644 --- a/src/Controller/QuickEntryController.php +++ b/src/Controller/QuickEntryController.php @@ -134,12 +134,12 @@ class QuickEntryController extends AbstractController foreach ($row['days'] as $dayId => $day) { if (!\array_key_exists('entry', $day)) { // fill all rows and columns to make sure we do not have missing records - $tmp = new Timesheet(); - $tmp->setUser($user); + $tmp = $this->timesheetService->createNewTimesheet($user); $tmp->setProject($row['project']); $tmp->setActivity($row['activity']); $tmp->setBegin(clone $day['day']); $tmp->getBegin()->setTime($defaultHour, $defaultMinute, 0, 0); + $this->timesheetService->prepareNewTimesheet($tmp); $model->addTimesheet($tmp); } else { $model->addTimesheet($day['entry']); @@ -151,10 +151,10 @@ class QuickEntryController extends AbstractController $empty = $formModel->createRow($user); $empty->markAsPrototype(); foreach ($week as $dayId => $day) { - $tmp = new Timesheet(); - $tmp->setUser($user); + $tmp = $this->timesheetService->createNewTimesheet($user); $tmp->setBegin(clone $day['day']); $tmp->getBegin()->setTime($defaultHour, $defaultMinute, 0, 0); + $this->timesheetService->prepareNewTimesheet($tmp); $empty->addTimesheet($tmp); } @@ -165,10 +165,10 @@ class QuickEntryController extends AbstractController for ($a = 0; $a < $newRows; $a++) { $model = $formModel->addRow($user); foreach ($week as $dayId => $day) { - $tmp = new Timesheet(); - $tmp->setUser($user); + $tmp = $this->timesheetService->createNewTimesheet($user); $tmp->setBegin(clone $day['day']); $tmp->getBegin()->setTime($defaultHour, $defaultMinute, 0, 0); + $this->timesheetService->prepareNewTimesheet($tmp); $model->addTimesheet($tmp); } } diff --git a/templates/quick-entry/index.html.twig b/templates/quick-entry/index.html.twig index 92df9313..d2ac36a4 100644 --- a/templates/quick-entry/index.html.twig +++ b/templates/quick-entry/index.html.twig @@ -16,7 +16,7 @@ {% block box_title %} {{ form_widget(form.date) }} {% endblock %} - {% block box_body_class %}no-padding table-responsive{% endblock %} + {% block box_body_class %}no-padding maybe-table-responsive{% endblock %} {% block box_footer %}