Develop -> Main

app/Domain/Tickets/Templates/showKanban.tpl.php

@@ -265,10 +265,15 @@ class="ticketBox moveable container priority-border-<?= $row['priority']?>"
                                                     <?php if ($row['dependingTicketId'] > 0) { ?>
                                                         <small><a href="#/tickets/showTicket/<?= $row['dependingTicketId'] ?>" class="form-modal"><?= $tpl->escape($row['parentHeadline']) ?></a></small> //
                                                     <?php } ?>
-                                                    <small><i class="fa <?php echo $todoTypeIcons[strtolower($row['type'])]; ?>"></i> <?php echo $tpl->__('label.'.strtolower($row['type'])); ?></small>
+                                                    <small><i class="fa <?php echo $todoTypeIcons[strtolower($row['type'])]; ?>"></i></small>
                                                     <small><?php echo (!empty($row['projectKey']) ? $row['projectKey'] . '-' : '#') . $row['id']; ?></small>
                                                     <div class="kanbanCardContent">
-                                                        <h4><a href="#/tickets/showTicket/<?php echo $row['id']; ?>" data-hx-get="<?= BASE_URL?>/tickets/showTicket/<?php echo $row['id']; ?>" hx-swap="none" preload="mouseover"><?php $tpl->e($row['headline']); ?></a></h4>
+                                                        <h4>
+                                                            <?php if (isset($row['pinned']) && $row['pinned']) { ?>
+                                                                <i class="fa fa-thumbtack" style="color: #dc3545; margin-right: 5px; transform: rotate(45deg);" data-tippy-content="Pinned to top"></i>
+                                                            <?php } ?>
+                                                            <a href="#/tickets/showTicket/<?php echo $row['id']; ?>" data-hx-get="<?= BASE_URL?>/tickets/showTicket/<?php echo $row['id']; ?>" hx-swap="none" preload="mouseover"><?php $tpl->e($row['headline']); ?></a>
+                                                        </h4>
 
                                                         <div class="kanbanContent" style="margin-bottom: 20px">
                                                             <?php echo $tpl->escapeMinimalRemoveImage($row['description']); ?>

app/Domain/Tickets/Templates/submodules/ticketDetails.sub.php

@@ -184,6 +184,22 @@ class="complexEditor"><?php echo $ticket->description !== null ? htmlentities($t
             </div>
         </div>
 
+        <?php if ($ticket->id) {?>
+        <h4 class="widgettitle title-light"><span
+                    class="fa-solid fa-comments"></span><?php echo $tpl->__('subtitles.discussion'); ?></h4>
+
+        <div class="row-fluid">
+        <form method="post" action="<?= BASE_URL ?>/tickets/showTicket/<?php echo $ticket->id; ?>" class="formModal">
+            <input type="hidden" name="comment" value="1" />
+            <?php
+            $tpl->assign('formUrl', ''.BASE_URL.'/tickets/showTicket/'.$ticket->id.'');
+
+            $tpl->displaySubmodule('comments-generalComment');
+        ?>
+        </form>
+        </div>
+        <?php } ?>
+
 <div class="status-change-log" id="status-change-log" data-ticket-id="<?= $ticket->id ?>"></div>
 
 <script>
@@ -308,19 +324,6 @@ function loadStatusHistory(ticketId) {
                 Loading Subtasks ...<br /><br />
             </div>
 
-        <h4 class="widgettitle title-light"><span
-                    class="fa-solid fa-comments"></span><?php echo $tpl->__('subtitles.discussion'); ?></h4>
-
-        <div class="row-fluid">
-        <form method="post" action="<?= BASE_URL ?>/tickets/showTicket/<?php echo $ticket->id; ?>" class="formModal">
-            <input type="hidden" name="comment" value="1" />
-            <?php
-            $tpl->assign('formUrl', ''.BASE_URL.'/tickets/showTicket/'.$ticket->id.'');
-
-            $tpl->displaySubmodule('comments-generalComment');
-        ?>
-        </form>
-        </div>
         <?php } ?>
     </div>
     <div class="col-md-3">

app/Domain/Timesheets/Controllers/ShowMyMonthlyTimesheet.php

@@ -0,0 +1,82 @@
+<?php
+
+namespace Leantime\Domain\Timesheets\Controllers;
+
+use Leantime\Core\Controller\Controller;
+use Leantime\Domain\Auth\Models\Roles;
+use Leantime\Domain\Auth\Services\Auth;
+use Leantime\Domain\Projects\Repositories\Projects as ProjectRepository;
+use Leantime\Domain\Tickets\Repositories\Tickets as TicketRepository;
+use Leantime\Domain\Timesheets\Repositories\Timesheets as TimesheetRepository;
+use Leantime\Domain\Timesheets\Services\Timesheets as TimesheetService;
+use Symfony\Component\HttpFoundation\Response;
+use Leantime\Domain\Timesheets\Services\ShowMyMonthlyTimesheetService as MonthlyTimesheetService;
+
+class ShowMyMonthlyTimesheet extends Controller
+{
+    private TimesheetService $timesheetService;
+
+    private TimesheetRepository $timesheetRepo;
+
+    private ProjectRepository $projects;
+
+    private TicketRepository $tickets;
+
+    private MonthlyTimesheetService $monthlyTimesheetService;
+
+    public function init(
+        TimesheetService $timesheetService,
+        TimesheetRepository $timesheetRepo,
+        ProjectRepository $projects,
+        TicketRepository $tickets,
+        MonthlyTimesheetService $monthlyTimesheetService
+    ): void {
+        $this->timesheetService = $timesheetService;
+        $this->timesheetRepo = $timesheetRepo;
+        $this->projects = $projects;
+        $this->tickets = $tickets;
+        $this->monthlyTimesheetService = $monthlyTimesheetService;
+    }
+
+    public function run(): Response
+    {
+        Auth::authOrRedirect([Roles::$owner, Roles::$admin, Roles::$manager, Roles::$editor], true);
+
+        $fromDate = dtHelper()->userNow()->startOfMonth();
+
+        $kind = 'all';
+        if (isset($_POST['search'])) {
+            if (! empty($_POST['startDate'])) {
+                try {
+                    $fromDate = dtHelper()->parseUserDateTime($_POST['startDate'])->startOfMonth();
+                } catch (\Exception $e) {
+                    $this->tpl->setNotification('Could not parse date', 'error', 'save_timesheet');
+                }
+            }
+        }
+
+        if (isset($_POST['saveTimeSheet'])) {
+            $this->monthlyTimesheetService->saveTimeSheet($_POST);
+        }
+
+        $fromDateDb = $fromDate->copy()->setToDbTimezone();
+        $myTimesheets = $this->timesheetService->getWeeklyTimesheets(-1, $fromDateDb, session('userdata.id'));
+        $existingTicketIds = array_map(fn($item) => $item['ticketId'], $myTimesheets);
+
+        $this->tpl->assign('existingTicketIds', $existingTicketIds);
+        $this->tpl->assign('dateFrom', $fromDate);
+        $this->tpl->assign('actKind', $kind);
+        $this->tpl->assign('kind', $this->timesheetRepo->kind);
+        $this->tpl->assign('allProjects', $this->projects->getUserProjects(
+            userId: session('userdata.id'),
+            projectTypes: 'project'
+        ));
+        $this->tpl->assign('allTickets', $this->tickets->getUsersTickets(
+            id: session('userdata.id'),
+            limit: -1
+        ));
+        $this->tpl->assign('allTimesheets', $myTimesheets);
+
+        return $this->tpl->display('timesheets.showMyMonthlyTimesheet');
+    }
+}

app/Domain/Timesheets/Controllers/SlackMonthlyReportController.php

@@ -35,16 +35,4 @@ public function sendCsvFromUsersProfilesWhichHaveTickboxTrue(): Response
     }
     return Frontcontroller::redirect(BASE_URL.'/timesheets/showAll');
 }
-
-public function sendCsvFromAllProfiles(): Response
-{
-    if(Auth::userIsAtLeast(Roles::$admin)) {
-        $allProfiles = $this->slackReportService->getAllProfiles();
-
-        $this->slackReportService->sendAutomaticMonthlyReportToSlack($allProfiles);
-
-        return Frontcontroller::redirect(BASE_URL.'/timesheets/showAll');
-    }
-    return Frontcontroller::redirect(BASE_URL.'/timesheets/showAll');
-}
 }

app/Domain/Timesheets/Services/ShowMyMonthlyTimesheetService.php

@@ -0,0 +1,82 @@
+<?php
+
+namespace Leantime\Domain\Timesheets\Services;
+
+use Leantime\Domain\Timesheets\Services\Timesheets as TimesheetService;
+use Leantime\Core\UI\Template;
+
+
+class ShowMyMonthlyTimesheetService
+{
+    private TimesheetService $timesheetService;
+    private Template $tpl;
+
+    public function __construct(TimesheetService $timesheetService, Template $tpl)
+    {
+        $this->timesheetService = $timesheetService;
+        $this->tpl = $tpl;
+    }
+
+    public function saveTimeSheet(array $postData): void
+    {
+        foreach ($postData as $key => $dateEntry) {
+
+            $tempData = explode('|', $key);
+
+            if (count($tempData) === 4) {
+                $ticketId = $tempData[0];
+                $kind = $tempData[1];
+                $date = $tempData[2];
+                $timestamp = $tempData[3];
+                $hours = $dateEntry;
+
+                if ($ticketId === 'new' || $ticketId === 0) {
+                    $ticketId = (int) $postData['ticketId'];
+                    $kind = $postData['kindId'];
+
+                    if ($ticketId == 0 && $hours > 0) {
+                        $this->tpl->setNotification('Task ID is required for new entries', 'error', 'save_timesheet');
+
+                        return;
+                    }
+                }
+
+                $parsedHours = $hours;
+                if (!empty($hours) && !is_numeric($hours)) {
+                    try {
+                        $parser = app(\Leantime\Domain\Timesheets\Services\TimeParser::class);
+                        $parsedHours = $parser->parseTimeToDecimal($hours);
+
+                        if ($parsedHours > 24 * 365) {
+                            throw new \InvalidArgumentException('Time value is unreasonably large. Please enter a valid amount of time.');
+                        }
+                    } catch (\InvalidArgumentException $e) {
+                        $this->tpl->setNotification($e->getMessage(), 'error', 'time_parse_error');
+
+                        continue;
+                    }
+                }
+
+                $values = [
+                    'userId' => session('userdata.id'),
+                    'ticket' => $ticketId,
+                    'date' => $date,
+                    'timestamp' => $timestamp,
+                    'hours' => $parsedHours,
+                    'kind' => $kind,
+                ];
+
+                if ($timestamp !== 'false' && $timestamp != false) {
+                    try {
+                        $this->timesheetService->upsertTime($ticketId, $values);
+                        $this->tpl->setNotification('Timesheet saved successfully', 'success', 'save_timesheet');
+                    } catch (\Exception $e) {
+                        $this->tpl->setNotification('Error logging time: ' . $e->getMessage(), 'error', 'save_timesheet');
+                        report($e);
+                        continue;
+                    }
+                }
+            }
+        }
+    }
+}

app/Domain/Timesheets/Services/SlackMonthlyReportService.php

@@ -9,7 +9,7 @@
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\ClientException;
 use Leantime\Domain\Users\Services\Users as UserService;
-use Illuminate\Support\Facades\Cache;
+use Leantime\Core\UI\Template;
 
 class SlackMonthlyReportService {
     private string $webhookUrl;
@@ -18,20 +18,23 @@ class SlackMonthlyReportService {
     private SettingRepository $settingRepository;
     private UserService $userService;
     private \GuzzleHttp\Client $httpClient;
+    private Template $tpl;
 
 public function __construct(
     TimesheetService $timesheetsService,
     TicketService $ticketService,
     SettingRepository $settingRepository,
     \GuzzleHttp\Client $httpClient,
-    UserService $userService
+    UserService $userService,
+    Template $tpl
 ) {
     $this->webhookUrl = env('SLACK_WEBHOOK_URL', '');
     $this->timesheetsService = $timesheetsService;
     $this->ticketService = $ticketService;
     $this->settingRepository = $settingRepository;
     $this->httpClient = $httpClient;
     $this->userService = $userService;
+    $this->tpl = $tpl;
 }
 
     private function getFiltersFromRequest(): array
@@ -184,6 +187,14 @@ public function getAllProfiles(): array {
 
    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;
@@ -212,6 +223,11 @@ public function sendMonthlyReportToSlack($profilesWithEnabledAutoExport): void
 
         $this->sendCsvToSlack($csvContent, $reportName);
     }
+    $this->tpl->setNotification(
+        'Monthly reports successfully sent to Slack.',
+        'success',
+        'save_timesheet'
+    );
 }
 
 private function sendCsvToSlack(string $csvContent, string $profileName): bool
@@ -349,10 +365,11 @@ private function generateCsvString(array $filters, array $columnState = []): str
     fprintf($output, chr(0xEF).chr(0xBB).chr(0xBF));
 
     fputcsv($output, array_values($headers));
+    $totalHours = 0;
 
     foreach ($allTimesheets as $row) {
         $diff = $row['planHours'] - $row['hours'];
-
+        $totalHours += (float) $row['hours'];
         $rowData = [
             'id' => $row['id'],
             'tickId' => $row['ticketId'],
@@ -376,6 +393,34 @@ private function generateCsvString(array $filters, array $columnState = []): str
         $filteredRow = array_intersect_key($rowData, $activeColumns);
         fputcsv($output, array_values($filteredRow));
     }
+        $totalsRowData = [
+        'id' => '',
+        'tickId' => '',
+        'date' => '',
+        'ticket' => '',
+        'hours' => format_hours($totalHours, $hoursFormat),
+        'planHours' => '',
+        'difference' => '',
+        'project' => '',
+        'client' => '',
+        'employee' => '',
+        'type' => '',
+        'milestone' => '',
+        'tags' => '',
+        'description' => '',
+        'invoiced' => '',
+        'mgrApproval' => '',
+        'paid' => ''
+    ];
+
+    foreach($totalsRowData as $key => $value) {
+        if (isset($activeColumns[$key]) && isset($activeColumns['hours'])) {
+            $totalsRowData[$key] = 'TOTAL';
+            break;
+        }
+    }
+    $filteredTotalsRow = array_intersect_key($totalsRowData, $activeColumns);
+    fputcsv($output, array_values($filteredTotalsRow));
 
     rewind($output);
     $csvContent = stream_get_contents($output);

app/Domain/Timesheets/Services/Timesheets.php

@@ -403,6 +403,8 @@ public function getWeeklyTimesheets(int $projectId, CarbonInterface $fromDate, i
                     'name' => $timesheet['name'],
                     'headline' => $timesheet['headline'],
                     'ticketId' => $timesheet['ticketId'],
+                    'projectId' => $timesheet['projectId'],
+                    'projectKey' => $timesheet['projectKey'],
                     'hasTimesheetOffset' => $workdateOffsetStart !== 0,
                     'day1' => [
                         'start' => $fromDate,

app/Domain/Timesheets/Templates/showAll.tpl.php

@@ -148,16 +148,12 @@ function updateProjectCountInline() {
 <div class="maincontent">
     <div class="maincontentinner">
         <div style="float:left;">
-        <button class="dt-button" onclick="exportToSlack()" style = "padding: 4px 14px;">Export to Slack</button>
-</div>
-    </form>
-    <script>
-        function exportToSlack() {
-            fetch('<?= BASE_URL?>/timesheets/slackMonthlyReportController/sendCsvFromUsersProfilesWhichHaveTickboxTrue', {
-                method: 'POST'
-            });
-        }
-</script>
+            <?php echo $tpl->displayNotification() ?>
+            <form id="exportSlackForm" action="<?= BASE_URL ?>/timesheets/slackMonthlyReportController/sendCsvFromUsersProfilesWhichHaveTickboxTrue" method="post" style="display:none;"></form>
+                <button class="dt-button" onclick="document.getElementById('exportSlackForm').submit();" style="padding: 4px 14px;">
+                Export to Slack
+            </button>
+        </div>  
         <form action="<?php echo BASE_URL ?>/timesheets/showAll" method="post" id="form" name="form">
             <div class="pull-right">
                 <div id="tableButtons" style="display:inline-block; vertical-align: middle;"></div>