From 16ad7129af10cdb9c9125dcd95f03f58ccabac66 Mon Sep 17 00:00:00 2001
From: Marcel Folaron <marcel.folaron@gmail.com>
Date: Sat, 24 Aug 2024 02:35:20 -0400
Subject: [PATCH] Timesheet fixes

---
 app/Domain/Timesheets/Templates/showAll.tpl.php | 2 +-
 app/Domain/Timesheets/Templates/showMy.tpl.php  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Domain/Timesheets/Templates/showAll.tpl.php b/app/Domain/Timesheets/Templates/showAll.tpl.php
index 2931f8e2b..0df280dab 100644
--- a/app/Domain/Timesheets/Templates/showAll.tpl.php
+++ b/app/Domain/Timesheets/Templates/showAll.tpl.php
@@ -243,7 +243,7 @@
                         <td data-order="<?=$tpl->e($row['clientName']); ?>"><a href="<?=BASE_URL ?>/clients/showClient/<?php echo $row['clientId']; ?>"><?php $tpl->e($row['clientName']); ?></a></td>
 
                         <td><?php printf($tpl->__("text.full_name"), $tpl->escape($row["firstname"]), $tpl->escape($row['lastname'])); ?></td>
-                        <td><?php echo $tpl->__($tpl->get('kind')[$row['kind']]); ?></td>
+                        <td><?php echo $tpl->__($tpl->get('kind')[$row['kind'] ?? 'GENERAL_BILLABLE'] ?? $tpl->get('kind')['GENERAL_BILLABLE']); ?></td>
 
                         <td><?php echo $tpl->escape($row["milestone"]); ?></td>
                         <td><?php echo $tpl->escape($row["tags"]); ?></td>
diff --git a/app/Domain/Timesheets/Templates/showMy.tpl.php b/app/Domain/Timesheets/Templates/showMy.tpl.php
index d6c6e14f0..c9cd52876 100644
--- a/app/Domain/Timesheets/Templates/showMy.tpl.php
+++ b/app/Domain/Timesheets/Templates/showMy.tpl.php
@@ -293,7 +293,7 @@
                                     <a href="#/tickets/showTicket/<?php echo $timeRow['ticketId']; ?>"><?php $tpl->e($timeRow['headline']); ?></a>
                                 </td>
                                 <td width="10%">
-                                <?php echo $tpl->__($tpl->get('kind')[$timeRow['kind']]); ?>
+                                <?php echo $tpl->__($tpl->get('kind')[$row['kind'] ?? 'GENERAL_BILLABLE'] ?? $tpl->get('kind')['GENERAL_BILLABLE']); ?>
                             <?php if ($timeRow['hasTimesheetOffset']) { ?>
                                     <i class="fa-solid fa-clock-rotate-left pull-right label-blue"
                                        data-tippy-content="This entry was likely created using a different timezone. Only existing entries can be updated in this timezone">