Merge pull request #2420 from Leantime/timesheet-Refactor

updates to tests
Leantime · Mar 18, 2024 · f650db6 · f650db6
2 parents 810a631 + 133e540
commit f650db6
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 9 deletions.
diff --git a/app/Core/Support/Format.php b/app/Core/Support/Format.php
@@ -276,6 +276,6 @@ public function percent(): string
      */
     public function decimal(): string
     {
-        return number_format($this->value, 2);
+        return number_format((float)$this->value, 2);
     }
 }
diff --git a/app/Domain/Api/Controllers/Jsonrpc.php b/app/Domain/Api/Controllers/Jsonrpc.php
@@ -366,12 +366,15 @@ private function returnResponse(array|null $returnValue, string $id = null): Res
      */
     private function returnError(string $errorMessage, int $errorcode, mixed $additional_info = null, int|string|null $id = 0): Response
     {
+
+        //TODO: And FYI. json_encode cannot encode throwable. https://github.com/pmjones/throwable-properties
+        //For now we'll just return the message
         return $this->tpl->displayJson([
             'jsonrpc' => '2.0',
             'error' => [
                 'code' => $errorcode,
                 'message' => $errorMessage,
-                'data' => $additional_info,
+                'data' => $additional_info->getMessage(),
             ],
             'id' => $id,
         ]);

diff --git a/app/Domain/Timesheets/Repositories/Timesheets.php b/app/Domain/Timesheets/Repositories/Timesheets.php
@@ -856,12 +856,15 @@ public function punchOut(int $ticketId): float|false|int
                   VALUES (:sessionId, :ticketId, :workDate, :hoursWorked, 'GENERAL_BILLABLE')
                   ON DUPLICATE KEY UPDATE hours = hours + :hoursWorked";
 
+
+        $userStartOfDay = dtHelper()::createFromTimestamp($inTimestamp)->setToUserTimezone()->startOfDay();
+
         $call = $this->dbcall(func_get_args(), ['dbcall_key' => 'insert']);
         $call->prepare($query);
         $call->bindValue(':ticketId', $ticketId);
         $call->bindValue(':sessionId', $_SESSION['userdata']['id']);
         $call->bindValue(':hoursWorked', $hoursWorked);
-        $call->bindValue(':workDate', (new Carbon($inTimestamp, $_SESSION['usersettings.timezone']))->setTimezone('UTC'));
+        $call->bindValue(':workDate', $userDay->formatDateTimeForDb());
 
         $call->execute();
 

diff --git a/app/Domain/Timesheets/Templates/editTime.tpl.php b/app/Domain/Timesheets/Templates/editTime.tpl.php
@@ -36,7 +36,7 @@
         jQuery(document).ready(function ($) {
             jQuery("#datepicker, #date, #invoicedCompDate, #invoicedEmplDate, #paidDate").datepicker({
                 numberOfMonths: 1,
-                dateFormat:  leantime.dateHelper.getFormatFromSettings("dateformat", "jquery")
+                dateFormat:  leantime.dateHelper.getFormatFromSettings("dateformat", "jquery"),
                 dayNames: leantime.i18n.__("language.dayNames").split(","),
                 dayNamesMin:  leantime.i18n.__("language.dayNamesMin").split(","),
                 dayNamesShort: leantime.i18n.__("language.dayNamesShort").split(","),

diff --git a/app/Domain/Timesheets/Templates/showMy.tpl.php b/app/Domain/Timesheets/Templates/showMy.tpl.php
@@ -391,7 +391,7 @@ class="hourCell"
                             $i = 0;
                             foreach ($days as $day) {
                                 ?>
-                                <td width="7%" class="rowday<?php echo ($i + 1); ?><?php if ($dateFrom->addDays($i)->isToday()) {
+                                <td width="7%" class="rowday<?php echo ($i + 1); ?><?php if ($dateFrom->addDays($i)->setToUserTimezone()->isToday()) {
                                     echo " active";
                                                             } ?>">
                                     <input type="text" class="hourCell" name="new|GENERAL_BILLABLE|<?php echo $dateFrom->addDays($i)->formatDateForUser() ?>|<?php echo $dateFrom->addDays($i)->getTimestamp() ?>" value="0" />

diff --git a/tests/Acceptance/TimesheetCest.php b/tests/Acceptance/TimesheetCest.php
@@ -218,9 +218,6 @@ public function deleteTimesheet(AcceptanceTester $I): void
         $I->see('Should the timesheet really be deleted?');
 
         $I->click('.nyroModalLink .button');
-        $I->waitForElement('.growl', 60);
-        $I->wait(1);
-        $I->see('Time entry deleted successfully');
 
         $I->waitForElementVisible('#allTimesheetsTable');
         $I->cantSee('#1 - Edit');
@@ -240,7 +237,6 @@ private function changeUsersTimeZone(AcceptanceTester $I, string $timezone = 'Am
         $I->waitForElementVisible('#timezone');
         $I->selectOption('#timezone', $timezone);
         $I->click('#saveSettings');
-        $I->waitForElement('.growl', 120);
 
         $I->seeInDatabase('zp_settings', [
             'key' => 'usersettings.1.timezone',