joseph
/
ManagementSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
456 Commits 21 Branches 0 Tags 44 MiB
Commit Graph

456 Commits

Author SHA1 Message Date
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
Joseph 2eed0f006b Merge branch 'master' of https://gitea.nswteam.net/joseph/ManagementSystem 2024-10-16 15:38:05 +07:00
Joseph e226ad41d7 create page manage profiles, page add profile user 2024-10-16 15:35:58 +07:00
joseph cc0a62f746 Merge pull request 'BỔ SUNG CHECK THÊM điều kiện user ticket nguyên ngày' (#97) from Truong-CreateAutoTicketKPhep into master 
Reviewed-on: #97
 2024-10-16 13:47:36 +11:00
Truong Vo 4334f3e73d Bổ sung check điều kiện có user check in check out (ngày hợp lệ) 2024-10-16 09:44:29 +07:00
Truong Vo 1c16b4b164 BỔ SUNG CHECK THÊM điều kiện user ticket nguyên ngày 2024-10-16 09:03:52 +07:00
joseph 2c6a6a81dd Merge pull request 'BỔ SUNG CHECK THÊM điều kiện user ticket nguyên ngày' (#96) from Truong-CreateAutoTicketKPhep into master 
Reviewed-on: #96
 2024-10-16 11:57:27 +11:00
Truong Vo 34b6698696 BỔ SUNG CHECK THÊM điều kiện user ticket nguyên ngày 2024-10-16 07:54:38 +07:00
joseph 7c8267d6e3 Merge pull request 'Bỏ bắt buộc field Admin notes khi admin duyệt or từ chối ticket' (#95) from Truong-CreateAutoTicketKPhep into master 
Reviewed-on: #95
 2024-10-14 15:06:15 +11:00
Truong Vo ceb925f571 Bỏ bắt buộc field Admin notes khi admin duyệt or từ chối ticket 2024-10-14 11:04:44 +07:00
vincent.vo bf5dc3d8c1 Merge pull request 'Truong-CreateAutoTicketKPhep' (#94) from Truong-CreateAutoTicketKPhep into master 
Reviewed-on: #94
 2024-10-14 14:13:38 +11:00
Truong Vo 46d4ffa339 Tạo ticket tự động cho user khi user không check in, check out 2024-10-14 10:11:59 +07:00
Truong Vo d0c1b6894b Tạo ticket tự động cho user khi user không check in, check out 2024-10-14 10:09:04 +07:00
Truong Vo 7fa50478cc Tạo ticket tự động cho user khi user không check in, check out 2024-10-09 10:26:33 +07:00
joseph 0650211f67 Merge pull request 'master' (#93) from master into dev 
Reviewed-on: #93
 2024-09-25 11:03:07 +10:00
joseph f55ac7e65c Merge pull request 'Sprint-4/MS-36-FE-Technical' (#92) from Sprint-4/MS-36-FE-Technical into master 
Reviewed-on: #92
 2024-09-25 10:54:42 +10:00
dbdbd9 b836ef48b0 update ui techincal profile and split techincal tab to component in setting 2024-09-25 07:48:13 +07:00
dbdbd9 885dd40dd9 Merge branch 'master' of https://gitea.nswteam.net/joseph/ManagementSystem into Sprint-4/MS-36-FE-Technical 2024-09-25 07:33:13 +07:00
vincent.vo 0b823a226c Merge pull request 'master' (#91) from master into dev 
Reviewed-on: #91
 2024-09-24 19:23:56 +10:00
vincent.vo ba3209d473 Merge pull request 'Bổ sung sort theo ngày mới nhất' (#90) from Sprint-4/MS-37-FE-Evaluation into master 
Reviewed-on: #90
 2024-09-24 19:23:42 +10:00
Truong Vo 9e83615eeb Bổ sung sort theo ngày mới nhất 2024-09-24 16:23:16 +07:00
vincent.vo 2c2d067e4c Merge pull request 'master' (#89) from master into dev 
Reviewed-on: #89
 2024-09-24 19:19:13 +10:00
vincent.vo 5f1fa2c1c1 Merge pull request 'Hiệu chỉnh api update technical' (#88) from Sprint-4/MS-37-FE-Evaluation into master 
Reviewed-on: #88
 2024-09-24 19:18:27 +10:00
Truong Vo c0826f814e Hiệu chỉnh api update technical 2024-09-24 16:18:03 +07:00
joseph 40711691ab Merge pull request 'update some UI' (#87) from joseph.update_navbar_permissions into master 
Reviewed-on: #87
 2024-09-24 19:04:07 +10:00
JOSEPH LE efd2e0b6b7 update some UI 2024-09-24 16:03:28 +07:00
joseph 84d6ee2630 Merge pull request 'master' (#86) from master into dev 
Reviewed-on: #86
 2024-09-24 14:21:11 +10:00
joseph 5b7ad04a0f Merge pull request 'update personnel allocation' (#85) from joseph.update_navbar_permissions into master 
Reviewed-on: #85
 2024-09-24 14:20:57 +10:00
JOSEPH LE a9e93d84d1 update personnel allocation 2024-09-24 11:20:36 +07:00
joseph a7015ceedc Merge pull request 'update permission api' (#84) from joseph.update_navbar_permissions into master 
Reviewed-on: #84
 2024-09-24 12:46:24 +10:00
JOSEPH LE 5df3959dd8 update permission api 2024-09-24 09:45:48 +07:00
joseph 0ce1b1840a Merge pull request 'update permission api' (#83) from joseph.update_navbar_permissions into master 
Reviewed-on: #83
 2024-09-24 12:30:42 +10:00
JOSEPH LE 29a3e4de36 update permission api 2024-09-24 09:28:14 +07:00
joseph 5d921e2dd6 Merge pull request 'update roll user management' (#82) from joseph.update_navbar_permissions into master 
Reviewed-on: #82
 2024-09-24 10:51:18 +10:00
JOSEPH LE 1f4eec2165 update roll user management 2024-09-24 07:50:55 +07:00
dbdbd9 81f633cde7 Merge branch 'master' of https://gitea.nswteam.net/joseph/ManagementSystem into Sprint-4/MS-36-FE-Technical 2024-09-24 07:36:51 +07:00
joseph 6aff6093a6 Merge pull request 'master' (#81) from master into dev 
Reviewed-on: #81
 2024-09-24 10:36:02 +10:00