From 70b5a47eefcfed680d7ac6beb1734d019f5562cb Mon Sep 17 00:00:00 2001
From: farukvukovic <104840615+farukvukovic@users.noreply.github.com>
Date: Thu, 5 Feb 2026 08:32:26 +0100
Subject: [PATCH 01/19] #5958 pinned ticket stayed pinned

---
 app/Domain/Tickets/Services/Tickets.php | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/app/Domain/Tickets/Services/Tickets.php b/app/Domain/Tickets/Services/Tickets.php
index 4dfe948a04..72a15c356f 100644
--- a/app/Domain/Tickets/Services/Tickets.php
+++ b/app/Domain/Tickets/Services/Tickets.php
@@ -1739,16 +1739,28 @@ public function addTicket($values): array|int|bool
      */
     public function updateTicket($values): array|bool
     {
-        if (! isset($values['headline'])) {
-            $currentTicket = $this->getTicket($values['id']);
+        $currentTicket = $this->getTicket($values['id']);
 
-            if (! $currentTicket) {
-                return ['msg' => 'This ticket id does not exist within your leantime account.', 'type' => 'error'];
-            }
+        if (! $currentTicket) {
+            return ['msg' => 'This ticket id does not exist within your leantime account.', 'type' => 'error'];
+        }
 
+        if (! isset($values['headline'])) {
             $values['headline'] = $currentTicket->headline;
         }
 
+        if (isset($values['status']) && session()->exists('currentProject')) {
+            $oldStatus = $currentTicket->status;
+            $newStatus = (int) $values['status'];
+
+            if ($oldStatus != $newStatus) {
+                $projectId = (int) session('currentProject');
+                if ($this->isTicketPinned($values['id'], $projectId)) {
+                    $this->unpinTicket($values['id'], $projectId);
+                }
+            }
+        }
+
         $values = [
             'id' => $values['id'],
             'headline' => $values['headline'] ?? '',

From ea179fe5355d0bd49684a3a5c0ac68f366a60c4d Mon Sep 17 00:00:00 2001
From: Haris Macic <haris.macic@pearshadow.com>
Date: Fri, 6 Feb 2026 12:21:03 +0100
Subject: [PATCH 02/19] #5841 Remove session deletion from dockerfile

---
 Dockerfile | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f818cf71aa..2ad398122e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -399,9 +399,6 @@ rm -rf /var/www/html/storage/framework/viewPaths.php || true
 find /var/www/html/storage/framework/cache -type f ! -name '.gitignore' -delete 2>/dev/null || true
 find /var/www/html/storage/framework/cache -type d -empty -delete 2>/dev/null || true
 
-find /var/www/html/storage/framework/sessions -type f ! -name '.gitignore' -delete 2>/dev/null || true
-find /var/www/html/storage/framework/sessions -type d -empty -delete 2>/dev/null || true
-
 find /var/www/html/storage/framework/views -type f ! -name '.gitignore' -delete 2>/dev/null || true
 find /var/www/html/storage/framework/views -type d -empty -delete 2>/dev/null || true
 

From 3a6261de7ef114fa8deb01912d4e70ef59e0c619 Mon Sep 17 00:00:00 2001
From: Haris Macic <haris.macic@pearshadow.com>
Date: Fri, 6 Feb 2026 16:36:21 +0100
Subject: [PATCH 03/19] #5612 Add listener to type change and write the change
 in the ticket history

---
 .../submodules/ticketDetails.sub.php          | 13 +++-
 .../Timesheets/Js/timesheetsController.js     | 63 ++++++++++---------
 2 files changed, 43 insertions(+), 33 deletions(-)

diff --git a/app/Domain/Tickets/Templates/submodules/ticketDetails.sub.php b/app/Domain/Tickets/Templates/submodules/ticketDetails.sub.php
index ae5f9f7e41..ffe510e619 100644
--- a/app/Domain/Tickets/Templates/submodules/ticketDetails.sub.php
+++ b/app/Domain/Tickets/Templates/submodules/ticketDetails.sub.php
@@ -307,7 +307,7 @@ function loadStatusHistory(ticketId) {
         });
     }
 
-   $('#status-select, #priority, #storypoints, #editorId, #deadline').on('change', function() {
+   $('#status-select, #priority, #storypoints, #editorId, #deadline, #type',).on('change', function() {
         var changedElementId = $(this).attr('id');
         const ticketId = $('#status-change-log').data('ticket-id');
         const oldStatusKey = $(this).data('old-status');
@@ -425,7 +425,16 @@ class="accordion-toggle"
                     <div class="form-group">
                         <label class="control-label"><?php echo $tpl->__('label.todo_type'); ?></label>
                         <div class="">
-                            <select id='type' name='type' class="span11">
+                            <select id='type' name='type' class="span11 autosave-field" 
+                                    data-old-status="<?php 
+                                        foreach ($ticketTypes as $types) {
+                                            if (strtolower($types) == strtolower($ticket->type ?? '')) {
+                                                echo $tpl->__('label.'.strtolower($types));
+                                                break;
+                                            }
+                                        }
+                                    ?>"
+                                    data-user="<?= htmlspecialchars($currentUserName) ?>">
                                 <?php foreach ($ticketTypes as $types) {
                                     echo "<option value='".strtolower($types)."' ";
                                     if (strtolower($types) == strtolower($ticket->type ?? '')) {
diff --git a/app/Domain/Timesheets/Js/timesheetsController.js b/app/Domain/Timesheets/Js/timesheetsController.js
index f066ce562e..d89fd27a26 100644
--- a/app/Domain/Timesheets/Js/timesheetsController.js
+++ b/app/Domain/Timesheets/Js/timesheetsController.js
@@ -5,27 +5,27 @@ leantime.timesheetsController = (function () {
         jQuery(document).ready(function () {
             var allTimesheets = jQuery("#allTimesheetsTable").DataTable({
                 "language": {
-                    "decimal":        leantime.i18n.__("datatables.decimal"),
-                    "emptyTable":     leantime.i18n.__("datatables.emptyTable"),
-                    "info":           leantime.i18n.__("datatables.info"),
-                    "infoEmpty":      leantime.i18n.__("datatables.infoEmpty"),
-                    "infoFiltered":   leantime.i18n.__("datatables.infoFiltered"),
-                    "infoPostFix":    leantime.i18n.__("datatables.infoPostFix"),
-                    "thousands":      leantime.i18n.__("datatables.thousands"),
-                    "lengthMenu":     leantime.i18n.__("datatables.lengthMenu"),
+                    "decimal": leantime.i18n.__("datatables.decimal"),
+                    "emptyTable": leantime.i18n.__("datatables.emptyTable"),
+                    "info": leantime.i18n.__("datatables.info"),
+                    "infoEmpty": leantime.i18n.__("datatables.infoEmpty"),
+                    "infoFiltered": leantime.i18n.__("datatables.infoFiltered"),
+                    "infoPostFix": leantime.i18n.__("datatables.infoPostFix"),
+                    "thousands": leantime.i18n.__("datatables.thousands"),
+                    "lengthMenu": leantime.i18n.__("datatables.lengthMenu"),
                     "loadingRecords": leantime.i18n.__("datatables.loadingRecords"),
-                    "processing":     leantime.i18n.__("datatables.processing"),
-                    "search":         leantime.i18n.__("datatables.search"),
-                    "zeroRecords":    leantime.i18n.__("datatables.zeroRecords"),
+                    "processing": leantime.i18n.__("datatables.processing"),
+                    "search": leantime.i18n.__("datatables.search"),
+                    "zeroRecords": leantime.i18n.__("datatables.zeroRecords"),
                     "paginate": {
-                        "first":      leantime.i18n.__("datatables.first"),
-                        "last":       leantime.i18n.__("datatables.last"),
-                        "next":       leantime.i18n.__("datatables.next"),
-                        "previous":   leantime.i18n.__("datatables.previous"),
+                        "first": leantime.i18n.__("datatables.first"),
+                        "last": leantime.i18n.__("datatables.last"),
+                        "next": leantime.i18n.__("datatables.next"),
+                        "previous": leantime.i18n.__("datatables.previous"),
                     },
                     "aria": {
-                        "sortAscending":  leantime.i18n.__("datatables.sortAscending"),
-                        "sortDescending":leantime.i18n.__("datatables.sortDescending"),
+                        "sortAscending": leantime.i18n.__("datatables.sortAscending"),
+                        "sortDescending": leantime.i18n.__("datatables.sortDescending"),
                     },
                     "buttons": {
                         colvis: leantime.i18n.__("datatables.buttons.colvis"),
@@ -43,7 +43,7 @@ leantime.timesheetsController = (function () {
                 // CUSTOM: Enable searching for modern search component
                 "searching": true,
                 "stateSave": true,
-                "displayLength":100,
+                "displayLength": 100,
 
             });
 
@@ -60,7 +60,7 @@ leantime.timesheetsController = (function () {
                                 orthogonal: 'export',
                                 columns: ':visible',
                                 format: {
-                                    body: function ( data, row, column, node ) {
+                                    body: function (data, row, column, node) {
                                         // Use the export formatter if available
                                         if (typeof window.leantime !== 'undefined' &&
                                             typeof window.leantime.timesheetsExport !== 'undefined' &&
@@ -69,7 +69,7 @@ leantime.timesheetsController = (function () {
                                         }
 
                                         // Fallback to original logic
-                                        if ( typeof jQuery(node).data('order') !== 'undefined') {
+                                        if (typeof jQuery(node).data('order') !== 'undefined') {
                                             data = jQuery(node).data('order');
                                         }
                                         return data;
@@ -99,7 +99,7 @@ leantime.timesheetsController = (function () {
                 }
             }
 
-            jQuery('#allTimesheetsTable').on('column-visibility.dt', function ( e, settings, column, state ) {
+            jQuery('#allTimesheetsTable').on('column-visibility.dt', function (e, settings, column, state) {
                 allTimesheets.draw(false);
             });
 
@@ -113,8 +113,8 @@ leantime.timesheetsController = (function () {
     var initEditTimeModal = function () {
         var canvasoptions = {
             sizes: {
-                minW:  700,
-                maxW:  1000,
+                minW: 700,
+                maxW: 1000,
                 minH: 1000,
             },
             resizable: false,
@@ -122,25 +122,26 @@ leantime.timesheetsController = (function () {
             callbacks: {
                 beforeShowCont: function () {
                     jQuery(".showDialogOnLoad").show();
+
                     if (closeModal === true) {
                         closeModal = false;
                         location.reload();
                     }
                 },
-                afterShowCont: function () {
-                    jQuery(".editTimeModal").nyroModal(canvasoptions);
-                },
                 beforeClose: function () {
                     location.reload();
                 }
             },
             titleFromIframe: true
-
         };
 
-        jQuery(".editTimeModal").nyroModal(canvasoptions);
+        jQuery(document).on('click', '.editTimeModal', function (e) {
+            e.preventDefault();
+            jQuery(this).nyroModal(canvasoptions);
+        });
     };
 
+
     /**
      * Format hours according to user preference
      */
@@ -204,8 +205,8 @@ leantime.timesheetsController = (function () {
 
     // Make public what you want to have public, everything else is private
     return {
-        initTimesheetsTable:initTimesheetsTable,
-        initEditTimeModal:initEditTimeModal,
-        formatHours:formatHours,
+        initTimesheetsTable: initTimesheetsTable,
+        initEditTimeModal: initEditTimeModal,
+        formatHours: formatHours,
     };
 })();

From 1921908922c331d6cdf92769474611f79cbbcb0c Mon Sep 17 00:00:00 2001
From: Haris Macic <haris.macic@pearshadow.com>
Date: Fri, 6 Feb 2026 16:55:22 +0100
Subject: [PATCH 04/19] #5612 Add listener to project, milestone, sprint,
 related to, so we can have it in changelog

---
 .../submodules/ticketDetails.sub.php          | 82 ++++++++++++++-----
 1 file changed, 61 insertions(+), 21 deletions(-)

diff --git a/app/Domain/Tickets/Templates/submodules/ticketDetails.sub.php b/app/Domain/Tickets/Templates/submodules/ticketDetails.sub.php
index ffe510e619..75149f4e4e 100644
--- a/app/Domain/Tickets/Templates/submodules/ticketDetails.sub.php
+++ b/app/Domain/Tickets/Templates/submodules/ticketDetails.sub.php
@@ -307,7 +307,7 @@ function loadStatusHistory(ticketId) {
         });
     }
 
-   $('#status-select, #priority, #storypoints, #editorId, #deadline, #type',).on('change', function() {
+   $('#status-select, #priority, #storypoints, #editorId, #deadline, #type, select[name="projectId"], #milestoneid, #sprint-select, #dependingTicketId').on('change', function() {
         var changedElementId = $(this).attr('id');
         const ticketId = $('#status-change-log').data('ticket-id');
         const oldStatusKey = $(this).data('old-status');
@@ -450,7 +450,16 @@ class="accordion-toggle"
                     <!-- Project -->
                     <div class="form-group">
                         <label class="control-label"><?= $tpl->__('label.project') ?></label>
-                        <select name="projectId" class="tw-w-full">
+                        <select name="projectId" id="projectId" class="tw-w-full autosave-field"
+                                data-old-status="<?php 
+                                    foreach ($allAssignedprojects as $project) {
+                                        if ($ticket->projectId == $project['id'] || (!$ticket->projectId && session('currentProject') == $project['id'])) {
+                                            echo $tpl->escape($project['name']);
+                                            break;
+                                        }
+                                    }
+                                ?>"
+                                data-user="<?= htmlspecialchars($currentUserName) ?>">
                             <?php foreach ($allAssignedprojects as $project) { ?>
                                 <option value="<?= $project['id'] ?>"
                                     <?php
@@ -470,9 +479,20 @@ class="accordion-toggle"
                         <label class="control-label"><?php echo $tpl->__('label.milestone'); ?></label>
                         <div class="">
                             <div class="form-group">
-                                <select  name="milestoneid"  class="span11" >
+                                <select name="milestoneid" id="milestoneid" class="span11 autosave-field"
+                                        data-old-status="<?php 
+                                            $milestoneName = 'Not assigned to milestone';
+                                            foreach ($tpl->get('milestones') as $milestoneRow) {
+                                                if ($ticket->milestoneid == $milestoneRow->id) {
+                                                    $milestoneName = $tpl->escape($milestoneRow->headline);
+                                                    break;
+                                                }
+                                            }
+                                            echo $milestoneName;
+                                        ?>"
+                                        data-user="<?= htmlspecialchars($currentUserName) ?>">
                                     <option value=""><?php echo $tpl->__('label.not_assigned_to_milestone'); ?></option>
-                                    <?php foreach ($tpl->get('milestones') as $milestoneRow) {     ?>
+                                    <?php foreach ($tpl->get('milestones') as $milestoneRow) { ?>
                                         <?php echo "<option value='".$milestoneRow->id."'";
 
                                         if (($ticket->milestoneid == $milestoneRow->id)) {
@@ -491,8 +511,20 @@ class="accordion-toggle"
                     <div class="form-group">
                         <label class="control-label"><?php echo $tpl->__('label.sprint'); ?></label>
                         <div class="">
-
-                            <select id="sprint-select" class="span11" name="sprint"
+                            <select id="sprint-select" class="span11 autosave-field" name="sprint"
+                                    data-old-status="<?php 
+                                        $sprintName = 'Backlog';
+                                        if ($tpl->get('sprints')) {
+                                            foreach ($tpl->get('sprints') as $sprintRow) {
+                                                if ($ticket->sprint == $sprintRow->id) {
+                                                    $sprintName = $tpl->escape($sprintRow->name);
+                                                    break;
+                                                }
+                                            }
+                                        }
+                                        echo $sprintName;
+                                    ?>"
+                                    data-user="<?= htmlspecialchars($currentUserName) ?>"
                                     data-placeholder="<?php echo $ticket->sprint ?>">
                                 <option value=""><?php echo $tpl->__('label.backlog'); ?></option>
                                 <?php
@@ -504,7 +536,7 @@ class="accordion-toggle"
                                             } ?>
                                         ><?php $tpl->e($sprintRow->name); ?></option>
                                     <?php }
-                                    } ?>
+                                } ?>
                             </select>
                         </div>
                     </div>
@@ -514,23 +546,31 @@ class="accordion-toggle"
                         <label class="control-label"><?php echo $tpl->__('label.related_to'); ?></label>
                         <div class="">
                             <div class="form-group">
-                                <select  name="dependingTicketId"  class="span11" >
+                                <select name="dependingTicketId" id="dependingTicketId" class="span11 autosave-field"
+                                        data-old-status="<?php 
+                                            $relatedName = 'Not related';
+                                            if (is_array($tpl->get('ticketParents'))) {
+                                                foreach ($tpl->get('ticketParents') as $ticketRow) {
+                                                    if ($ticket->dependingTicketId == $ticketRow->id) {
+                                                        $relatedName = $tpl->escape($ticketRow->headline);
+                                                        break;
+                                                    }
+                                                }
+                                            }
+                                            echo $relatedName;
+                                        ?>"
+                                        data-user="<?= htmlspecialchars($currentUserName) ?>">
                                     <option value=""><?php echo $tpl->__('label.not_related'); ?></option>
                                     <?php
                                     if (is_array($tpl->get('ticketParents'))) {
-                                        foreach ($tpl->get('ticketParents') as $ticketRow) {
-                                            ?>
-                                            <?php echo "<option value='".$ticketRow->id."'";
-
-                                            if (($ticket->dependingTicketId == $ticketRow->id)) {
-                                                echo " selected='selected' ";
-                                            }
-
-                                            echo '>'.$tpl->escape($ticketRow->headline).'</option>'; ?>
-
-                                            <?php
-                                        }
-                                    }?>
+                                        foreach ($tpl->get('ticketParents') as $ticketRow) { ?>
+                                            <option value="<?= $ticketRow->id ?>"
+                                                <?php if ($ticket->dependingTicketId == $ticketRow->id) {
+                                                    echo " selected='selected' ";
+                                                } ?>
+                                            ><?= $tpl->escape($ticketRow->headline) ?></option>
+                                        <?php }
+                                    } ?>
                                 </select>
                             </div>
                         </div>

From 44f930bce6185985e035f58d5d66196f18068833 Mon Sep 17 00:00:00 2001
From: Haris Macic <haris.macic@pearshadow.com>
Date: Fri, 6 Feb 2026 17:08:20 +0100
Subject: [PATCH 05/19] #5612 Add on change listener to work start, work end,
 planned hours and hours left

---
 .../Controllers/TicketHistoryController.php   | 12 ++++++
 .../submodules/ticketDetails.sub.php          | 40 +++++++++++++------
 2 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/app/Domain/Tickets/Controllers/TicketHistoryController.php b/app/Domain/Tickets/Controllers/TicketHistoryController.php
index 0f6f377000..6caacc8e07 100644
--- a/app/Domain/Tickets/Controllers/TicketHistoryController.php
+++ b/app/Domain/Tickets/Controllers/TicketHistoryController.php
@@ -101,6 +101,7 @@ public function getStatusChanges(): Response
                 $html = '<ul style="list-style: none; padding: 0; margin: 0;">';
                 foreach ($changes as $change) {
                     $detailsAttributeId = $change['detailsAttributeId'];
+                    
 
                     $attributeLabels = [
                         'priority' => 'Priority',
@@ -109,6 +110,17 @@ public function getStatusChanges(): Response
                         'deadline' => 'Due Date',
                         'dueTime' => 'Due Date Time',
                         'ticketDescription' => 'Description',
+                        'type' => 'Type',
+                        'projectId' => 'Project',
+                        'milestoneid' => 'Milestone',
+                        'sprint-select' => 'Sprint',
+                        'dependingTicketId' => 'Related To',
+                        'editFrom' => 'Work Start',
+                        'timeFrom' => 'Work Start Time',
+                        'editTo' => 'Work End',
+                        'timeTo' => 'Work End Time',
+                        'planHours' => 'Planned Hours',
+                        'hourRemaining' => 'Estimated Hours Remaining',
                     ];
 
                     $attributeLabel = $attributeLabels[$detailsAttributeId] ?? 'Status';
diff --git a/app/Domain/Tickets/Templates/submodules/ticketDetails.sub.php b/app/Domain/Tickets/Templates/submodules/ticketDetails.sub.php
index 75149f4e4e..b9a9acfb01 100644
--- a/app/Domain/Tickets/Templates/submodules/ticketDetails.sub.php
+++ b/app/Domain/Tickets/Templates/submodules/ticketDetails.sub.php
@@ -307,7 +307,7 @@ function loadStatusHistory(ticketId) {
         });
     }
 
-   $('#status-select, #priority, #storypoints, #editorId, #deadline, #type, select[name="projectId"], #milestoneid, #sprint-select, #dependingTicketId').on('change', function() {
+   $('#status-select, #priority, #storypoints, #editorId, #deadline, #type, select[name="projectId"], #milestoneid, #sprint-select, #dependingTicketId,  #editFrom, #editTo').on('change', function() {
         var changedElementId = $(this).attr('id');
         const ticketId = $('#status-change-log').data('ticket-id');
         const oldStatusKey = $(this).data('old-status');
@@ -339,7 +339,7 @@ function loadStatusHistory(ticketId) {
 
         $(this).data('old-status', newStatusKey);
     });
-    $('#dueTime').on('blur', function() {
+    $('#dueTime, #timeFrom, #timeTo, #planHours, #hourRemaining').on('blur', function() {
         var changedElementId = $(this).attr('id');
         const ticketId = $('#status-change-log').data('ticket-id');
         const oldStatusKey = $(this).data('old-status');
@@ -597,30 +597,46 @@ class="accordion-toggle"
                     <div class="form-group">
                         <label class=" control-label"><?php echo $tpl->__('label.working_date_from'); ?></label>
                         <div class="">
-                            <input type="text" class="editFrom" style="width:100px;" name="editFrom" autocomplete="off"
-                                   value="<?= format($ticket->editFrom)->date(); ?>" placeholder="<?= $tpl->__('language.dateformat') ?>"/>
-                            <input type="time" class="timepicker" style="width:120px;" id="timeFrom" autocomplete="off"
+                            <input type="text" class="editFrom autosave-field" style="width:100px;" name="editFrom" id="editFrom" autocomplete="off"
+                                   value="<?= format($ticket->editFrom)->date(); ?>" 
+                                   placeholder="<?= $tpl->__('language.dateformat') ?>"
+                                   data-old-status="<?= format($ticket->editFrom)->date(); ?>"
+                                   data-user="<?= htmlspecialchars($currentUserName) ?>"/>
+                            <input type="time" class="timepicker autosave-after-lost-focus" style="width:120px;" id="timeFrom" autocomplete="off"
                                    value="<?= format($ticket->editFrom)->time24(); ?>"
-                                   name="timeFrom"/>
+                                   name="timeFrom"
+                                   data-old-status="<?= format($ticket->editFrom)->time24(); ?>"
+                                   data-user="<?= htmlspecialchars($currentUserName) ?>"/>
                         </div>
                     </div>
 
                     <div class="form-group">
                         <label class=" control-label"><?php echo $tpl->__('label.working_date_to'); ?></label>
                         <div class="">
-                            <input type="text" class="editTo" style="width:100px;" name="editTo" autocomplete="off"
-                                   value="<?= format($ticket->editTo)->date() ?>" placeholder="<?= $tpl->__('language.dateformat') ?>"/>
-                            <input type="time" class="timepicker" style="width:120px;" id="timeTo" autocomplete="off"
+                            <input type="text" class="editTo autosave-field" style="width:100px;" name="editTo" id="editTo" autocomplete="off"
+                                   value="<?= format($ticket->editTo)->date() ?>" 
+                                   placeholder="<?= $tpl->__('language.dateformat') ?>"
+                                   data-old-status="<?= format($ticket->editTo)->date() ?>"
+                                   data-user="<?= htmlspecialchars($currentUserName) ?>"/>
+                            <input type="time" class="timepicker autosave-after-lost-focus" style="width:120px;" id="timeTo" autocomplete="off"
                                    value="<?= format($ticket->editTo)->time24() ?>"
-                                   name="timeTo"/>
+                                   name="timeTo"
+                                   data-old-status="<?= format($ticket->editTo)->time24() ?>"
+                                   data-user="<?= htmlspecialchars($currentUserName) ?>"/>
                         </div>
                     </div>
 
                     <div class="form-group">
                         <label class=" control-label"><?php echo $tpl->__('label.planned_hours'); ?> / <?php echo $tpl->__('label.estimated_hours_remaining'); ?></label>
                         <div class="">
-                            <input type="text" value="<?php $tpl->e($ticket->planHours); ?>" name="planHours" style="width:45px;"/>&nbsp;/&nbsp;
-                            <input type="text" value="<?php $tpl->e($ticket->hourRemaining); ?>" name="hourRemaining" style="width:45px;"/>
+                            <input type="text" value="<?php $tpl->e($ticket->planHours); ?>" name="planHours" id="planHours" style="width:45px;" 
+                                   class="autosave-after-lost-focus"
+                                   data-old-status="<?php $tpl->e($ticket->planHours); ?>"
+                                   data-user="<?= htmlspecialchars($currentUserName) ?>"/>&nbsp;/&nbsp;
+                            <input type="text" value="<?php $tpl->e($ticket->hourRemaining); ?>" name="hourRemaining" id="hourRemaining" style="width:45px;" 
+                                   class="autosave-after-lost-focus"
+                                   data-old-status="<?php $tpl->e($ticket->hourRemaining); ?>"
+                                   data-user="<?= htmlspecialchars($currentUserName) ?>"/>
                             <a href="javascript:void(0)" class="infoToolTip" data-placement="left" data-toggle="tooltip" data-tippy-content="<?php echo $tpl->__('tooltip.how_many_hours_remaining'); ?>">
                                 &nbsp;<i class="fa fa-question-circle"></i>&nbsp;
                             </a>

From 739b53c9df94173be1b74f3d5283f8013f6b7ab0 Mon Sep 17 00:00:00 2001
From: Haris Macic <haris.macic@pearshadow.com>
Date: Mon, 9 Feb 2026 10:15:13 +0100
Subject: [PATCH 06/19] #5612 Add statement to check whether old value is the
 same as the new one

---
 app/Domain/Tickets/Controllers/TicketHistoryController.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/Domain/Tickets/Controllers/TicketHistoryController.php b/app/Domain/Tickets/Controllers/TicketHistoryController.php
index 6caacc8e07..295151bb1b 100644
--- a/app/Domain/Tickets/Controllers/TicketHistoryController.php
+++ b/app/Domain/Tickets/Controllers/TicketHistoryController.php
@@ -48,6 +48,13 @@ public function logStatusChange(): JsonResponse
                 'error' => 'No ticket ID provided'
             ], 400);
         }
+        
+        if ($oldStatusText === $newStatusText) {
+        return new JsonResponse([
+            'success' => true,
+            'message' => 'No change detected'
+        ]);
+    }
 
         try {
             $insertId = $this->ticketHistoryModel->addStatusChange(

From edc996332c9e98045aec00ff8d24d72ec104c765 Mon Sep 17 00:00:00 2001
From: Haris Macic <haris.macic@pearshadow.com>
Date: Fri, 6 Feb 2026 13:34:49 +0100
Subject: [PATCH 07/19] #5852 Change rounding from 2 to 4 decimals

---
 app/Domain/Timesheets/Services/TimeParser.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Domain/Timesheets/Services/TimeParser.php b/app/Domain/Timesheets/Services/TimeParser.php
index 33156e741e..d29d499cb9 100644
--- a/app/Domain/Timesheets/Services/TimeParser.php
+++ b/app/Domain/Timesheets/Services/TimeParser.php
@@ -52,7 +52,7 @@ public function parseTimeToDecimal(string|int|float $input): float
             if ($hours < 0) {
                 throw new InvalidArgumentException('Time cannot be negative');
             }
-            return round($hours, 2);
+            return round($hours, 4);
         }
 
         // Normalize the input (trim spaces, lowercase)
@@ -65,13 +65,13 @@ public function parseTimeToDecimal(string|int|float $input): float
         // Try to parse as natural language first
         $naturalLanguageResult = $this->parseNaturalLanguage($input);
         if ($naturalLanguageResult !== null) {
-            return round($naturalLanguageResult, 2);
+            return round($naturalLanguageResult, 4);
         }
 
         // Try to parse as Jira-style format
         $jiraFormatResult = $this->parseJiraFormat($input);
         if ($jiraFormatResult !== null) {
-            return round($jiraFormatResult, 2);
+            return round($jiraFormatResult, 4);
         }
 
         // If nothing matched, throw an error

From 9645421b822e95de5c6b2d727c686ba7ae43178f Mon Sep 17 00:00:00 2001
From: farukvukovic <104840615+farukvukovic@users.noreply.github.com>
Date: Thu, 29 Jan 2026 16:05:26 +0100
Subject: [PATCH 08/19] #5746 Integrate sihterice with Pear Log

---
 app/Core/Middleware/InitialHeaders.php      |   1 +
 app/Domain/Menu/Repositories/Menu.php       |   2 +
 app/Domain/Sihterice/Controllers/Show.php   |  20 +
 app/Domain/Sihterice/Templates/show.tpl.php | 540 ++++++++++++++++++++
 package-lock.json                           |  31 +-
 package.json                                |   2 +
 6 files changed, 594 insertions(+), 2 deletions(-)
 create mode 100644 app/Domain/Sihterice/Controllers/Show.php
 create mode 100644 app/Domain/Sihterice/Templates/show.tpl.php

diff --git a/app/Core/Middleware/InitialHeaders.php b/app/Core/Middleware/InitialHeaders.php
index 507e94c1f1..0a84816512 100644
--- a/app/Core/Middleware/InitialHeaders.php
+++ b/app/Core/Middleware/InitialHeaders.php
@@ -32,6 +32,7 @@ public function handle($request, Closure $next): Response
             "img-src * 'self' *.leantime.io *.amazonaws.com data: blob: marketplace.localhost",
             "frame-src 'self' *.google.com *.microsoft.com *.live.com",
             "frame-ancestors 'self' *.google.com *.microsoft.com *.live.com",
+            "connect-src 'self' http://localhost:3100",
         ];
         $cspParts = self::dispatchFilter('cspParts', $cspParts);
         $csp = implode(';', $cspParts);
diff --git a/app/Domain/Menu/Repositories/Menu.php b/app/Domain/Menu/Repositories/Menu.php
index d3e0b780f0..1e8cf0c868 100644
--- a/app/Domain/Menu/Repositories/Menu.php
+++ b/app/Domain/Menu/Repositories/Menu.php
@@ -109,6 +109,7 @@ class Menu
                     10 => ['type' => 'item', 'module' => 'projects', 'role' => 'manager', 'title' => 'menu.all_projects', 'icon' => 'fa fa-fw fa-briefcase', 'tooltip' => 'menu.all_projects_tooltip', 'href' => '/projects/showAll', 'active' => ['showAll']],
                     15 => ['type' => 'item', 'module' => 'clients', 'role' => 'admin', 'title' => 'menu.all_clients', 'icon' => 'fa fa-fw fa-address-book', 'tooltip' => 'menu.all_clients_tooltip', 'href' => '/clients/showAll', 'active' => ['showAll']],
                     20 => ['type' => 'item', 'module' => 'users', 'role' => 'admin', 'title' => 'menu.all_users', 'icon' => 'fa fa-fw fa-users', 'tooltip' => 'menu.all_users_tooltip', 'href' => '/users/showAll', 'active' => ['showAll']],
+                    25 => ['type' => 'item', 'module' => 'sihterice', 'role' => 'admin', 'title' => 'Sihterice', 'icon' => 'fa fa-fw fa-cube', 'tooltip' => 'Sihterice Frontend', 'href' => '/sihterice/show', 'active' => ['show']],
                 ],
             ],
             15 => [
@@ -426,6 +427,7 @@ public function getSectionMenuType($currentRoute, $default = 'default')
             'connector.integration' => 'company',
             'billing.subscriptions' => 'company',
             'llamadorian.statusCollector' => 'personal',
+            'sihterice.show' => 'company',
         ];
 
         $sections = self::dispatch_filter('menuSections', $sections, ['currentRoute' => $currentRoute, 'default' => $default]);
diff --git a/app/Domain/Sihterice/Controllers/Show.php b/app/Domain/Sihterice/Controllers/Show.php
new file mode 100644
index 0000000000..b462087eac
--- /dev/null
+++ b/app/Domain/Sihterice/Controllers/Show.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Leantime\Domain\Sihterice\Controllers;
+
+use Leantime\Core\Controller\Controller;
+use Leantime\Domain\Auth\Models\Roles;
+use Leantime\Domain\Auth\Services\Auth;
+
+class Show extends Controller
+{
+    /* Display the Sihterice application frontend. */
+    public function run()
+    {
+        Auth::authOrRedirect([Roles::$owner, Roles::$admin], true);
+
+        $this->tpl->assign('sihtericeToken', env('SIHTERICE_TOKEN', ''));
+
+        return $this->tpl->display('sihterice.show');
+    }
+}
diff --git a/app/Domain/Sihterice/Templates/show.tpl.php b/app/Domain/Sihterice/Templates/show.tpl.php
new file mode 100644
index 0000000000..5ce0e40ba5
--- /dev/null
+++ b/app/Domain/Sihterice/Templates/show.tpl.php
@@ -0,0 +1,540 @@
+<?php
+defined('RESTRICTED') or exit('Restricted access');
+?>
+
+<style>
+    /* Delete Modal Styles */
+    .delete-modal-content {
+        background: white;
+        border-radius: 12px;
+        padding: 30px;
+        width: 100%;
+        max-width: 400px;
+        animation: modalSlideIn 0.3s ease;
+        text-align: center;
+    }
+    .delete-modal-icon {
+        width: 60px;
+        height: 60px;
+        background: #fee2e2;
+        border-radius: 50%;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        margin: 0 auto 20px;
+    }
+    .delete-modal-icon i {
+        font-size: 28px;
+        color: #dc3545;
+    }
+    .delete-modal-title {
+        font-size: 20px;
+        font-weight: 600;
+        color: #333;
+        margin-bottom: 10px;
+    }
+    .delete-modal-text {
+        color: #666;
+        margin-bottom: 25px;
+        line-height: 1.5;
+    }
+    .delete-modal-actions {
+        display: flex;
+        gap: 10px;
+        justify-content: space-between;
+    }
+
+    /*Delete button*/
+    .btn-danger {
+        background: #c0392b;
+        color: white;
+        border: none;
+        padding: 10px 24px;
+        border-radius: 20px;
+        cursor: pointer;
+        font-size: 14px;
+        font-weight: 500;
+        margin-right: auto;
+    }
+
+    .btn-danger:hover {
+        background: #a93226;
+    }
+
+    /* Modal Styles */
+    .modal-overlay {
+        display: none;
+        position: fixed;
+        top: 0;
+        left: 0;
+        width: 100%;
+        height: 100%;
+        background: rgba(0,0,0,0.5);
+        z-index: 9999;
+        justify-content: center;
+        align-items: center;
+    }
+    .modal-overlay.active {
+        display: flex;
+    }
+    .modal-content {
+        background: white;
+        border-radius: 12px;
+        padding: 30px;
+        width: 100%;
+        max-width: 500px;
+        animation: modalSlideIn 0.3s ease;
+    }
+    @keyframes modalSlideIn {
+        from {
+            opacity: 0;
+            transform: translateY(-20px);
+        }
+        to {
+            opacity: 1;
+            transform: translateY(0);
+        }
+    }
+    .modal-header {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        margin-bottom: 25px;
+        padding-bottom: 15px;
+        border-bottom: 1px solid #eee;
+    }
+    .modal-header h3 {
+        margin: 0;
+        font-size: 20px;
+        color: #333;
+    }
+    .modal-close {
+        background: none;
+        border: none;
+        font-size: 24px;
+        cursor: pointer;
+        color: #999;
+        padding: 0;
+        line-height: 1;
+    }
+    .modal-close:hover {
+        color: #333;
+    }
+
+    /* Form Styles */
+    .form-group {
+        margin-bottom: 20px;
+    }
+    .form-group label {
+        display: block;
+        margin-bottom: 6px;
+        font-weight: 500;
+        color: #555;
+        font-size: 14px;
+    }
+    .form-group input {
+        width: 100%;
+        padding: 10px 12px;
+        border: 1px solid #ddd;
+        border-radius: 6px;
+        font-size: 14px;
+        transition: border-color 0.2s;
+        box-sizing: border-box;
+    }
+    .form-group input:focus {
+        outline: none;
+        border-color: var(--primary-color, #1b75bb);
+    }
+    .form-actions {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        margin-top: 25px;
+        padding-top: 20px;
+        border-top: 1px solid #eee;
+    }
+    .form-actions-right {
+        display: flex;
+        gap: 10px;
+    }
+</style>
+
+<div class="pageheader">
+    <div class="pageicon"><span class="fa fa-cube"></span></div>
+    <div class="pagetitle">
+        <h1>Sihterice</h1>
+    </div>
+</div>
+
+<div class="maincontent">
+    <div class="maincontentinner">
+
+        <div class="row">
+            <div class="col-md-6">
+                <a href="javascript:void(0)" onclick="openModal()" class="btn btn-primary"><i class="fa fa-plus"></i> Add Employee</a>
+            </div>
+            <div class="col-md-6 align-right">
+            </div>
+        </div>
+
+        <table class="table table-bordered" id="employeesTable">
+            <colgroup>
+                <col class="con1">
+                <col class="con0">
+                <col class="con1">
+                <col class="con0">
+                <col class="con1">
+                <col class="con0">
+            </colgroup>
+            <thead>
+                <tr>
+                    <th class="head1">ID</th>
+                    <th class="head0">First Name</th>
+                    <th class="head1">Last Name</th>
+                    <th class="head0">Email</th>
+                    <th class="head1">Position</th>
+                    <th class="head0 no-sort"></th>
+                </tr>
+            </thead>
+            <tbody id="employeesBody">
+                <tr>
+                    <td colspan="6" style="text-align: center; padding: 40px;">
+                        <i class="fa fa-spinner fa-spin"></i> Loading...
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+
+    </div>
+</div>
+
+<!-- Modal for adding/editing-->
+<div class="modal-overlay" id="employeeModal">
+    <div class="modal-content">
+<!--        Add Employee text header-->
+        <div class="modal-header">
+            <!--        Close Modal icon button-->
+            <h3 id="modalTitle">Add Employee</h3>
+            <button class="modal-close" onclick="closeModal()">x</button>
+        </div>
+
+        <form id="employeeForm" onsubmit="saveEmployee(event)">
+            <input type="hidden" id="employeeId" value="">
+            <!--input First name form-->
+            <div class="form-group">
+                <label for="firstName">First Name</label>
+                <input type="text" id="firstName" name="firstName">
+            </div>
+            <!--input Last name form-->
+            <div class="form-group">
+                <label for="lastName">Last Name</label>
+                <input type="text" id="lastName" name="lastName">
+            </div>
+            <!--input email form-->
+            <div class="form-group">
+                <label for="email">Email</label>
+                <input type="email" id="email" name="email">
+            </div>
+<!--input position form-->
+            <div class="form-group">
+                <label for="position">Position</label>
+                <input type="text" id="position" name="position">
+            </div>
+<!--delete button-->
+            <div class="form-actions">
+                <button type="button" class="btn-danger" id="modalDeleteBtn" style="display: none;" onclick="deleteFromModal()">Delete</button>
+                <div class="form-actions-right">
+                    <button type="button" class="btn-secondary" onclick="closeModal()">Cancel</button>
+                    <button type="submit" class="btn-primary" id="saveBtn">
+                        <i class="fa fa-save" style="margin-right: 6px;"></i>Save
+                    </button>
+                </div>
+        </form>
+    </div>
+</div>
+
+<!-- Delete Confirmation Modal -->
+<div class="modal-overlay" id="deleteModal">
+    <div class="delete-modal-content">
+        <div class="delete-modal-icon">
+            <i class="fa fa-exclamation-triangle"></i>
+        </div>
+        <div class="delete-modal-title">Delete Employee</div>
+        <div class="delete-modal-text">
+            Are you sure you want to delete <strong id="deleteEmployeeName"></strong>?<br>
+            This action cannot be undone.
+        </div>
+        <input type="hidden" id="deleteEmployeeId" value="">
+        <div class="delete-modal-actions">
+            <button class="btn-danger" id="confirmDeleteBtn" onclick="confirmDelete()">Delete</button>
+            <button class="btn-secondary" onclick="closeDeleteModal()">Cancel</button>
+        </div>
+    </div>
+</div>
+
+<script>
+    const API_BASE = 'http://localhost:3100/api/employees'
+    const API_TOKEN = '<?php echo $tpl->get('sihtericeToken'); ?>'
+    let isEditing = false
+
+    // MODAL FUNCTIONS
+    function openModal(employee = null) {
+        const modal = document.getElementById('employeeModal')
+        const title = document.getElementById('modalTitle')
+        const form = document.getElementById('employeeForm')
+        const deleteBtn = document.getElementById('modalDeleteBtn')
+
+        // Reset form
+        form.reset()
+        document.getElementById('employeeId').value = ''
+
+        if (!employee) {
+            // Add mode
+            isEditing = false
+            title.textContent = 'Add Employee'
+            deleteBtn.style.display = 'none'
+        } else {
+            // Edit mode
+            isEditing = true
+            title.textContent = 'Edit Employee'
+            document.getElementById('employeeId').value = employee.id
+            document.getElementById('firstName').value = employee.firstName || ''
+            document.getElementById('lastName').value = employee.lastName || ''
+            document.getElementById('email').value = employee.email || ''
+            document.getElementById('position').value = employee.position || ''
+            deleteBtn.style.display = 'block'
+        }
+
+        modal.classList.add('active')
+        document.getElementById('firstName').focus()
+    }
+
+    function closeModal() {
+        const modal = document.getElementById('employeeModal')
+        modal.classList.remove('active')
+        isEditing = false
+        document.getElementById('modalDeleteBtn').style.display = 'none'
+    }
+
+    // Close modal on overlay click
+    document.getElementById('employeeModal').addEventListener('click', function(e) {
+        if (e.target === this) {
+            closeModal()
+        }
+    })
+
+    // Close modals on Escape key
+    document.addEventListener('keydown', function(e) {
+        if (e.key === 'Escape') {
+            closeModal()
+            closeDeleteModal()
+        }
+    })
+
+    // API FUNCTIONS
+    async function loadEmployees() {
+        // Destroy existing DataTable if it exists
+        if (jQuery.fn.DataTable && jQuery.fn.DataTable.isDataTable('#employeesTable')) {
+            jQuery('#employeesTable').DataTable().destroy();
+        }
+
+        const tbody = document.getElementById('employeesBody')
+        tbody.innerHTML = '<tr><td colspan="6" style="text-align: center; padding: 40px;"><i class="fa fa-spinner fa-spin"></i> Loading...</td></tr>'
+
+        try {
+            const res = await fetch(`${API_BASE}/all`, {
+                headers: {'Authorization': `Bearer ${API_TOKEN}`}
+            })
+            const result = await res.json()
+
+            if (result.error) {
+                tbody.innerHTML = `<tr><td colspan="6" style="text-align: center; padding: 40px;"><i class="fa fa-exclamation-triangle"></i> Error: ${result.error}</td></tr>`
+                return
+            }
+
+            if (!result.data || result.data.length === 0) {
+                tbody.innerHTML = `
+                    <tr>
+                        <td colspan="6" style="text-align: center; padding: 40px;">
+                            <i class="fa fa-users"></i>
+                            <p>No employees found</p>
+                            <a href="javascript:void(0)" onclick="openModal()" class="btn btn-primary"><i class="fa fa-plus"></i> Add First Employee</a>
+                        </td>
+                    </tr>
+                `
+                return
+            }
+
+            tbody.innerHTML = ''
+            result.data.forEach(emp => {
+                const tr = document.createElement('tr')
+                tr.innerHTML = `
+                    <td style="padding: 6px 10px;">${emp.id}</td>
+                    <td style="padding: 6px 10px;"><a href="javascript:void(0)" onclick='editEmployee(${JSON.stringify(emp)})'>${escapeHtml(emp.firstName)}</a></td>
+                    <td style="padding: 6px 10px;"><a href="javascript:void(0)" onclick='editEmployee(${JSON.stringify(emp)})'>${escapeHtml(emp.lastName)}</a></td>
+                    <td style="padding: 6px 10px;">${escapeHtml(emp.email)}</td>
+                    <td style="padding: 6px 10px;">${escapeHtml(emp.position || '-')}</td>
+                    <td style="padding: 6px 10px;">
+                        <a href="javascript:void(0)" onclick='editEmployee(${JSON.stringify(emp)})' class="edit"><i class="fa fa-edit"></i> Edit</a>
+                    </td>
+                `
+                tbody.appendChild(tr)
+            })
+
+            // Initialize DataTable
+            if (jQuery.fn.DataTable && !jQuery.fn.DataTable.isDataTable('#employeesTable')) {
+                jQuery('#employeesTable').DataTable({
+                    "order": [[0, "asc"]],
+                    "info": false,
+                    "searching": false,
+                    "paging": false,
+                    "columnDefs": [
+                        { "orderable": false, "targets": 5 }
+                    ]
+                });
+            }
+
+        } catch (err) {
+            console.error("Error loading employees:", err)
+            tbody.innerHTML = `<tr><td colspan="6" style="text-align: center; padding: 40px;"><i class="fa fa-exclamation-triangle"></i> Error loading employees</td></tr>`
+        }
+    }
+
+    async function saveEmployee(event) {
+        event.preventDefault()
+
+        const id = document.getElementById('employeeId').value
+        const firstName = document.getElementById('firstName').value.trim()
+        const lastName = document.getElementById('lastName').value.trim()
+        const email = document.getElementById('email').value.trim()
+        const position = document.getElementById('position').value.trim()
+
+        const saveBtn = document.getElementById('saveBtn')
+        saveBtn.disabled = true
+        saveBtn.innerHTML = '<i class="fa fa-spinner fa-spin"></i> Saving...'
+
+        try {
+            let res
+            if (id) {
+                // Update existing
+                res = await fetch(`${API_BASE}/edit/${id}`, {
+                    method: 'PUT',
+                    headers: {
+                        'Content-Type': 'application/json',
+                        'Authorization': `Bearer ${API_TOKEN}`
+                    },
+                    body: JSON.stringify({ firstName, lastName, email, position })
+                })
+            } else {
+                // Create new
+                res = await fetch(`${API_BASE}/create`, {
+                    method: 'POST',
+                    headers: {
+                        'Content-Type': 'application/json',
+                        'Authorization': `Bearer ${API_TOKEN}`
+                    },
+                    body: JSON.stringify({ firstName, lastName, email, position })
+                })
+            }
+
+            const result = await res.json()
+
+            if (res.ok) {
+                closeModal()
+                loadEmployees()
+                showNotification(id ? 'Employee updated successfully!' : 'Employee added successfully!', 'success')
+            } else {
+                showNotification(result.error || 'Error saving employee', 'error')
+            }
+
+        } catch (err) {
+            console.error("Error:", err)
+            showNotification('Error saving employee', 'error')
+        } finally {
+            saveBtn.disabled = false
+            saveBtn.innerHTML = '<i class="fa fa-save" style="margin-right: 6px "></i>Save'
+        }
+    }
+
+    function editEmployee(employee) {
+        openModal(employee)
+    }
+
+    function deleteFromModal() {
+        const id = document.getElementById('employeeId').value
+        const firstName = document.getElementById('firstName').value
+        const lastName = document.getElementById('lastName').value
+        closeModal()
+        openDeleteModal(id, firstName + ' ' + lastName)
+    }
+
+    // DELETE MODAL FUNCTIONS
+    function openDeleteModal(id, name) {
+        document.getElementById('deleteEmployeeId').value = id
+        document.getElementById('deleteEmployeeName').textContent = name
+        document.getElementById('deleteModal').classList.add('active')
+    }
+
+    function closeDeleteModal() {
+        document.getElementById('deleteModal').classList.remove('active')
+        document.getElementById('deleteEmployeeId').value = ''
+    }
+
+    // Close delete modal on overlay click
+    document.getElementById('deleteModal').addEventListener('click', function(e) {
+        if (e.target === this) {
+            closeDeleteModal()
+        }
+    })
+
+    async function confirmDelete() {
+        const id = document.getElementById('deleteEmployeeId').value
+        if (!id) return
+
+        const btn = document.getElementById('confirmDeleteBtn')
+        btn.disabled = true
+        btn.textContent = 'Deleting...'
+
+        try {
+            const res = await fetch(`${API_BASE}/remove/${id}`, {
+                method: 'DELETE',
+                headers: {'Authorization': `Bearer ${API_TOKEN}`}
+            })
+            const result = await res.json()
+
+            if (res.ok) {
+                closeDeleteModal()
+                await loadEmployees()
+                showNotification('Employee deleted successfully!', 'success')
+            } else {
+                showNotification(result.error || 'Error deleting employee', 'error')
+            }
+
+        } catch (err) {
+            console.error("Error:", err)
+            showNotification('Error deleting employee', 'error')
+        } finally {
+            btn.disabled = false
+            btn.textContent = 'Delete'
+        }
+    }
+
+    // HELPER FUNCTIONS
+    function escapeHtml(text) {
+        if (!text) return ''
+        const div = document.createElement('div')
+        div.textContent = text
+        return div.innerHTML
+    }
+
+    function showNotification(message, type) {
+        if (typeof jQuery !== 'undefined' && jQuery.growl) {
+            jQuery.growl({ message: message, style: type })
+        } else {
+            alert(message)
+        }
+    }
+
+    // INIT
+    loadEmployees()
+</script>
diff --git a/package-lock.json b/package-lock.json
index af1f8d6e2b..3fcd5d01d1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -26,6 +26,7 @@
         "chartjs-adapter-luxon": "^1.3.1",
         "chosen-js": "^1.8.7",
         "composer": "^4.1.0",
+        "cors": "^2.8.6",
         "croppie": "^2.6.5",
         "datatables.net": "^1.13.11",
         "datatables.net-buttons": "^2.4.2",
@@ -57,6 +58,7 @@
       },
       "devDependencies": {
         "@babel/eslint-parser": "^7.22.15",
+        "@types/cors": "^2.8.19",
         "dotenv": "^16.4.5",
         "eslint": "^8.50.0",
         "eslint-plugin-vue": "^9.17.0",
@@ -2707,6 +2709,16 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@types/cors": {
+      "version": "2.8.19",
+      "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.19.tgz",
+      "integrity": "sha512-mFNylyeyqN93lfe/9CSxOGREz8cpzAhH+E93xJ4xWQf62V8sQ/24reV2nyzUWM6H6Xji+GGHpkbLe7pVoUEskg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
     "node_modules/@types/d3": {
       "version": "7.4.3",
       "resolved": "https://registry.npmjs.org/@types/d3/-/d3-7.4.3.tgz",
@@ -5488,6 +5500,23 @@
       "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
       "dev": true
     },
+    "node_modules/cors": {
+      "version": "2.8.6",
+      "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.6.tgz",
+      "integrity": "sha512-tJtZBBHA6vjIAaF6EnIaq6laBBP9aq/Y3ouVJjEfoHbRBcHBAHYcMh/w8LDrk2PvIMMq8gmopa5D4V8RmbrxGw==",
+      "license": "MIT",
+      "dependencies": {
+        "object-assign": "^4",
+        "vary": "^1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/express"
+      }
+    },
     "node_modules/cose-base": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/cose-base/-/cose-base-1.0.3.tgz",
@@ -10630,7 +10659,6 @@
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
       "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
-      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -14283,7 +14311,6 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
       "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
-      "dev": true,
       "engines": {
         "node": ">= 0.8"
       }
diff --git a/package.json b/package.json
index bb70ce1ec6..81376448d4 100644
--- a/package.json
+++ b/package.json
@@ -20,6 +20,7 @@
     "chartjs-adapter-luxon": "^1.3.1",
     "chosen-js": "^1.8.7",
     "composer": "^4.1.0",
+    "cors": "^2.8.6",
     "croppie": "^2.6.5",
     "datatables.net": "^1.13.11",
     "datatables.net-buttons": "^2.4.2",
@@ -51,6 +52,7 @@
   },
   "devDependencies": {
     "@babel/eslint-parser": "^7.22.15",
+    "@types/cors": "^2.8.19",
     "dotenv": "^16.4.5",
     "eslint": "^8.50.0",
     "eslint-plugin-vue": "^9.17.0",

From 5468e53a210e23f8d0b7210226d998c9316ba70b Mon Sep 17 00:00:00 2001
From: farukvukovic <104840615+farukvukovic@users.noreply.github.com>
Date: Tue, 3 Feb 2026 21:43:57 +0100
Subject: [PATCH 09/19] #5780 Integrate Worksheet backend with pearlog

---
 app/Domain/Sihterice/Templates/show.tpl.php | 155 +++++++++++++++++++-
 1 file changed, 149 insertions(+), 6 deletions(-)

diff --git a/app/Domain/Sihterice/Templates/show.tpl.php b/app/Domain/Sihterice/Templates/show.tpl.php
index 5ce0e40ba5..9a0112f4b4 100644
--- a/app/Domain/Sihterice/Templates/show.tpl.php
+++ b/app/Domain/Sihterice/Templates/show.tpl.php
@@ -3,6 +3,33 @@
 ?>
 
 <style>
+    /* Pillow Select Styles */
+    .pillow-select {
+        padding: 4px 12px;
+        border-radius: 15px;
+        border: 1px solid #ddd;
+        background: white;
+        font-size: 14px;
+        line-height: 20px;
+        cursor: pointer;
+        outline: none;
+        transition: all 0.2s;
+        appearance: none;
+        -webkit-appearance: none;
+        background-image: url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2212%22%20height%3D%2212%22%20viewBox%3D%220%200%2012%2012%22%3E%3Ctitle%3Edown-arrow%3C%2Ftitle%3E%3Cg%20fill%3D%22%23000000%22%3E%3Cpath%20d%3D%22M10.293%2C3.293%2C6%2C7.586%2C1.707%2C3.293A1%2C1%2C0%2C0%2C0%2C.293%2C4.707l5%2C5a1%2C1%2C0%2C0%2C0%2C1.414%2C0l5-5a1%2C1%2C0%2C1%2C0-1.414-1.414Z%22%20fill%3D%22%23000000%22%3E%3C%2Fpath%3E%3C%2Fg%3E%3C%2Fsvg%3E");
+        background-repeat: no-repeat;
+        background-position: right 10px center;
+        padding-right: 28px;
+        vertical-align: middle;
+    }
+    .pillow-select:hover {
+        border-color: #aaa;
+    }
+    .pillow-select:focus {
+        border-color: var(--primary-color, #1b75bb);
+        box-shadow: 0 0 0 2px rgba(27, 117, 187, 0.1);
+    }
+
     /* Delete Modal Styles */
     .delete-modal-content {
         background: white;
@@ -174,6 +201,23 @@
                 <a href="javascript:void(0)" onclick="openModal()" class="btn btn-primary"><i class="fa fa-plus"></i> Add Employee</a>
             </div>
             <div class="col-md-6 align-right">
+                <a href="javascript:void(0)" onclick="downloadAllPdfs()" class="btn btn-primary" style="margin-right: 15px;"><i class="fa fa-download"></i> Download All</a>
+                <select id="monthSelector" class="pillow-select">
+                    <option value="1">January</option>
+                    <option value="2">February</option>
+                    <option value="3">March</option>
+                    <option value="4">April</option>
+                    <option value="5">May</option>
+                    <option value="6">June</option>
+                    <option value="7">July</option>
+                    <option value="8">August</option>
+                    <option value="9">September</option>
+                    <option value="10">October</option>
+                    <option value="11">November</option>
+                    <option value="12">December</option>
+                </select>
+                <select id="yearSelector" class="pillow-select" style="margin-left: 10px;">
+                </select>
             </div>
         </div>
 
@@ -185,6 +229,7 @@
                 <col class="con0">
                 <col class="con1">
                 <col class="con0">
+                <col class="con1">
             </colgroup>
             <thead>
                 <tr>
@@ -193,7 +238,8 @@
                     <th class="head1">Last Name</th>
                     <th class="head0">Email</th>
                     <th class="head1">Position</th>
-                    <th class="head0 no-sort"></th>
+                    <th class="head0 no-sort">PDF</th>
+                    <th class="head1 no-sort"></th>
                 </tr>
             </thead>
             <tbody id="employeesBody">
@@ -274,6 +320,7 @@
 
 <script>
     const API_BASE = 'http://localhost:3100/api/employees'
+    const API_HOST = 'http://localhost:3100'
     const API_TOKEN = '<?php echo $tpl->get('sihtericeToken'); ?>'
     let isEditing = false
 
@@ -339,7 +386,7 @@ function closeModal() {
         }
 
         const tbody = document.getElementById('employeesBody')
-        tbody.innerHTML = '<tr><td colspan="6" style="text-align: center; padding: 40px;"><i class="fa fa-spinner fa-spin"></i> Loading...</td></tr>'
+        tbody.innerHTML = '<tr><td colspan="7" style="text-align: center; padding: 40px;"><i class="fa fa-spinner fa-spin"></i> Loading...</td></tr>'
 
         try {
             const res = await fetch(`${API_BASE}/all`, {
@@ -348,14 +395,14 @@ function closeModal() {
             const result = await res.json()
 
             if (result.error) {
-                tbody.innerHTML = `<tr><td colspan="6" style="text-align: center; padding: 40px;"><i class="fa fa-exclamation-triangle"></i> Error: ${result.error}</td></tr>`
+                tbody.innerHTML = `<tr><td colspan="7" style="text-align: center; padding: 40px;"><i class="fa fa-exclamation-triangle"></i> Error: ${result.error}</td></tr>`
                 return
             }
 
             if (!result.data || result.data.length === 0) {
                 tbody.innerHTML = `
                     <tr>
-                        <td colspan="6" style="text-align: center; padding: 40px;">
+                        <td colspan="7" style="text-align: center; padding: 40px;">
                             <i class="fa fa-users"></i>
                             <p>No employees found</p>
                             <a href="javascript:void(0)" onclick="openModal()" class="btn btn-primary"><i class="fa fa-plus"></i> Add First Employee</a>
@@ -374,6 +421,9 @@ function closeModal() {
                     <td style="padding: 6px 10px;"><a href="javascript:void(0)" onclick='editEmployee(${JSON.stringify(emp)})'>${escapeHtml(emp.lastName)}</a></td>
                     <td style="padding: 6px 10px;">${escapeHtml(emp.email)}</td>
                     <td style="padding: 6px 10px;">${escapeHtml(emp.position || '-')}</td>
+                    <td style="padding: 6px 10px;">
+                        <a href="javascript:void(0)" onclick="downloadPdf(${emp.id})" title="Download PDF"><i class="fa fa-file-pdf-o"></i> Download</a>
+                    </td>
                     <td style="padding: 6px 10px;">
                         <a href="javascript:void(0)" onclick='editEmployee(${JSON.stringify(emp)})' class="edit"><i class="fa fa-edit"></i> Edit</a>
                     </td>
@@ -389,14 +439,14 @@ function closeModal() {
                     "searching": false,
                     "paging": false,
                     "columnDefs": [
-                        { "orderable": false, "targets": 5 }
+                        { "orderable": false, "targets": [5, 6] }
                     ]
                 });
             }
 
         } catch (err) {
             console.error("Error loading employees:", err)
-            tbody.innerHTML = `<tr><td colspan="6" style="text-align: center; padding: 40px;"><i class="fa fa-exclamation-triangle"></i> Error loading employees</td></tr>`
+            tbody.innerHTML = `<tr><td colspan="7" style="text-align: center; padding: 40px;"><i class="fa fa-exclamation-triangle"></i> Error loading employees</td></tr>`
         }
     }
 
@@ -535,6 +585,99 @@ function showNotification(message, type) {
         }
     }
 
+    // PDF DOWNLOAD (returns ZIP file from backend)
+    async function downloadPdf(employeeId) {
+        const month = document.getElementById('monthSelector').value
+        const year = document.getElementById('yearSelector').value
+
+        const url = `http://localhost:3100/api/worksheets/download/employee/${employeeId}/${month}/${year}`
+
+        try {
+            const res = await fetch(url, {
+                headers: {'Authorization': `Bearer ${API_TOKEN}`}
+            })
+
+            if (!res.ok) {
+                const result = await res.json()
+                showNotification(result.error || 'Error downloading worksheet', 'error')
+                return
+            }
+
+            const blob = await res.blob()
+            const downloadUrl = window.URL.createObjectURL(blob)
+            const a = document.createElement('a')
+            a.href = downloadUrl
+            const monthStr = month.toString().padStart(2, '0')
+            a.download = `employee-${employeeId}-worksheets-${year}-${monthStr}.zip`
+            document.body.appendChild(a)
+            a.click()
+            document.body.removeChild(a)
+            window.URL.revokeObjectURL(downloadUrl)
+        } catch (err) {
+            console.error("Error downloading worksheet:", err)
+            showNotification('Error downloading worksheet', 'error')
+        }
+    }
+
+    // DOWNLOAD ALL EMPLOYEES PDFs
+    async function downloadAllPdfs() {
+        const month = document.getElementById('monthSelector').value
+        const year = document.getElementById('yearSelector').value
+
+        const url = `${API_HOST}/api/worksheets/download/employees/${month}/${year}`
+
+        try {
+            showNotification('Generating worksheets, please wait...', 'info')
+
+            const res = await fetch(url, {
+                headers: {'Authorization': `Bearer ${API_TOKEN}`}
+            })
+
+            if (!res.ok) {
+                const result = await res.json()
+                showNotification(result.error || 'Error downloading worksheets', 'error')
+                return
+            }
+
+            const blob = await res.blob()
+            const downloadUrl = window.URL.createObjectURL(blob)
+            const a = document.createElement('a')
+            a.href = downloadUrl
+            const monthStr = month.toString().padStart(2, '0')
+            a.download = `worksheets-${year}-${monthStr}.zip`
+            document.body.appendChild(a)
+            a.click()
+            document.body.removeChild(a)
+            window.URL.revokeObjectURL(downloadUrl)
+
+            showNotification('Download complete!', 'success')
+        } catch (err) {
+            showNotification('Error downloading worksheets', 'error')
+        }
+    }
+
+    // INIT MONTH/YEAR SELECTORS
+    function initSelectors() {
+        const now = new Date()
+        const currentMonth = now.getMonth() + 1
+        const currentYear = now.getFullYear()
+
+        // Set current month
+        document.getElementById('monthSelector').value = currentMonth
+
+        // Populate years (current year and 2 years back)
+        const yearSelector = document.getElementById('yearSelector')
+
+        for (let y = currentYear; y >= currentYear - 2; y--) {
+            const option = document.createElement('option')
+            option.value = y
+            option.textContent = y
+            yearSelector.appendChild(option)
+        }
+        yearSelector.value = currentYear
+    }
+
     // INIT
+    initSelectors()
     loadEmployees()
 </script>

From 6145236f659a78311205283cb1e5ba4ba6ef9398 Mon Sep 17 00:00:00 2001
From: farukvukovic <104840615+farukvukovic@users.noreply.github.com>
Date: Thu, 5 Feb 2026 17:05:07 +0100
Subject: [PATCH 10/19] 5788 Fix slack send date

---
 .../Projects/Controllers/ShowProject.php      |   5 +
 .../Projects/Templates/showProject.tpl.php    |   8 +-
 .../Controllers/SaveFilterPreferences.php     |  18 ++
 .../Services/SlackMonthlyReportService.php    | 181 +++++++++++-------
 app/Language/en-US.ini                        |   4 +
 .../js/app/timesheets/filterPreferences.js    | 120 +++++++++++-
 6 files changed, 266 insertions(+), 70 deletions(-)

diff --git a/app/Domain/Projects/Controllers/ShowProject.php b/app/Domain/Projects/Controllers/ShowProject.php
index 47dfc66bea..4020d31134 100644
--- a/app/Domain/Projects/Controllers/ShowProject.php
+++ b/app/Domain/Projects/Controllers/ShowProject.php
@@ -125,6 +125,8 @@ public function run()
             if (isset($_POST['slackSave'])) {
                 $webhook = strip_tags($_POST['slackWebhookURL']);
                 $this->settingsRepo->saveSetting('projectsettings.'.$id.'.slackWebhookURL', $webhook);
+                $channelId = strip_tags($_POST['slackChannelId'] ?? '');
+                $this->settingsRepo->saveSetting('projectsettings.'.$id.'.slackChannelId', $channelId);
                 $this->tpl->setNotification($this->language->__('notification.saved_slack_webhook'), 'success');
             }
 
@@ -184,6 +186,9 @@ public function run()
             $slackWebhook = $this->settingsRepo->getSetting('projectsettings.'.$id.'.slackWebhookURL');
             $this->tpl->assign('slackWebhookURL', $slackWebhook);
 
+            $slackChannelId = $this->settingsRepo->getSetting('projectsettings.'.$id.'.slackChannelId');
+            $this->tpl->assign('slackChannelId', $slackChannelId);
+
             for ($i = 1; $i <= 3; $i++) {
                 $discordWebhook = $this->settingsRepo->getSetting('projectsettings.'.$id.'.discordWebhookURL'.$i);
                 $this->tpl->assign('discordWebhookURL'.$i, $discordWebhook);
diff --git a/app/Domain/Projects/Templates/showProject.tpl.php b/app/Domain/Projects/Templates/showProject.tpl.php
index eff3fa756c..2858fda3ec 100644
--- a/app/Domain/Projects/Templates/showProject.tpl.php
+++ b/app/Domain/Projects/Templates/showProject.tpl.php
@@ -240,9 +240,15 @@
                         <?= $tpl->__('text.slack_instructions'); ?>
                     </div>
                     <div class="col-md-4">
-                        <strong><?= $tpl->__('label.webhook_url'); ?></strong><br />
                         <form action="<?= BASE_URL ?>/projects/showProject/<?php echo $project['id']; ?>#integrations" method="post">
+                            <strong><?= $tpl->__('label.webhook_url'); ?></strong><br />
                             <input type="text" name="slackWebhookURL" id="slackWebhookURL" value="<?php echo $tpl->escape($tpl->get('slackWebhookURL')); ?>"/>
+                            <br /><br />
+                            <strong><?= $tpl->__('label.slack_channel_id'); ?></strong><br />
+                            <input type="text" name="slackChannelId" id="slackChannelId" placeholder="C0123456789" value="<?php echo $tpl->escape($tpl->get('slackChannelId')); ?>"/>
+                            <small style="display: block; color: #666; margin-top: 4px;">
+                                <?= $tpl->__('text.slack_channel_id_help'); ?>
+                            </small>
                             <br />
                             <input type="submit" value="<?= $tpl->__('buttons.save'); ?>" name="slackSave" />
                         </form>
diff --git a/app/Domain/Timesheets/Controllers/SaveFilterPreferences.php b/app/Domain/Timesheets/Controllers/SaveFilterPreferences.php
index 608df0dc89..01f0e37dfd 100644
--- a/app/Domain/Timesheets/Controllers/SaveFilterPreferences.php
+++ b/app/Domain/Timesheets/Controllers/SaveFilterPreferences.php
@@ -166,6 +166,24 @@ public function post(array $params): Response
     
     return $this->jsonResponse(['status' => 'success']);
 }
+            elseif ($action === 'setSlackProject') {
+                $slackProjectId = $input['slackProjectId'] ?? '';
+
+                if (!isset($allPreferences[$preferenceName])) {
+                    return $this->jsonResponse(['status' => 'error', 'message' => 'Profile not found'], 404);
+                }
+
+                $allPreferences[$preferenceName]['slackProjectId'] = $slackProjectId;
+
+                // If project is removed, also disable autoExport
+                if (empty($slackProjectId)) {
+                    $allPreferences[$preferenceName]['autoExport'] = false;
+                }
+
+                $this->settingRepo->saveSetting($settingKey, json_encode($allPreferences));
+
+                return $this->jsonResponse(['status' => 'success']);
+            }
             else {
                 return $this->jsonResponse([
                     'status' => 'error',
diff --git a/app/Domain/Timesheets/Services/SlackMonthlyReportService.php b/app/Domain/Timesheets/Services/SlackMonthlyReportService.php
index 43ebc333b5..8526fc6bf9 100644
--- a/app/Domain/Timesheets/Services/SlackMonthlyReportService.php
+++ b/app/Domain/Timesheets/Services/SlackMonthlyReportService.php
@@ -100,25 +100,25 @@ private function getFiltersFromRequest(): array
         ];
     }
 
-    public function getUsersProfilesWithEnabledAutoExport(int $userId): array 
+    public function getUsersProfilesWithEnabledAutoExport(int $userId): array
 {
     $settingKey = "user.{$userId}.timesheetFilters";
 
     $this->settingRepository->clearCache($settingKey);
     $preferences = $this->settingRepository->getSetting($settingKey);
-    
+
     if (!$preferences) {
         return [];
     }
-    
+
     if (is_string($preferences)) {
         $preferences = json_decode($preferences, true);
     }
-    
+
     if (!is_array($preferences)) {
         return [];
     }
-    
+
     $autoExportProfiles = [];
     foreach ($preferences as $name => $profile) {
         if (isset($profile['autoExport']) && $profile['autoExport'] === true) {
@@ -150,19 +150,19 @@ public function getAllProfilesWithEnabledAutoExport (): array {
 public function getAllUsersProfiles(int $userId): array {
     $settingKey = "user.{$userId}.timesheetFilters";
     $preferences = $this->settingRepository->getSetting($settingKey);
-    
+
     if (!$preferences) {
         return [];
     }
-    
+
     if (is_string($preferences)) {
         $preferences = json_decode($preferences, true);
     }
-    
+
     if (!is_array($preferences)) {
         return [];
     }
-    
+
     return $preferences;
 }
 
@@ -173,80 +173,131 @@ public function getAllProfiles(): array {
     foreach ($allUsers as $user) {
         $userId = $user['id'];
         $profiles = $this->getAllUsersProfiles($userId);
-        
+
         if (!empty($profiles)) {
             $allProfiles[] = [
                 'user_id' => $userId,
-                'user_name' => $user['firstname'] . ' ' . $user['lastname'], 
+                'user_name' => $user['firstname'] . ' ' . $user['lastname'],
                 'profiles' => $profiles
             ];
         }
     }
     return $allProfiles;
 }
+    /* Get Slack channel ID for a specific project */
+    public function getProjectSlackChannelId(int $projectId): string
+    {
+        return $this->settingRepository->getSetting('projectsettings.' . $projectId . '.slackChannelId') ?: '';
+    }
 
-   public function sendMonthlyReportToSlack($profilesWithEnabledAutoExport): void
-{
+    //Send monthly report to slack
+    public function sendMonthlyReportToSlack($profilesWithEnabledAutoExport): void {
         if (empty($profilesWithEnabledAutoExport)) {
-        $this->tpl->setNotification(
-            'No profiles with checkbox Slack ticked!',
-            'error',
-            'save_timesheet'
-        );
-        return;
-        }
-    foreach ($profilesWithEnabledAutoExport as $profileName => $profile) {
-        $profileFilters = $profile['filters'] ?? [];
-        $userId = $profileFilters['userId'] ?? null;
-        if ($userId === 'all' || $userId === '') {
-            $userId = null; 
-        } elseif ($userId !== null) {
-            $userId = (int)$userId;  
+            $this->tpl->setNotification(
+                'No profiles with checkbox Slack ticked!',
+                'error',
+                'save_timesheet'
+            );
+            return;
         }
-        $filters = [
-            'dateFrom' => isset($profileFilters['dateFrom']) ? dtHelper()->parseUserDateTime($profileFilters['dateFrom'])->setToDbTimezone() : dtHelper()->userNow()->startOfMonth()->setToDbTimezone(),
-            'dateTo' => isset($profileFilters['dateTo']) ? dtHelper()->parseUserDateTime($profileFilters['dateTo'])->setToDbTimezone() : dtHelper()->userNow()->endOfMonth()->setToDbTimezone(),
-            'projectFilter' => $profileFilters['projects'] ?? -1,
-            'kind' => $profileFilters['kind'] ?? 'all',
-            'userId' => $userId,
-            'invEmplCheck' => $profileFilters['invEmpl'] ?? '-1',
-            'invCompCheck' => $profileFilters['invComp'] ?? '0',
-            'ticketParameter' => $profileFilters['ticketParameter'] ?? '-1',
-            'paidCheck' => $profileFilters['paid'] ?? '0',
-            'clientId' => $profileFilters['clientId'] ?? -1,
-        ];
 
-        $columnState = $profileFilters['columnState'] ?? [];
-        $reportName = $profile['name'] ?? " ";
+        $successCount = 0;
+        $failCount = 0;
+        $debugInfo = [];
+
+        foreach ($profilesWithEnabledAutoExport as $profileName => $profile) {
+            // Get the project's Slack channel ID
+            $slackProjectId = $profile['slackProjectId'] ?? null;
+
+            if (empty($slackProjectId)) {
+                $debugInfo[] = "Profile '{$profileName}': No project assigned";
+                $failCount++;
+                continue; // Skip profiles without a project assigned
+            }
+
+            $channelId = $this->getProjectSlackChannelId((int) $slackProjectId);
+
+            if (empty($channelId)) {
+                $debugInfo[] = "Profile '{$profileName}': Project ID {$slackProjectId} has no Slack channel configured";
+                $failCount++;
+                continue; // Skip if project has no Slack channel configured
+            }
+
+            $profileFilters = $profile['filters'] ?? [];
+            $userId = $profileFilters['userId'] ?? null;
+            if ($userId === 'all' || $userId === '') {
+                $userId = null;
+            } elseif ($userId !== null) {
+                $userId = (int)$userId;
+            }
+
+            // Always use current month instead of saved dates
+            $currentMonthStart = dtHelper()->userNow()->startOfMonth()->setToDbTimezone();
+            $currentMonthEnd = dtHelper()->userNow()->endOfMonth()->setToDbTimezone();
+
+            $filters = [
+                'dateFrom' => $currentMonthStart,
+                'dateTo' => $currentMonthEnd,
+                'projectFilter' => $profileFilters['projects'] ?? -1,
+                'kind' => $profileFilters['kind'] ?? 'all',
+                'userId' => $userId,
+                'invEmplCheck' => $profileFilters['invEmpl'] ?? '-1',
+                'invCompCheck' => $profileFilters['invComp'] ?? '0',
+                'ticketParameter' => $profileFilters['ticketParameter'] ?? '-1',
+                'paidCheck' => $profileFilters['paid'] ?? '0',
+                'clientId' => $profileFilters['clientId'] ?? -1,
+            ];
+
+            $columnState = $profileFilters['columnState'] ?? [];
+            $reportName = $profile['name'] ?? " ";
 
-        $csvContent = $this->generateCsvString($filters, $columnState);
+            $csvContent = $this->generateCsvString($filters, $columnState);
+
+            if ($this->sendCsvToSlack($csvContent, $reportName, $channelId)) {
+                $successCount++;
+            } else {
+                $failCount++;
+            }
+        }
 
-        $this->sendCsvToSlack($csvContent, $reportName);
+        if ($successCount > 0 && $failCount === 0) {
+            $this->tpl->setNotification(
+                "Monthly reports successfully sent to Slack ({$successCount} profile(s)).",
+                'success',
+                'save_timesheet'
+            );
+        } elseif ($successCount > 0 && $failCount > 0) {
+            $this->tpl->setNotification(
+                "Sent {$successCount} report(s) to Slack. {$failCount} failed (missing project or channel config).",
+                'success',
+                'save_timesheet'
+            );
+        } else {
+            $debugMessage = !empty($debugInfo) ? ' Details: ' . implode('; ', $debugInfo) : '';
+            $this->tpl->setNotification(
+                'Failed to send reports. Please check project Slack channel configuration.' . $debugMessage,
+                'error',
+                'save_timesheet'
+            );
+        }
     }
-    $this->tpl->setNotification(
-        'Monthly reports successfully sent to Slack.',
-        'success',
-        'save_timesheet'
-    );
-}
 
-private function sendCsvToSlack(string $csvContent, string $profileName): bool
+private function sendCsvToSlack(string $csvContent, string $profileName, string $channelId): bool
 {
     $slackBotToken = env('SLACK_BOT_TOKEN', '');
-    
+
     if (empty($slackBotToken)) {
+        \Illuminate\Support\Facades\Log::warning('Slack export failed: SLACK_BOT_TOKEN not configured in .env');
         return false;
     }
 
-    $channelId = env('SLACK_CHANNEL_ID', '');
-    
     if (empty($channelId)) {
         return false;
     }
-    
+
     try {
         $filename = "timesheet_{$profileName}_" . date('Y-m-d') . ".csv";
-                
+
         $getUploadUrlResponse = $this->httpClient->post('https://slack.com/api/files.getUploadURLExternal', [
             'headers' => [
                 'Authorization' => "Bearer {$slackBotToken}",
@@ -259,25 +310,25 @@ private function sendCsvToSlack(string $csvContent, string $profileName): bool
         ]);
 
         $uploadUrlData = json_decode($getUploadUrlResponse->getBody()->getContents(), true);
-        
+
         if (!isset($uploadUrlData['ok']) || !$uploadUrlData['ok']) {
             return false;
         }
 
         $uploadUrl = $uploadUrlData['upload_url'];
         $fileId = $uploadUrlData['file_id'];
-                
+
         $uploadResponse = $this->httpClient->post($uploadUrl, [
             'body' => $csvContent,
             'headers' => [
                 'Content-Type' => 'text/csv',
             ]
         ]);
-        
+
         if ($uploadResponse->getStatusCode() !== 200) {
             return false;
         }
-        
+
         $completeResponse = $this->httpClient->post('https://slack.com/api/files.completeUploadExternal', [
             'headers' => [
                 'Authorization' => "Bearer {$slackBotToken}",
@@ -296,13 +347,13 @@ private function sendCsvToSlack(string $csvContent, string $profileName): bool
         ]);
 
         $completeData = json_decode($completeResponse->getBody()->getContents(), true);
-        
+
         if (isset($completeData['ok']) && $completeData['ok']) {
             return true;
         } else {
             return false;
         }
-        
+
     } catch (\GuzzleHttp\Exception\GuzzleException $e) {
         report($e);
         return false;
@@ -364,9 +415,9 @@ private function generateCsvString(array $filters, array $columnState = []): str
     $headers = array_intersect_key($allColumns, $activeColumns);
 
     $output = fopen('php://temp', 'w+');
-    
+
     fprintf($output, chr(0xEF).chr(0xBB).chr(0xBF));
-    
+
     fputcsv($output, array_values($headers));
     $totalHours = 0;
 
@@ -396,7 +447,7 @@ private function generateCsvString(array $filters, array $columnState = []): str
         $filteredRow = array_intersect_key($rowData, $activeColumns);
         fputcsv($output, array_values($filteredRow));
     }
-    
+
     $totalsRowData = [
         'id' => '',
         'tickId' => '',
@@ -432,4 +483,4 @@ private function generateCsvString(array $filters, array $columnState = []): str
 
     return $csvContent;
 }
-}
\ No newline at end of file
+}
diff --git a/app/Language/en-US.ini b/app/Language/en-US.ini
index 4564b1af95..009c70b077 100644
--- a/app/Language/en-US.ini
+++ b/app/Language/en-US.ini
@@ -2658,3 +2658,7 @@ popover.latest_plugins = "Latest Plugin Updates"
 
 #3.5.7
 text.loading_more_tasks = "Loading more tasks..."
+
+#Slack Channel Integration
+label.slack_channel_id = "Slack Channel ID"
+text.slack_channel_id_help = "Find the channel ID in channel details (e.g., C0123456789)"
diff --git a/public/assets/js/app/timesheets/filterPreferences.js b/public/assets/js/app/timesheets/filterPreferences.js
index fdddd3b09e..d19ce22a94 100644
--- a/public/assets/js/app/timesheets/filterPreferences.js
+++ b/public/assets/js/app/timesheets/filterPreferences.js
@@ -391,7 +391,10 @@
         let html = '';
         keys.forEach(function (key) {
             const pref = currentPreferences[key];
-            const checked = pref.autoExport ? 'checked' : '';
+            const hasProject = pref.slackProjectId && pref.slackProjectId !== '';
+            const checked = pref.autoExport && hasProject ? 'checked' : '';
+            const disabled = !hasProject ? 'disabled' : '';
+            const slackStyle = !hasProject ? 'opacity: 0.5;' : '';
             const isActive = (key === activeProfileName);
             const activeStyle = isActive ? 'background-color: #e8f4f8; border-left: 3px solid #004666;' : '';
             const activeIcon = isActive ? '<i class="fa fa-check-circle" style="color: #004666; margin-right: 5px;"></i>' : '';
@@ -401,16 +404,28 @@
                 dateInfo = `<small style="color: #666; font-size: 11px; display: block; margin-top: 2px;">📅 ${pref.filters.dateRange}</small>`;
             }
 
+            let projectTooltip = '';
+            if (hasProject && typeof projectNames !== 'undefined' && projectNames[pref.slackProjectId]) {
+                projectTooltip = projectNames[pref.slackProjectId];
+            } else {
+                projectTooltip = 'No project set';
+            }
+
             html += `
             <div class="preference-item" style="display: flex; align-items: center; justify-content: space-between;flex-wrap:wrap; padding: 10px 12px; border-bottom: 1px solid #eee; ${activeStyle}">
                 <div class="preference-name" data-name="${key}" style="flex: 1; font-weight: 500; color: #333;">
                     ${activeIcon}${key}
                     ${dateInfo}
                 </div>
-                <div style="display:flex; gap:8px; align-items: center; white-space: nowrap; margin-right: 15px;">
-                    <label style="margin: 0; line-height: 1; display: flex; align-items: center;">Slack</label>
-                    <input type="checkbox" class="auto-export" data-preference-name="${key}" ${checked} style="margin: 0; vertical-align: middle;"/>
+                <div style="display:flex; gap:8px; align-items: center; white-space: nowrap; margin-right: 8px;">
+                    <div style="${slackStyle}" title="${projectTooltip}">
+                        <label style="margin: 0; line-height: 1; display: flex; align-items: center; cursor: help;">Slack</label>
+                    </div>
+                    <input type="checkbox" class="auto-export" data-preference-name="${key}" ${checked} ${disabled} style="margin: 0; vertical-align: middle;"/>
                 </div>
+                <button class="edit-slack-project" data-name="${key}" style="background: none; border: none; color: #004666; cursor: pointer; padding: 2px;" title="Set Slack Project">
+                    <i class="fa fa-edit"></i>
+                </button>
                 <button class="delete-preference" data-name="${key}" style="background: none; border: none; color: #dc3545; cursor: pointer;" title="Delete">
                     <i class="fa fa-trash"></i>
                 </button>
@@ -485,6 +500,13 @@
             });
         });
 
+        jQuery('.edit-slack-project').off('click').on('click', function (e) {
+            e.stopPropagation();
+            e.preventDefault();
+            const name = jQuery(this).data('name');
+            showProjectSelector(name);
+        });
+
         jQuery('.preference-item').hover(
             function () {
                 jQuery(this).css('background-color', '#f8f9fa');
@@ -495,6 +517,96 @@
         );
     }
 
+    function showProjectSelector(profileName) {
+        // Remove existing modal if any
+        jQuery('#slackProjectModal').remove();
+
+        const pref = currentPreferences[profileName];
+        const currentProjectId = pref ? pref.slackProjectId : '';
+
+        // Build project options
+        let projectOptions = '<option value="">-- No Project (Disable Slack) --</option>';
+        if (typeof projectNames !== 'undefined') {
+            for (const [id, name] of Object.entries(projectNames)) {
+                const selected = id == currentProjectId ? 'selected' : '';
+                projectOptions += `<option value="${id}" ${selected}>${name}</option>`;
+            }
+        }
+
+        const modalHtml = `
+            <div id="slackProjectModal" style="position: fixed; top: 0; left: 0; right: 0; bottom: 0; background: rgba(0,0,0,0.5); z-index: 10000; display: flex; align-items: center; justify-content: center;">
+                <div style="background: white; border-radius: 8px; padding: 20px; min-width: 350px; max-width: 450px; box-shadow: 0 10px 40px rgba(0,0,0,0.3);">
+                    <h4 style="margin: 0 0 15px 0; color: #333;">
+                        <i class="fa fa-slack" style="color: #4A154B;"></i> Set Slack Project
+                    </h4>
+                    <p style="color: #666; font-size: 13px; margin-bottom: 15px;">
+                        Select a project for profile "<strong>${profileName}</strong>".<br/>
+                        <small>The Slack channel ID must be configured in the project settings.</small>
+                    </p>
+                    <select id="slackProjectSelect" class="form-control" style="width: 100%; padding: 8px; margin-bottom: 15px;">
+                        ${projectOptions}
+                    </select>
+                    <div style="display: flex; justify-content: flex-end; gap: 10px;">
+                        <button type="button" id="cancelSlackProject" class="btn btn-default" style="padding: 8px 16px;">Cancel</button>
+                        <button type="button" id="saveSlackProject" class="btn btn-primary" style="padding: 8px 16px; background: #004666; border: none;">Save</button>
+                    </div>
+                </div>
+            </div>
+        `;
+
+        jQuery('body').append(modalHtml);
+
+        jQuery('#cancelSlackProject').on('click', function () {
+            jQuery('#slackProjectModal').remove();
+        });
+
+        jQuery('#slackProjectModal').on('click', function (e) {
+            if (e.target === this) {
+                jQuery('#slackProjectModal').remove();
+            }
+        });
+
+        jQuery('#saveSlackProject').on('click', function () {
+            const selectedProjectId = jQuery('#slackProjectSelect').val();
+            saveSlackProjectSetting(profileName, selectedProjectId).then(function (success) {
+                jQuery('#slackProjectModal').remove();
+                if (success) {
+                    loadAllPreferences().then(function () {
+                        updateDropdownContent();
+                    });
+                }
+            });
+        });
+    }
+
+    async function saveSlackProjectSetting(profileName, projectId) {
+        try {
+            const response = await fetch(leantime.appUrl + PROFILE_ENDPOINT, {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json',
+                    'X-Requested-With': 'XMLHttpRequest'
+                },
+                credentials: 'same-origin',
+                body: JSON.stringify({
+                    action: 'setSlackProject',
+                    name: profileName,
+                    slackProjectId: projectId
+                })
+            });
+
+            if (response.ok) {
+                const data = await response.json();
+                if (data.status === 'success') {
+                    return true;
+                }
+            }
+        } catch (error) {
+            console.error('[Profiles] Failed to save Slack project setting:', error);
+        }
+        return false;
+    }
+
     function initUI() {
         const tableButtons = jQuery('#tableButtons')
 

From c4938ad31cd92ac0b19fa588ccc47a1751565417 Mon Sep 17 00:00:00 2001
From: farukvukovic <104840615+farukvukovic@users.noreply.github.com>
Date: Tue, 10 Feb 2026 14:31:11 +0100
Subject: [PATCH 11/19] #5885 Read Sihtarice addon backend address from env
 file

---
 app/Core/Middleware/InitialHeaders.php      | 2 +-
 app/Domain/Sihterice/Controllers/Show.php   | 1 +
 app/Domain/Sihterice/Templates/show.tpl.php | 6 +++---
 config/sample.env                           | 4 ++++
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/Core/Middleware/InitialHeaders.php b/app/Core/Middleware/InitialHeaders.php
index 0a84816512..e1e8ef4ad4 100644
--- a/app/Core/Middleware/InitialHeaders.php
+++ b/app/Core/Middleware/InitialHeaders.php
@@ -32,7 +32,7 @@ public function handle($request, Closure $next): Response
             "img-src * 'self' *.leantime.io *.amazonaws.com data: blob: marketplace.localhost",
             "frame-src 'self' *.google.com *.microsoft.com *.live.com",
             "frame-ancestors 'self' *.google.com *.microsoft.com *.live.com",
-            "connect-src 'self' http://localhost:3100",
+            "connect-src 'self' " . (config('app.sihterice_address') ?: 'http://localhost:3300'),
         ];
         $cspParts = self::dispatchFilter('cspParts', $cspParts);
         $csp = implode(';', $cspParts);
diff --git a/app/Domain/Sihterice/Controllers/Show.php b/app/Domain/Sihterice/Controllers/Show.php
index b462087eac..aaceb5de8e 100644
--- a/app/Domain/Sihterice/Controllers/Show.php
+++ b/app/Domain/Sihterice/Controllers/Show.php
@@ -14,6 +14,7 @@ public function run()
         Auth::authOrRedirect([Roles::$owner, Roles::$admin], true);
 
         $this->tpl->assign('sihtericeToken', env('SIHTERICE_TOKEN', ''));
+        $this->tpl->assign('sihtericeAddress', env('SIHTERICE_ADDRESS', 'http://localhost:3300'));
 
         return $this->tpl->display('sihterice.show');
     }
diff --git a/app/Domain/Sihterice/Templates/show.tpl.php b/app/Domain/Sihterice/Templates/show.tpl.php
index 9a0112f4b4..2a1ae0b220 100644
--- a/app/Domain/Sihterice/Templates/show.tpl.php
+++ b/app/Domain/Sihterice/Templates/show.tpl.php
@@ -319,8 +319,8 @@
 </div>
 
 <script>
-    const API_BASE = 'http://localhost:3100/api/employees'
-    const API_HOST = 'http://localhost:3100'
+    const API_BASE = <?php echo json_encode($tpl->get('sihtericeAddress') . '/api/employees'); ?>;
+    const API_HOST = <?php echo json_encode($tpl->get('sihtericeAddress')); ?>;
     const API_TOKEN = '<?php echo $tpl->get('sihtericeToken'); ?>'
     let isEditing = false
 
@@ -590,7 +590,7 @@ function showNotification(message, type) {
         const month = document.getElementById('monthSelector').value
         const year = document.getElementById('yearSelector').value
 
-        const url = `http://localhost:3100/api/worksheets/download/employee/${employeeId}/${month}/${year}`
+        const url = `${API_HOST}/api/worksheets/download/employee/${employeeId}/${month}/${year}`
 
         try {
             const res = await fetch(url, {
diff --git a/config/sample.env b/config/sample.env
index a1946eb793..5c3382a196 100644
--- a/config/sample.env
+++ b/config/sample.env
@@ -193,3 +193,7 @@ LEAN_RATELIMIT_AUTH = 20
 
 ## News Service
 LEAN_NEWS_ENABLED = true                                # Set to false to disable news service in airgapped environments
+
+## Sihterice (backend for /sihterice/show page)
+SIHTERICE_ADDRESS = 'http://localhost:3300'             # Base URL of Sihterice Node API (no trailing slash)
+SIHTERICE_TOKEN = ''                                    # Bearer token for Sihterice API auth

From 222c0c1b3bcf83edbbd1103318e7bc854618130e Mon Sep 17 00:00:00 2001
From: Haris Macic <haris.macic@pearshadow.com>
Date: Mon, 9 Feb 2026 13:33:47 +0100
Subject: [PATCH 12/19] #5853 Add logic for waiting until jquery is loaded

---
 .../Timesheets/Js/timesheetsController.js     | 94 ++++++++++++++-----
 1 file changed, 68 insertions(+), 26 deletions(-)

diff --git a/app/Domain/Timesheets/Js/timesheetsController.js b/app/Domain/Timesheets/Js/timesheetsController.js
index d89fd27a26..a3eeeeb2b3 100644
--- a/app/Domain/Timesheets/Js/timesheetsController.js
+++ b/app/Domain/Timesheets/Js/timesheetsController.js
@@ -110,37 +110,79 @@ leantime.timesheetsController = (function () {
         });
     };
 
-    var initEditTimeModal = function () {
-        var canvasoptions = {
-            sizes: {
-                minW: 700,
-                maxW: 1000,
-                minH: 1000,
-            },
-            resizable: false,
-            autoSizable: false,
-            callbacks: {
-                beforeShowCont: function () {
-                    jQuery(".showDialogOnLoad").show();
-
-                    if (closeModal === true) {
-                        closeModal = false;
-                        location.reload();
-                    }
-                },
-                beforeClose: function () {
+var isReady = false;
+var pendingClick = null;
+
+// Early click handler
+document.addEventListener('click', function(e) {
+    var target = e.target.closest('.editTimeModal');
+    if (target && !isReady) {
+        e.preventDefault();
+        e.stopPropagation();
+        
+        target.style.opacity = '0.5';
+        target.style.cursor = 'wait';
+        
+        pendingClick = target;
+    }
+}, true);
+
+function initWhenReady() {
+    if (typeof jQuery === 'undefined') {
+        setTimeout(initWhenReady, 100);
+        return;
+    }
+    
+    if (typeof jQuery.fn.nyroModal === 'undefined') {
+        setTimeout(initWhenReady, 100);
+        return;
+    }
+    
+    initEditTimeModal();
+    isReady = true;
+    
+    if (pendingClick) {
+        var $pending = jQuery(pendingClick);
+        pendingClick.style.opacity = '';
+        pendingClick.style.cursor = '';
+        $pending.trigger('click');
+        pendingClick = null;
+    }
+}
+
+var initEditTimeModal = function () {
+    var canvasoptions = {
+        sizes: {
+            minW: 700,
+            maxW: 1000,
+            minH: 1000,
+        },
+        resizable: false,
+        autoSizable: false,
+        callbacks: {
+            beforeShowCont: function () {
+                jQuery(".showDialogOnLoad").show();
+
+                if (closeModal === true) {
+                    closeModal = false;
                     location.reload();
                 }
             },
-            titleFromIframe: true
-        };
-
-        jQuery(document).on('click', '.editTimeModal', function (e) {
-            e.preventDefault();
-            jQuery(this).nyroModal(canvasoptions);
-        });
+            beforeClose: function () {
+                location.reload();
+            }
+        },
+        titleFromIframe: true
     };
 
+    jQuery(document).on('click', '.editTimeModal', function (e) {
+        if (!isReady) return; 
+        e.preventDefault();
+        jQuery(this).nyroModal(canvasoptions);
+    });
+};
+
+initWhenReady();
 
     /**
      * Format hours according to user preference

From 65e2ef67948dbff78196275c0610124d1975fc66 Mon Sep 17 00:00:00 2001
From: Haris Macic <haris.macic@pearshadow.com>
Date: Tue, 10 Feb 2026 13:56:20 +0100
Subject: [PATCH 13/19] [#5853] Remove unnecessary check for jquery
 initialization

---
 .../Timesheets/Js/timesheetsController.js     | 22 ++-----------------
 1 file changed, 2 insertions(+), 20 deletions(-)

diff --git a/app/Domain/Timesheets/Js/timesheetsController.js b/app/Domain/Timesheets/Js/timesheetsController.js
index a3eeeeb2b3..6141ff8f2e 100644
--- a/app/Domain/Timesheets/Js/timesheetsController.js
+++ b/app/Domain/Timesheets/Js/timesheetsController.js
@@ -35,12 +35,11 @@ leantime.timesheetsController = (function () {
                 },
                 "columnDefs": [
                     {
-                        "targets": 5, // Difference column (index 5)
-                        "searchable": false // Disable filtering for this column
+                        "targets": 5,
+                        "searchable": false
                     }
                 ],
                 "dom": '<"top">rt<"bottom"ilp><"clear">',
-                // CUSTOM: Enable searching for modern search component
                 "searching": true,
                 "stateSave": true,
                 "displayLength": 100,
@@ -61,14 +60,12 @@ leantime.timesheetsController = (function () {
                                 columns: ':visible',
                                 format: {
                                     body: function (data, row, column, node) {
-                                        // Use the export formatter if available
                                         if (typeof window.leantime !== 'undefined' &&
                                             typeof window.leantime.timesheetsExport !== 'undefined' &&
                                             typeof window.leantime.timesheetsExport.resolveCell === 'function') {
                                             return window.leantime.timesheetsExport.resolveCell(jQuery(node), data);
                                         }
 
-                                        // Fallback to original logic
                                         if (typeof jQuery(node).data('order') !== 'undefined') {
                                             data = jQuery(node).data('order');
                                         }
@@ -95,7 +92,6 @@ leantime.timesheetsController = (function () {
                             .append(buttonsContainer);
                     }
                 } catch (e) {
-                    // Swallow exception to avoid breaking rendering if Buttons fails
                 }
             }
 
@@ -103,7 +99,6 @@ leantime.timesheetsController = (function () {
                 allTimesheets.draw(false);
             });
 
-            // CUSTOM: Initialize modern search component
             if (typeof leantime.timesheetSearch !== 'undefined') {
                 leantime.timesheetSearch.init(allTimesheets);
             }
@@ -113,7 +108,6 @@ leantime.timesheetsController = (function () {
 var isReady = false;
 var pendingClick = null;
 
-// Early click handler
 document.addEventListener('click', function(e) {
     var target = e.target.closest('.editTimeModal');
     if (target && !isReady) {
@@ -128,10 +122,6 @@ document.addEventListener('click', function(e) {
 }, true);
 
 function initWhenReady() {
-    if (typeof jQuery === 'undefined') {
-        setTimeout(initWhenReady, 100);
-        return;
-    }
     
     if (typeof jQuery.fn.nyroModal === 'undefined') {
         setTimeout(initWhenReady, 100);
@@ -184,9 +174,6 @@ var initEditTimeModal = function () {
 
 initWhenReady();
 
-    /**
-     * Format hours according to user preference
-     */
     var formatHours = function (hours) {
         var hoursFormat = jQuery('.timesheetTable').data('hours-format') ||
             jQuery('#allTimesheetsTable').data('hours-format') ||
@@ -201,9 +188,6 @@ initWhenReady();
         return formatHoursHuman(hours);
     };
 
-    /**
-     * Convert decimal hours to human-readable format
-     */
     var formatHoursHuman = function (hours) {
         var totalMinutes = Math.round(hours * 60);
 
@@ -244,8 +228,6 @@ initWhenReady();
         return parts.join(' ');
     };
 
-
-    // Make public what you want to have public, everything else is private
     return {
         initTimesheetsTable: initTimesheetsTable,
         initEditTimeModal: initEditTimeModal,

From 9e8066a11bf45c798bd59127141ee686f95a292f Mon Sep 17 00:00:00 2001
From: farukvukovic <104840615+farukvukovic@users.noreply.github.com>
Date: Tue, 10 Feb 2026 16:34:41 +0100
Subject: [PATCH 14/19] #5888 - Fix sihtarice connection with docker

---
 app/Core/Middleware/InitialHeaders.php      |  2 +-
 app/Domain/Sihterice/Templates/show.tpl.php | 29 +++++++++++----------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/app/Core/Middleware/InitialHeaders.php b/app/Core/Middleware/InitialHeaders.php
index e1e8ef4ad4..5c3730e4bf 100644
--- a/app/Core/Middleware/InitialHeaders.php
+++ b/app/Core/Middleware/InitialHeaders.php
@@ -32,7 +32,7 @@ public function handle($request, Closure $next): Response
             "img-src * 'self' *.leantime.io *.amazonaws.com data: blob: marketplace.localhost",
             "frame-src 'self' *.google.com *.microsoft.com *.live.com",
             "frame-ancestors 'self' *.google.com *.microsoft.com *.live.com",
-            "connect-src 'self' " . (config('app.sihterice_address') ?: 'http://localhost:3300'),
+            "connect-src 'self' https://st-api.pearshadow.com http://host.docker.internal:3300 https://*.ngrok-free.app " . trim((string) (config('app.sihterice_address') ?? '')),
         ];
         $cspParts = self::dispatchFilter('cspParts', $cspParts);
         $csp = implode(';', $cspParts);
diff --git a/app/Domain/Sihterice/Templates/show.tpl.php b/app/Domain/Sihterice/Templates/show.tpl.php
index 2a1ae0b220..de7175ec7f 100644
--- a/app/Domain/Sihterice/Templates/show.tpl.php
+++ b/app/Domain/Sihterice/Templates/show.tpl.php
@@ -324,6 +324,13 @@
     const API_TOKEN = '<?php echo $tpl->get('sihtericeToken'); ?>'
     let isEditing = false
 
+    // Headers for API call
+    function getApiHeaders(extra = {}) {
+        const h = { 'Authorization': `Bearer ${API_TOKEN}` };
+        if (API_HOST.includes('ngrok')) h['ngrok-skip-browser-warning'] = '1';
+        return { ...h, ...extra };
+    }
+
     // MODAL FUNCTIONS
     function openModal(employee = null) {
         const modal = document.getElementById('employeeModal')
@@ -390,7 +397,7 @@ function closeModal() {
 
         try {
             const res = await fetch(`${API_BASE}/all`, {
-                headers: {'Authorization': `Bearer ${API_TOKEN}`}
+                headers: getApiHeaders()
             })
             const result = await res.json()
 
@@ -469,20 +476,14 @@ function closeModal() {
                 // Update existing
                 res = await fetch(`${API_BASE}/edit/${id}`, {
                     method: 'PUT',
-                    headers: {
-                        'Content-Type': 'application/json',
-                        'Authorization': `Bearer ${API_TOKEN}`
-                    },
+                    headers: getApiHeaders({ 'Content-Type': 'application/json' }),
                     body: JSON.stringify({ firstName, lastName, email, position })
                 })
             } else {
                 // Create new
                 res = await fetch(`${API_BASE}/create`, {
                     method: 'POST',
-                    headers: {
-                        'Content-Type': 'application/json',
-                        'Authorization': `Bearer ${API_TOKEN}`
-                    },
+                    headers: getApiHeaders({ 'Content-Type': 'application/json' }),
                     body: JSON.stringify({ firstName, lastName, email, position })
                 })
             }
@@ -548,7 +549,7 @@ function closeDeleteModal() {
         try {
             const res = await fetch(`${API_BASE}/remove/${id}`, {
                 method: 'DELETE',
-                headers: {'Authorization': `Bearer ${API_TOKEN}`}
+                headers: getApiHeaders()
             })
             const result = await res.json()
 
@@ -594,11 +595,11 @@ function showNotification(message, type) {
 
         try {
             const res = await fetch(url, {
-                headers: {'Authorization': `Bearer ${API_TOKEN}`}
+                headers: getApiHeaders()
             })
 
             if (!res.ok) {
-                const result = await res.json()
+                let result; try { result = await res.json(); } catch (_) { result = {}; }
                 showNotification(result.error || 'Error downloading worksheet', 'error')
                 return
             }
@@ -630,11 +631,11 @@ function showNotification(message, type) {
             showNotification('Generating worksheets, please wait...', 'info')
 
             const res = await fetch(url, {
-                headers: {'Authorization': `Bearer ${API_TOKEN}`}
+                headers: getApiHeaders()
             })
 
             if (!res.ok) {
-                const result = await res.json()
+                let result; try { result = await res.json(); } catch (_) { result = {}; }
                 showNotification(result.error || 'Error downloading worksheets', 'error')
                 return
             }

From eb08e7637f79292e3608c44d7820d1f3321ef9cb Mon Sep 17 00:00:00 2001
From: farukvukovic <104840615+farukvukovic@users.noreply.github.com>
Date: Wed, 11 Feb 2026 16:32:46 +0100
Subject: [PATCH 15/19] #5516 Enhance test slack notification

---
 .../Notifications/Services/Messengers.php     | 21 ++++++++++++++++++-
 app/Domain/Tickets/Models/Tickets.php         |  3 +++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/app/Domain/Notifications/Services/Messengers.php b/app/Domain/Notifications/Services/Messengers.php
index 3b2399c995..8cc98b3f40 100644
--- a/app/Domain/Notifications/Services/Messengers.php
+++ b/app/Domain/Notifications/Services/Messengers.php
@@ -76,10 +76,29 @@ private function slackWebhook(NotificationModel $notification): bool
         $statusLabelsArray = $ticketService->getStatusLabels($notification->projectId);
 
         $slackWebhookURL = $this->settingsRepo->getSetting("projectsettings.{$notification->projectId}.slackWebhookURL");
-        
+
         if ($slackWebhookURL !== '' && $slackWebhookURL !== false && !is_array($notification->entity) && (str_contains(strtolower($statusLabelsArray[$notification->entity->status]['name']), 'ready to test') || str_contains(strtolower($statusLabelsArray[$notification->entity->status]['name']), 'qa')) ) {
             $message = $this->prepareMessage($notification);
 
+            $entity = $notification->entity;
+
+            $ticketId     = $entity->id ?? '';
+            $projectKey   = trim($entity->projectKey ?? '');
+            $headline     = $entity->headline ?? '';
+            $ticketUrl    = $notification->url['url'] ?? '';
+
+            $ticketNumber = $projectKey ? $projectKey . '-' . $ticketId : ($ticketId ? '#' . $ticketId : '');
+
+            $title = $ticketNumber ? "$ticketNumber - $headline" : $headline;
+
+            $message[0] = [
+                'pretext'    => session('userdata.name') . " has the ticket ready to test",
+                'fallback'   => session('userdata.name') . " has the ticket ready to test",
+                'title'      => $title,
+                'title_link' => $ticketUrl,
+                'color'      => '#006d9f',
+            ];
+
             $data = [
                 'text' => '',
                 'attachments' => $message,
diff --git a/app/Domain/Tickets/Models/Tickets.php b/app/Domain/Tickets/Models/Tickets.php
index 20e4418e8c..20dae33c77 100644
--- a/app/Domain/Tickets/Models/Tickets.php
+++ b/app/Domain/Tickets/Models/Tickets.php
@@ -66,6 +66,8 @@ class Tickets
 
     public ?string $projectName = '';
 
+    public ?string $projectKey = null;
+
     public ?string $clientName = '';
 
     public ?string $userFirstname = '';
@@ -122,6 +124,7 @@ public function __construct(array|bool $values = false)
             $this->dependingTicketId = $values['dependingTicketId'] ?? '';
             $this->milestoneid = $values['milestoneid'] ?? '';
             $this->projectName = $values['projectName'] ?? '';
+            $this->projectKey = $values['projectKey'] ?? null;
             $this->clientName = $values['clientName'] ?? '';
             $this->userFirstname = $values['userFirstname'] ?? '';
             $this->userLastname = $values['userLastname'] ?? '';

From fb5aad851b55274e74c4066a13cc630a94a81e86 Mon Sep 17 00:00:00 2001
From: farukvukovic <104840615+farukvukovic@users.noreply.github.com>
Date: Wed, 4 Feb 2026 16:18:58 +0100
Subject: [PATCH 16/19] #5682 Logged hours not displayed in human readable
 format

---
 app/Domain/Tickets/Templates/showAll.tpl.php              | 2 +-
 app/Domain/Tickets/Templates/submodules/timesheet.sub.php | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/Domain/Tickets/Templates/showAll.tpl.php b/app/Domain/Tickets/Templates/showAll.tpl.php
index 47fffb5987..df7b025d21 100644
--- a/app/Domain/Tickets/Templates/showAll.tpl.php
+++ b/app/Domain/Tickets/Templates/showAll.tpl.php
@@ -135,7 +135,7 @@
                         <tr style="height:1px;">
                             <?php $tpl->dispatchTplEvent('allTicketsTable.afterRowStart', ['rowNum' => $rowNum, 'tickets' => $allTickets]); ?>
                             <td data-order="<?= $tpl->e($row['id']); ?>">
-                                <?php 
+                                <?php
                                 if (!empty($row['projectKey'])) {
                                     echo $tpl->escape($row['projectKey']) . '-' . $tpl->escape($row['id']);
                                 } else {
diff --git a/app/Domain/Tickets/Templates/submodules/timesheet.sub.php b/app/Domain/Tickets/Templates/submodules/timesheet.sub.php
index 712087182d..d05a929dc4 100644
--- a/app/Domain/Tickets/Templates/submodules/timesheet.sub.php
+++ b/app/Domain/Tickets/Templates/submodules/timesheet.sub.php
@@ -59,9 +59,9 @@
                 <br />
                 <canvas id="canvas"></canvas>
                 <p><br />
-                    <?php echo $tpl->__('label.planned_hours'); ?>: <?php echo $ticket->planHours; ?><br />
-                    <?php echo $tpl->__('label.booked_hours') ?>: <?php echo $tpl->get('timesheetsAllHours'); ?><br />
-                    <?php echo $tpl->__('label.actual_hours_remaining') ?>: <?php echo $remainingHours; ?><br />
+                    <?php echo $tpl->__('label.planned_hours'); ?>: <?php echo format_hours($ticket->planHours); ?><br />
+                    <?php echo $tpl->__('label.booked_hours') ?>: <?php echo format_hours($tpl->get('timesheetsAllHours')); ?><br />
+                    <?php echo $tpl->__('label.actual_hours_remaining') ?>: <?php echo format_hours($remainingHours); ?><br />
                 </p>
 
                 <div style="margin-top: 20px;">

From 6b9f9daf5e61d53e079475b94a9532c5ef87d50b Mon Sep 17 00:00:00 2001
From: farukvukovic <104840615+farukvukovic@users.noreply.github.com>
Date: Wed, 4 Feb 2026 17:51:32 +0100
Subject: [PATCH 17/19] #5796 Add ticket URL copy icon to Ticket window

---
 .../Templates/showTicketModal.blade.php       | 26 +++++++++++++------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/app/Domain/Tickets/Templates/showTicketModal.blade.php b/app/Domain/Tickets/Templates/showTicketModal.blade.php
index 0c204f98ae..297dfaed70 100644
--- a/app/Domain/Tickets/Templates/showTicketModal.blade.php
+++ b/app/Domain/Tickets/Templates/showTicketModal.blade.php
@@ -23,17 +23,27 @@
 <div style="min-width:70%">
 
     <?php if ($ticket->dependingTicketId > 0) { ?>
-        <small><a href="#/tickets/showTicket/<?= $ticket->dependingTicketId ?>"><?= $tpl->escape($ticket->parentHeadline) ?></a></small> //
+    <small><a
+            href="#/tickets/showTicket/<?= $ticket->dependingTicketId ?>"><?= $tpl->escape($ticket->parentHeadline) ?></a></small>
+
     <?php } ?>
-    <small class="tw-float-right tw-pr-md" style="padding:5px 30px 0px 0px">Created by <?php $tpl->e($ticket->userFirstname); ?> <?php $tpl->e($ticket->userLastname); ?> | Last Updated: <?= format($ticket->date)->date(); ?> </small>
+    <small class="tw-float-right tw-pr-md" style="padding:5px 30px 0px 0px">Created
+        by <?php $tpl->e($ticket->userFirstname); ?><?php $tpl->e($ticket->userLastname); ?> | Last
+        Updated: <?= format($ticket->date)->date(); ?> </small>
     <div class="title-button-wrapper">
-    <h1 class="tw-mb-0" style="margin-bottom:0px;"><i class="fa <?php echo $todoTypeIcons[strtolower($ticket->type)]; ?>"></i> <?php 
-        $projectKey = $ticket->projectKey ?? $projectData['projectKey'] ?? '';
-        echo !empty($projectKey) ? $projectKey . '-' : '#';
-    ?><?= $ticket->id ?> - <?php $tpl->e($ticket->headline); ?></h1>
-
+        <h1 class="tw-mb-0" style="margin-bottom:0px;">
+            <i class="fa fa-clone"
+               style="cursor: pointer; margin-left: 10px; font-size: 0.8em; color: #666;"
+               title="Copy ticket URL"
+               onclick="navigator.clipboard.writeText('<?php echo (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on' ? 'https' : 'http') . '://' . $_SERVER['HTTP_HOST'] . '/tickets/showKanban?tab=ticketdetails#' . $_SERVER['REQUEST_URI']; ?>').then(()=>{this.className='fa fa-check';this.style.color='#28a745';setTimeout(()=>{this.className='fa fa-clone';this.style.color='#666'},2000)})"></i>
+            <i class="fa <?php echo $todoTypeIcons[strtolower($ticket->type)]; ?>"></i>
+            <?php
+            $projectKey = $ticket->projectKey ?? $projectData['projectKey'] ?? '';
+            echo !empty($projectKey) ? $projectKey . '-' : '#';
+            ?><?= $ticket->id ?> - <?php $tpl->e($ticket->headline); ?>
+        </h1>
     </div>
-    <br />
+    <br/>
 
     <?php if ($login::userIsAtLeast($roles::$editor)) {
         $onTheClock = $tpl->get('onTheClock');

From 0931774292141e50a838a976a30408ea3d3c269e Mon Sep 17 00:00:00 2001
From: farukvukovic <104840615+farukvukovic@users.noreply.github.com>
Date: Thu, 12 Feb 2026 11:37:23 +0100
Subject: [PATCH 18/19] #5796 Move copy ticket url icon at the end of ticket
 title

---
 app/Domain/Tickets/Templates/showTicketModal.blade.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/Domain/Tickets/Templates/showTicketModal.blade.php b/app/Domain/Tickets/Templates/showTicketModal.blade.php
index 297dfaed70..c6ee586026 100644
--- a/app/Domain/Tickets/Templates/showTicketModal.blade.php
+++ b/app/Domain/Tickets/Templates/showTicketModal.blade.php
@@ -32,15 +32,15 @@
         Updated: <?= format($ticket->date)->date(); ?> </small>
     <div class="title-button-wrapper">
         <h1 class="tw-mb-0" style="margin-bottom:0px;">
-            <i class="fa fa-clone"
-               style="cursor: pointer; margin-left: 10px; font-size: 0.8em; color: #666;"
-               title="Copy ticket URL"
-               onclick="navigator.clipboard.writeText('<?php echo (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on' ? 'https' : 'http') . '://' . $_SERVER['HTTP_HOST'] . '/tickets/showKanban?tab=ticketdetails#' . $_SERVER['REQUEST_URI']; ?>').then(()=>{this.className='fa fa-check';this.style.color='#28a745';setTimeout(()=>{this.className='fa fa-clone';this.style.color='#666'},2000)})"></i>
             <i class="fa <?php echo $todoTypeIcons[strtolower($ticket->type)]; ?>"></i>
             <?php
             $projectKey = $ticket->projectKey ?? $projectData['projectKey'] ?? '';
             echo !empty($projectKey) ? $projectKey . '-' : '#';
             ?><?= $ticket->id ?> - <?php $tpl->e($ticket->headline); ?>
+            <i class="fa fa-clone"
+               style="cursor: pointer; margin-left: 10px; font-size: 0.8em; color: #666;"
+               title="Copy ticket URL"
+               onclick="navigator.clipboard.writeText('<?php echo (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on' ? 'https' : 'http') . '://' . $_SERVER['HTTP_HOST'] . '/tickets/showKanban?tab=ticketdetails#' . $_SERVER['REQUEST_URI']; ?>').then(()=>{this.className='fa fa-check';this.style.color='#28a745';setTimeout(()=>{this.className='fa fa-clone';this.style.color='#666'},2000)})"></i>
         </h1>
     </div>
     <br/>

From 72c577a6cf4585fbed591f1142a33dac1e3393f5 Mon Sep 17 00:00:00 2001
From: farukvukovic <104840615+farukvukovic@users.noreply.github.com>
Date: Thu, 12 Feb 2026 15:47:58 +0100
Subject: [PATCH 19/19] [#5746] Add Cube icon to Managment side menu

---
 .github/workflows/docker-production-deployment.yml        | 2 +-
 app/Core/Middleware/InitialHeaders.php                    | 2 +-
 app/Domain/Menu/Templates/partials/leftnav/item.blade.php | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker-production-deployment.yml b/.github/workflows/docker-production-deployment.yml
index 36e3e52f52..9b17554ae1 100644
--- a/.github/workflows/docker-production-deployment.yml
+++ b/.github/workflows/docker-production-deployment.yml
@@ -259,7 +259,7 @@ jobs:
           
           echo ""
           echo "[INFO] Testing endpoint..."
-          curl -I https://pearlog-prod.pearshadow.com || echo "Endpoint test failed"
+          curl -I https://pearlog.pearshadow.com || echo "Endpoint test failed"
           
           echo ""
           echo "[SUCCESS] Verification complete!"
diff --git a/app/Core/Middleware/InitialHeaders.php b/app/Core/Middleware/InitialHeaders.php
index 5c3730e4bf..8a7c3aabfe 100644
--- a/app/Core/Middleware/InitialHeaders.php
+++ b/app/Core/Middleware/InitialHeaders.php
@@ -32,7 +32,7 @@ public function handle($request, Closure $next): Response
             "img-src * 'self' *.leantime.io *.amazonaws.com data: blob: marketplace.localhost",
             "frame-src 'self' *.google.com *.microsoft.com *.live.com",
             "frame-ancestors 'self' *.google.com *.microsoft.com *.live.com",
-            "connect-src 'self' https://st-api.pearshadow.com http://host.docker.internal:3300 https://*.ngrok-free.app " . trim((string) (config('app.sihterice_address') ?? '')),
+            "connect-src 'self' https://st-api.pearshadow.com http://host.docker.internal:3300 https://*.ngrok-free.app http://localhost:3300" . trim((string) (config('app.sihterice_address') ?? '')),
         ];
         $cspParts = self::dispatchFilter('cspParts', $cspParts);
         $csp = implode(';', $cspParts);
diff --git a/app/Domain/Menu/Templates/partials/leftnav/item.blade.php b/app/Domain/Menu/Templates/partials/leftnav/item.blade.php
index 925d073689..f80325d87e 100644
--- a/app/Domain/Menu/Templates/partials/leftnav/item.blade.php
+++ b/app/Domain/Menu/Templates/partials/leftnav/item.blade.php
@@ -18,6 +18,9 @@ class='active'
                @endforeach
            @endif
         >
+            @if(isset($menuItem['icon']) && !str_starts_with(trim((string)($menuItem['title'] ?? '')), '<'))
+                <span class="{{ $menuItem['icon'] }}"></span>
+            @endif
             {!! $menuItem['title'] !!}
         </a>
     </li>