Jingga/oms-HumanResourceTimeRecording
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-HumanResourceTimeRecording.git synced 2026-01-11 03:48:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix bugs

Browse Source
This commit is contained in:
Dennis Eichhorn 2024-04-12 00:52:06 +00:00
parent e90d6f8e90
commit c74dfde014
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Admin/Install/Navigation.install.json
View File

@ -5,7 +5,7 @@
"type": 2,
"subtype": 1,
"name": "TimeRecording",
"uri": "{/base}/humanresource/timerecording/dashboard?{?}",
"uri": "{/base}/humanresource/timerecording/dashboard",
"target": "self",
"icon": null,
"order": 70,
@ -19,7 +19,7 @@
"type": 3,
"subtype": 1,
"name": "Dashboard",
"uri": "{/base}/humanresource/timerecording/dashboard?{?}",
"uri": "{/base}/humanresource/timerecording/dashboard",
"target": "self",
"icon": null,
"order": 1,
@ -34,7 +34,7 @@
"type": 3,
"subtype": 1,
"name": "Stats",
"uri": "{/base}/humanresource/timerecording/stats?{?}",
"uri": "{/base}/humanresource/timerecording/stats",
"target": "self",
"icon": null,
"order": 1,
@ -51,7 +51,7 @@
"type": 2,
"subtype": 1,
"name": "TimeRecording",
"uri": "{/base}/private/timerecording/dashboard?{?}",
"uri": "{/base}/private/timerecording/dashboard",
"target": "self",
"icon": null,
"order": 1,

3
Controller/ApiController.php
View File

@ -147,6 +147,8 @@ final class ApiController extends Controller
return;
}
$this->createModel($request->header->account, $element, SessionElementMapper::class, 'element', $request->getOrigin());
if ($element->status === ClockingStatus::END) {
/** @var \Modules\HumanResourceTimeRecording\Models\Session $session */
$session = SessionMapper::get()
@ -158,7 +160,6 @@ final class ApiController extends Controller
SessionMapper::update()->execute($session);
}
$this->createModel($request->header->account, $element, SessionElementMapper::class, 'element', $request->getOrigin());
$this->createStandardCreateResponse($request, $response, $element);
}

2
Models/Session.php
View File

@ -124,7 +124,7 @@ class Session implements \JsonSerializable
}
}
$this->start = $start;
$this->start = $start ?? $this->start;
$this->end = $end;
$busyTime = 0;