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

Compare commits

base: joseph:efaf906f0aae396670a9f5c1fbcbbf111dc3c1b0
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:da0bb9ad0dec5fb086135e8c4841e0d16ce8bb55
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

4 Commits
efaf906f0a ... da0bb9ad0d

Author SHA1 Message Date
joseph da0bb9ad0d Merge pull request 'dev' (#136) from dev into master 
Reviewed-on: #136
 2025-07-31 12:47:25 +10:00
joseph d3d9acb1ce Merge pull request 'fix calculate work time' (#135) from vi.ticket-email into dev 
Reviewed-on: #135
 2025-07-31 12:32:10 +10:00
dbdbd9 b52537cfe4 fix calculate work time 2025-07-31 09:14:33 +07:00
dbdbd9 4f6f3dd803 Merge branch 'dev' of https://gitea.nswteam.net/joseph/ManagementSystem into vi.ticket-email 2025-07-02 07:46:58 +07:00
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(11, 30, 0); $start = $date->copy()->setTime(13, 0, 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('UTC') 'created_at' => $start->setTimezone(env('TIME_ZONE'))
], ],
[ [
'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('UTC') 'created_at' => $end->setTimezone(env('TIME_ZONE'))
] ]
]); ]);
//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('UTC') 'created_at' => $start->setTimezone(env('TIME_ZONE'))
], ],
[ [
'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('UTC') 'created_at' => $end->setTimezone(env('TIME_ZONE'))
] ]
]); ]);
} }