Various features and bug fixes

CHANGELOG.md

@@ -2,6 +2,22 @@
 
 ## [Unreleased]
 
+* [PR-31](https://github.com/ITK-Leantime/leantime-timetable/pull/31)
+  * Introduced fromDate and toDate, enabling setting (-x day and +x day) as params for relative dynamic urls.
+  * Introduced FlatPickr for date range selection
+  * Unlocked range of displayed days at one time
+  * Overhauled post handling
+  * Added ticket type to dropdown
+  * Fixed issue where tickets were not sorted correctly
+  * Worked on better displaying that the tickets are being synced on load
+  * Removed "add timelog" button
+  * Locked save button and show spinner on click
+  * Implemented overflow-scroll behaviour when selecting many days
+  * Redesigned modal to popup at clicked cell
+  * Implemented copy forward functionality
+  * Added option to overwrite already filled fields when copying forward
+  * Fixed issue when adding new todo
+
 ## [2.0.2] - 2024-10-24
 
 * [PR-29](https://github.com/ITK-Leantime/leantime-timetable/pull/29)

Controllers/Settings.php

@@ -2,7 +2,7 @@
 
 namespace Leantime\Plugins\TimeTable\Controllers;
 
-use Leantime\Core\Template;
+use Leantime\Core\UI\Template;
 use Leantime\Core\Controller\Controller;
 use Leantime\Core\Controller\Frontcontroller;
 use Symfony\Component\HttpFoundation\RedirectResponse;
@@ -20,6 +20,8 @@ class Settings extends Controller
     private SettingRepository $settingsRepo;
     protected Template $template;
 
+    private const DEFAULT_TICKET_EXPIRATION = 60;
+
     /**
      * constructor
      * @access public
@@ -41,7 +43,7 @@ public function init(SettingRepository $settingsRepo, Template $template): void
     public function get(): Response
     {
         try {
-            $ticketCacheExpiration = (int) ($this->settingsRepo->getSetting('itk-leantime-timetable.ticketCacheExpiration') ?: 120);
+            $ticketCacheExpiration = (int) ($this->settingsRepo->getSetting('itk-leantime-timetable.ticketCacheExpiration') ?: self::DEFAULT_TICKET_EXPIRATION);
             $this->template->assign('ticketCacheExpiration', $ticketCacheExpiration);
         } catch (\Exception $e) {
             $this->template->setNotification('An error occurred while saving the settings. ' . $e, 'error');
@@ -60,7 +62,7 @@ public function get(): Response
     public function post(array $params): RedirectResponse
     {
         try {
-            $this->settingsRepo->saveSetting('itk-leantime-timetable.ticketCacheExpiration', (int)($params['ticketCacheExpiration'] ?? 0));
+            $this->settingsRepo->saveSetting('itk-leantime-timetable.ticketCacheExpiration', (int)($params['ticketCacheExpiration'] ?? self::DEFAULT_TICKET_EXPIRATION));
             $this->template->setNotification('The settings were successfully saved.', 'success');
         } catch (\Exception $e) {
             $this->template->setNotification('An error occurred while saving the settings. ' . $e, 'error');

Controllers/TimeTable.php

@@ -3,17 +3,18 @@
 namespace Leantime\Plugins\TimeTable\Controllers;
 
 use Carbon\CarbonImmutable;
+use Illuminate\Support\Facades\Log;
 use Leantime\Core\Controller\Controller;
 use Leantime\Core\Controller\Frontcontroller;
-use mysql_xdevapi\Exception;
+use Leantime\Plugins\TimeTable\Helpers\TimeTableActionHandler;
 use Symfony\Component\HttpFoundation\Response;
 use Leantime\Plugins\TimeTable\Services\TimeTable as TimeTableService;
 use Leantime\Core\Language as LanguageCore;
 use Leantime\Domain\Auth\Models\Roles;
 use Leantime\Domain\Auth\Services\Auth as AuthService;
 use Leantime\Domain\Setting\Repositories\Setting as SettingRepository;
 use Leantime\Domain\Timesheets\Repositories\Timesheets as TimesheetRepository;
-use Leantime\Core\Template;
+use Leantime\Core\UI\Template;
 
 /**
  * TimeTable controller.
@@ -54,40 +55,22 @@ public function post(): Response
         if (!AuthService::userIsAtLeast(Roles::$editor)) {
             return $this->template->displayJson(['Error' => 'Not Authorized'], 403);
         }
-        $jsonPayload = json_decode(file_get_contents('php://input'), true);
-        if (isset($jsonPayload['action']) && $jsonPayload['action'] === 'delete') {
-            $timesheetId = $jsonPayload['timesheetId'];
-            if ($timesheetId) {
-                try {
-                    $this->timesheetRepository->deleteTime($timesheetId);
-                    exit(json_encode(['status' => 'success']));
-                } catch (Exception $e) {
-                    exit(json_encode(['status' => 'error', 'error' => $e->getMessage()]));
-                }
-            }
+        $redirectUrl = BASE_URL . '/TimeTable/TimeTable';
+        $actionHandler = new TimeTableActionHandler($this->timeTableService, $this->timesheetRepository);
+
+        if (isset($_POST['action'])) {
+            $redirectUrl = match ($_POST['action']) {
+                'adjustPeriod' => $actionHandler->adjustPeriod($_POST, $redirectUrl),
+                'saveTicket' => $actionHandler->saveTicket($_POST, $redirectUrl),
+                'deleteTicket' => tap(function () use ($actionHandler, $redirectUrl) {
+                    $actionHandler->deleteTicket($_POST, $redirectUrl);
+                }, fn() => $redirectUrl)(),
+                'copyEntryForward' => $actionHandler->copyEntryForward($_POST, $redirectUrl),
+                default => $redirectUrl,
+            };
         }
 
-        $timesheetId = isset($_POST['timesheet-id']) ? (int) $_POST['timesheet-id'] : 0;
-        $workDate = new CarbonImmutable($_POST['timesheet-date'], session('usersettings.timezone'));
-            $workDate = $workDate->setToDbTimezone();
-
-            $values = [
-                'timesheetId' => $_POST['timesheet-id'],
-                'userId' => session('userdata.id'),
-                'hours' => $_POST['timesheet-hours'],
-                'workDate' => $workDate,
-                'ticketId' => $_POST['timesheet-ticket-id'],
-                'description' => $_POST['timesheet-description'],
-                'kind' => 'GENERAL_BILLABLE',
-            ];
-            $this->timeTableService->updateOrAddTimelogOnTicket($values, $timesheetId);
-
-            $redirectUrl = BASE_URL . '/TimeTable/TimeTable';
-            if (isset($_GET['offset'])) {
-                $redirectUrl = $redirectUrl . '?offset=' . $_GET['offset'];
-            }
-
-            return Frontcontroller::redirect($redirectUrl);
+        return Frontcontroller::redirect($redirectUrl);
     }
 
     /**
@@ -99,41 +82,76 @@ public function post(): Response
      */
     public function get(): Response
     {
-        // Filters for the sql select
-        $userIdForFilter = null;
         $searchTermForFilter = null;
         $now = CarbonImmutable::now();
         $ticketCacheExpiration = $this->settings->getSetting('itk-leantime-timetable.ticketCacheExpiration') ?? 1200;
 
-        if (isset($_GET['searchTerm'])) {
-            $searchTerm = $_GET['searchTerm'];
-        }
+        try {
+            if (isset($_GET['fromDate']) && $_GET['fromDate'] !== '') {
+                if ($_GET['fromDate'][0] === '+' || $_GET['fromDate'][0] === '-') {
+                    // If relative date format
+                    $fromDate = CarbonImmutable::now()->startOfDay()->modify($_GET['fromDate']);
+                } else {
+                    // Try specific date format
+                    $fromDate = CarbonImmutable::createFromFormat('Y-m-d', $_GET['fromDate'])->startOfDay();
+                    if ($fromDate === false) {
+                        // If 'Y-m-d' format fails, try 'd/m/Y' format
+                        $fromDate = CarbonImmutable::createFromFormat('d/m/Y', $_GET['fromDate'])->startOfDay();
+                    }
+                }
+            } else {
+                // Default to start of current week
+                $fromDate = CarbonImmutable::now()->startOfWeek()->startOfDay();
+            }
 
-        if (isset($_GET['offset'])) {
-            // Multiply offset by 7 days.
-            if ((int) $_GET['offset'] > 0) {
-                $now = $now->addDays((int) $_GET['offset'] * 7);
+            if (isset($_GET['toDate']) && $_GET['toDate'] !== '') {
+                if ($_GET['toDate'][0] === '+' || $_GET['toDate'][0] === '-') {
+                    // If relative date format
+                    $toDate = CarbonImmutable::now()->startOfDay()->modify($_GET['toDate']);
+                } else {
+                    // Try specific date format
+                    $toDate = CarbonImmutable::createFromFormat('Y-m-d', $_GET['toDate'])->startOfDay();
+                    if ($toDate === false) {
+                        // If 'Y-m-d' format fails, try 'd/m/Y' format
+                        $toDate = CarbonImmutable::createFromFormat('d/m/Y', $_GET['toDate'])->startOfDay();
+                    }
+                }
             } else {
-                $now = $now->subDays(abs((int) $_GET['offset']) * 7);
+                // Default to end of current week
+                $toDate = CarbonImmutable::now()->endOfWeek()->startOfDay();
             }
-        }
-        if (isset($_GET['searchTerm']) && $_GET['searchTerm'] !== '') {
-            $searchTermForFilter = $_GET['searchTerm'];
+        } catch (\Exception $e) {
+            // Log error
+            Log::error($e);
+
+            // Assign fallback date span
+            $fromDate = CarbonImmutable::now()->startOfWeek()->startOfDay();
+            $toDate = CarbonImmutable::now()->endOfWeek()->startOfDay();
         }
 
-        $weekStartDateDb = $now->startOfWeek()->setToDbTimezone();
-        $weekEndDateDb = $now->endOfWeek()->setToDbTimezone();
-        $weekStartDateFrontend = $now->startOfWeek()->setToUserTimezone();
+        $weekStartDateDb = $fromDate->setToDbTimezone();
+        $weekEndDateDb = $toDate->setToDbTimezone();
 
         $this->template->assign('currentSearchTerm', $searchTermForFilter);
 
-        $days = explode(',', $this->language->__('language.dayNames'));
-        // Make the first day of week monday, by shifting sunday to the back of the array.
+        $days = explode(',', mb_strtolower($this->language->__('language.dayNames')));
         $days[] = array_shift($days);
+
         $weekDates = [];
-        foreach ($days as $key => $day) {
-            $weekDates[$key] = $weekStartDateFrontend->addDays($key);
+        $dateIterator = $fromDate->setToUserTimezone()->copy();
+
+        while ($dateIterator <= $toDate) {
+            $dayOfWeek = strtolower($dateIterator->locale(session('usersettings.language'))->dayName);
+
+            // If the day is a part of the week
+            if (in_array($dayOfWeek, $days)) {
+                $weekDates[$dateIterator->format('d-m-Y')] = $dateIterator->copy();
+            }
+
+            // Move on to the next day
+            $dateIterator = $dateIterator->addDay();
         }
+
         $relevantTicketIds = $this->timeTableService->getUniqueTicketIds($weekStartDateDb, $weekEndDateDb);
 
         $timesheetsByTicket = [];
@@ -146,26 +164,26 @@ public function get(): Response
             $timesheetsSortedByWeekdate = [];
             foreach ($weekDates as $weekDate) {
                 $timesheetsByTicketAndDate = $this->timeTableService->getTimesheetByTicketIdAndWorkDate($ticket['ticketId'], $weekDate->setToDbTimezone(), $searchTermForFilter);
-
                 $timesheetsSortedByWeekdate[$weekDate->format('Y-m-d')] = $timesheetsByTicketAndDate;
                 if (count($timesheetsByTicketAndDate) > 0) {
                     $timesheetsSortedByWeekdate['ticketTitle'] = $timesheetsByTicketAndDate[0]['headline'];
                     $timesheetsSortedByWeekdate['ticketLink'] = '?showTicketModal=' . $timesheetsByTicketAndDate[0]['ticketId'] . '#/tickets/showTicket/' . $timesheetsByTicketAndDate[0]['ticketId'];
                     $timesheetsSortedByWeekdate['projectName'] = $timesheetsByTicketAndDate[0]['name'];
+                    $timesheetsSortedByWeekdate['ticketType'] = $timesheetsByTicketAndDate[0]['ticketType'];
                     $timesheetsSortedByWeekdate['ticketId'] = $timesheetsByTicketAndDate[0]['ticketId'];
                 }
             }
 
             $timesheetsByTicket[$ticket['ticketId']] = $timesheetsSortedByWeekdate;
         }
-        // All tickets assignet to the template
-        $this->template->assign('userId', session('userdata.id'));
+        // All tickets assigned to the template
         $this->template->assign('ticketIds', implode(',', $ticketIds));
         $this->template->assign('timesheetsByTicket', $timesheetsByTicket);
         $this->template->assign('weekDays', $days);
         $this->template->assign('weekDates', $weekDates);
         $this->template->assign('ticketCacheExpiration', $ticketCacheExpiration);
-
+        $this->template->assign('fromDate', $fromDate);
+        $this->template->assign('toDate', $toDate);
         return $this->template->display('TimeTable.timetable');
     }
 }