joseph
/
ManagementSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: joseph:b52537cfe446628664843649059182f774ca1ab8
Branches Tags
joseph:master
joseph:dev
joseph:vi
joseph:vi.ticket-email
joseph:that-fe
joseph:truong-leave-day
joseph:vi.document
joseph:truong-frame-drawio
joseph:truong-report-excel
joseph:Truong-CreateAutoTicketKPhep
joseph:Sprint-4/MS-37-FE-Evaluation
joseph:Sprint-4/MS-36-FE-Technical
joseph:joseph.update_navbar_permissions
joseph:Sprint-4/MS-38-BE-Evaluation
joseph:Sprint-4/MS-35-BE-Technical
joseph:joseph.Update_personnel_allocation
joseph:Sprint-3/MS-23
joseph:Sprint-3/MS-28
joseph:Sprint-3/MS-26
joseph:Sprint-3/MS-24
joseph:truong-sprint-1
..
compare: joseph:ee281986b8b50dec12777818ff4626f578c79622
Branches Tags
joseph:master
joseph:dev
joseph:vi
joseph:vi.ticket-email
joseph:that-fe
joseph:truong-leave-day
joseph:vi.document
joseph:truong-frame-drawio
joseph:truong-report-excel
joseph:Truong-CreateAutoTicketKPhep
joseph:Sprint-4/MS-37-FE-Evaluation
joseph:Sprint-4/MS-36-FE-Technical
joseph:joseph.update_navbar_permissions
joseph:Sprint-4/MS-38-BE-Evaluation
joseph:Sprint-4/MS-35-BE-Technical
joseph:joseph.Update_personnel_allocation
joseph:Sprint-3/MS-23
joseph:Sprint-3/MS-28
joseph:Sprint-3/MS-26
joseph:Sprint-3/MS-24
joseph:truong-sprint-1

No commits in common. "b52537cfe446628664843649059182f774ca1ab8" and "ee281986b8b50dec12777818ff4626f578c79622" have entirely different histories.
b52537cfe4 ... ee281986b8

2 changed files with 5 additions and 5 deletions
Show Stats Expand all files Collapse all files

6
BACKEND/Modules/Admin/app/Http/Controllers/TicketController.php
View File

@ -1125,7 +1125,7 @@ class TicketController extends Controller
if ($type == 'S') { if ($type == 'S') {
$end = $date->copy()->setTime(11, 30, 0); $end = $date->copy()->setTime(11, 30, 0);
} else if ($type == 'C') { } else if ($type == 'C') {
$start = $date->copy()->setTime(13, 0, 0); $start = $date->copy()->setTime(11, 30, 0);
} }
Tracking::insert([ Tracking::insert([
@ -1134,14 +1134,14 @@ class TicketController extends Controller
'user_id' => $user->id, 'user_id' => $user->id,
'status' => 'check in', 'status' => 'check in',
'time_string' => $start->format('Y-m-d H:i:s'), 'time_string' => $start->format('Y-m-d H:i:s'),
'created_at' => $start->setTimezone(env('TIME_ZONE')) 'created_at' => $start->setTimezone('UTC')
], ],
[ [
'name' => $user->name, 'name' => $user->name,
'user_id' => $user->id, 'user_id' => $user->id,
'status' => 'check out', 'status' => 'check out',
'time_string' => $end->format('Y-m-d H:i:s'), 'time_string' => $end->format('Y-m-d H:i:s'),
'created_at' => $end->setTimezone(env('TIME_ZONE')) 'created_at' => $end->setTimezone('UTC')
] ]
]); ]);
//WFH - end tracking //WFH - end tracking

4
BACKEND/Modules/Admin/app/Http/Controllers/TimekeepingController.php
View File

@ -78,14 +78,14 @@ class TimekeepingController extends Controller
'user_id' => $user->id, 'user_id' => $user->id,
'status' => 'check in', 'status' => 'check in',
'time_string' => $start->format('Y-m-d H:i:s'), 'time_string' => $start->format('Y-m-d H:i:s'),
'created_at' => $start->setTimezone(env('TIME_ZONE')) 'created_at' => $start->setTimezone('UTC')
], ],
[ [
'name' => $user->name, 'name' => $user->name,
'user_id' => $user->id, 'user_id' => $user->id,
'status' => 'check out', 'status' => 'check out',
'time_string' => $end->format('Y-m-d H:i:s'), 'time_string' => $end->format('Y-m-d H:i:s'),
'created_at' => $end->setTimezone(env('TIME_ZONE')) 'created_at' => $end->setTimezone('UTC')
] ]
]); ]);
} }