Commit Graph

492 Commits

Author SHA1 Message Date
Truong Vo 0ebe4c772e Bổ sung biểu đồ drawio cho trang allocation 2025-02-21 11:11:37 +07:00
Truong Vo 281c8ad98a Bổ sung biểu đồ drawio cho trang allocation 2025-02-21 10:51:27 +07:00
joseph a2e36501bb Merge pull request 'Update StaffEvaluation.tsx' (#110) from that-fe into master
Reviewed-on: #110
2025-02-17 20:40:24 +11:00
nguentrungthat 04ee5e4081 Merge branch 'master' into that-fe 2025-02-17 16:40:14 +07:00
nguentrungthat 15880f8bd1 Update StaffEvaluation.tsx 2025-02-17 16:39:35 +07:00
joseph 6c5b2d8412 Merge pull request 'Update view detail Working review' (#109) from that-fe into master
Reviewed-on: #109
2025-02-17 20:30:32 +11:00
nguentrungthat f5e4d7b405 Update view detail Working review 2025-02-17 16:14:52 +07:00
joseph 5cfd78d2c0 Merge pull request 'Update check working' (#108) from that-fe into master
Reviewed-on: #108
2025-02-17 13:28:07 +11:00
nguentrungthat 2bda35d8d3 Merge branch 'master' into that-fe 2025-02-14 16:53:26 +07:00
nguentrungthat be6d7be79e Update check working 2025-02-14 16:51:46 +07:00
joseph f60be27969 Merge pull request 'Update select query' (#107) from that-fe into master
Reviewed-on: #107
2025-02-14 19:57:17 +11:00
nguentrungthat 73edecf341 Update select query 2025-02-14 10:49:12 +07:00
nguentrungthat 13a477e883 Update TrackingController.php 2025-02-14 10:44:42 +07:00
joseph 471cc0eb2a Merge pull request 'Update' (#106) from that-fe into master
Reviewed-on: #106
2025-02-14 14:35:08 +11:00
nguentrungthat 1887f2805f Merge branch 'master' into that-fe 2025-02-14 09:43:56 +07:00
nguentrungthat bb12c55ef6 Update TrackingController.php 2025-02-14 09:43:21 +07:00
nguentrungthat 49b681566d fix 2025-02-14 09:42:08 +07:00
joseph 9b472544b6 Merge pull request 'Update Working review' (#105) from that-fe into master
Reviewed-on: #105
2025-02-14 12:22:28 +11:00
nguentrungthat 5cdfaafe03 fic build 2025-02-14 08:03:05 +07:00
nguentrungthat 8107978a42 Merge branch 'master' into that-fe 2025-02-14 07:47:03 +07:00
nguentrungthat 846df81d44 Update Working review 2025-02-13 17:01:52 +07:00
joseph 5165ded25e Merge pull request 'Update' (#104) from that-fe into master
Reviewed-on: #104
2025-02-07 19:32:13 +11:00
nguentrungthat 7ce7251097 Merge branch 'master' of https://gitea.nswteam.net/joseph/ManagementSystem into that-fe 2025-02-07 15:31:40 +07:00
nguentrungthat f05334ea34 Update 2025-02-07 15:23:03 +07:00
joseph 4d94e26bb9 Merge pull request 'master' (#103) from master into dev
Reviewed-on: #103
2025-02-07 19:00:27 +11:00
joseph fc6587bcff Merge pull request 'Update Project Review, export' (#102) from that-fe into master
Reviewed-on: #102
2025-02-07 18:59:52 +11:00
nguentrungthat 174c8889ce Update Project Review, export 2025-02-07 14:42:31 +07:00
nguentrungthat 4fd18b988e Update 2025-02-06 13:16:07 +07:00
Joseph 9532845bc3 update 2025-02-03 16:20:00 +07:00
Joseph 38780c56a8 update 2025-01-21 15:47:13 +07:00
Joseph b908185658 update tracking 2025-01-21 13:35:04 +07:00
root 07d28e24cd add script detect face 2025-01-17 14:50:09 +07:00
Joseph d80e7c0957 update jwt expried 2025-01-16 14:30:04 +07:00
Joseph eb5c6e655f update select month in timekeeping page 2025-01-02 07:36:39 +07:00
Joseph af52952946 update export button 2024-12-06 09:27:06 +07:00
joseph 1443d01685 Merge pull request 'dev' (#101) from dev into master
Reviewed-on: #101
2024-12-06 13:10:35 +11:00
joseph a6b5d83535 Merge pull request 'Bổ sung nút report excel trang timekeeping , leave management' (#100) from truong-report-excel into dev
Reviewed-on: #100
2024-12-06 13:10:11 +11:00
Truong Vo 7fdf6f3e25 Bổ sung nút report excel trang timekeeping , leave management 2024-12-06 09:07:54 +07:00
joseph 824b2fd87c Merge pull request 'dev' (#99) from dev into master
Reviewed-on: #99
2024-12-06 11:36:59 +11:00
joseph cfba5175a6 Merge pull request 'truong-report-excel' (#98) from truong-report-excel into dev
Reviewed-on: #98
2024-12-06 11:36:26 +11:00
Truong Vo 93030b73c7 Bổ sung nút report excel trang timekeeping , leave management 2024-12-05 17:25:07 +07:00
Joseph fcaa2926fd update send mail warning 2024-11-11 16:26:47 +07:00
Joseph 0e875d7cf9 update send mail warning 2024-11-08 16:45:55 +07:00
Joseph 14e9e17273 update accoutant role 2024-11-04 07:44:41 +07:00
Joseph f96f445c7f update accoutant role 2024-11-04 07:39:36 +07:00
Joseph 1d9e428587 update $morning_condition_time 2024-10-24 07:28:41 +07:00
Joseph a830791648 update mail subject 2024-10-23 07:54:50 +07:00
Joseph 8d8985a6be update send mail warning checkin late 2024-10-21 14:23:03 +07:00
Joseph d53b786daf update root folder by enviroment 2024-10-16 16:09:56 +07:00
Joseph 79b3cbe916 update root folder by enviroment 2024-10-16 15:54:58 +07:00