Commit Graph

463 Commits

Author SHA1 Message Date
Truong Vo 2fb2d44d6c Gửi email thông báo cho admin khi tạo đơn, trả email thông báo đơn được duyệt hoặc từ chối cho user 2024-08-12 09:33:51 +07:00
Truong Vo 72b586e94a clean code fe page Timekeeping 2024-08-09 15:36:33 +07:00
Truong Vo 072d8ccad7 Bổ sung check lỗi không có quyền khi xóa nôte 2024-08-09 15:16:07 +07:00
joseph 4f492df167 Merge pull request 'truong-sprint-1' (#9) from truong-sprint-1 into master
Reviewed-on: #9
2024-08-09 17:59:18 +10:00
Truong Vo 4744ac3e23 Bổ sung check nếu là WFH thì check in cho user 2024-08-09 14:48:28 +07:00
Truong Vo 688c521986 Bổ sung check nếu là WFH thì check in cho user 2024-08-09 14:46:35 +07:00
Truong Vo 8b5eadfbcf fix 2024-08-09 14:14:09 +07:00
Truong Vo 12d362edc2 fix 2024-08-09 14:13:30 +07:00
Truong Vo 1057eec8c0 fix 2024-08-09 14:13:06 +07:00
Truong Vo 5703804e5c Bổ sugn check admin navbar + view thông tin ticket management + delete note timekeeping 2024-08-09 14:02:34 +07:00
Truong Vo 9b8945aa21 Hiệu chỉnh thanh navar + view thêm thông tin ticket khi duyệt, từ chối 2024-08-09 09:32:52 +07:00
joseph 571ebb6a09 Merge pull request 'truong-sprint-1' (#8) from truong-sprint-1 into master
Reviewed-on: #8
2024-08-09 10:30:24 +10:00
Truong Vo 3c182ac914 Merge branch 'master' into truong-sprint-1 2024-08-08 17:12:54 +07:00
Truong Vo 971f6718e6 Build page Ticket management 2024-08-08 17:12:48 +07:00
Truong Vo 64d3bc72f0 Build page Ticket management 2024-08-08 17:09:12 +07:00
Truong Vo 4fd24d2407 Bổ sung kiểm tra quyền chỉ admin mới vào được page ticket management 2024-08-08 14:17:31 +07:00
JOSEPH LE 830b2748d2 Merge branch 'master' of https://gitea.nswteam.net/joseph/ManagemetSystem 2024-08-08 13:36:34 +07:00
JOSEPH LE 74a20a714b update migration 2024-08-08 13:36:30 +07:00
joseph 34a40282c3 Merge pull request 'Tạo page ticket management' (#7) from truong-sprint-1 into master
Reviewed-on: #7
2024-08-08 13:37:32 +10:00
Truong Vo 10c397e184 Tạo page ticket management 2024-08-08 10:37:04 +07:00
Truong Vo d53491830e Tạo page ticket management 2024-08-08 10:28:20 +07:00
joseph 348d09e1b8 Merge pull request 'truong-sprint-1' (#6) from truong-sprint-1 into master
Reviewed-on: #6
2024-08-08 13:18:21 +10:00
Truong Vo f8c1459be9 Tạo page ticket management 2024-08-08 10:13:39 +07:00
Truong Vo 1bc36e6eec Tạo page ticket management 2024-08-08 10:07:33 +07:00
Truong Vo afca1c0f6c Merge branch 'master' into truong-sprint-1 2024-08-08 10:04:05 +07:00
Truong Vo b8d9f9f66c Build page tickets 2024-08-08 10:03:33 +07:00
JOSEPH LE fdb0c769e6 create API update cache 2024-08-08 09:44:57 +07:00
JOSEPH LE ed32b03e5b update API handle ticket 2024-08-07 15:16:59 +07:00
JOSEPH LE aec80f2e94 update Ui 2024-08-07 13:37:35 +07:00
JOSEPH LE a0a740cca3 create API ticker 2024-08-07 13:22:21 +07:00
JOSEPH LE cb65f1fffc update UI 2024-08-07 08:33:15 +07:00
JOSEPH LE 1dc7cf579c update UI 2024-08-07 08:29:34 +07:00
JOSEPH LE 2b98a025a6 update UI 2024-08-07 08:25:17 +07:00
joseph a673c5a293 Merge pull request 'Update TimekeepingController.php' (#5) from truong-sprint-1 into master
Reviewed-on: #5
2024-08-06 20:15:28 +10:00
Truong Vo 0b63632e1b Update TimekeepingController.php 2024-08-06 17:14:59 +07:00
joseph 4a6bc534ff Merge pull request 'Update 2024_08_02_025714_create_categories_table.php' (#4) from truong-sprint-1 into master
Reviewed-on: #4
2024-08-06 19:48:57 +10:00
Truong Vo 5b66eaeb28 Update 2024_08_02_025714_create_categories_table.php 2024-08-06 16:48:18 +07:00
JOSEPH LE e864f1cc5c Merge branch 'master' of https://gitea.nswteam.net/joseph/ManagemetSystem 2024-08-06 16:22:28 +07:00
JOSEPH LE 445ebd3ca7 update 2024-08-06 16:22:23 +07:00
joseph 1001c7f2af Merge pull request 'truong-sprint-1' (#3) from truong-sprint-1 into master
Reviewed-on: #3
2024-08-06 19:16:23 +10:00
Truong Vo b89bb2da88 Update LeaveManagement.tsx 2024-08-06 16:13:45 +07:00
Truong Vo 7ed053363c Update LeaveManagement.tsx 2024-08-06 16:12:25 +07:00
Truong Vo 3adc832da7 Update 2024_08_02_025714_create_categories_table.php 2024-08-06 16:11:43 +07:00
Truong Vo 8125ab8e16 Thực hiện chức năng ngày phép 2024-08-06 16:10:41 +07:00
Truong Vo 26b8c724fe Merge branch 'master' into truong-sprint-1 2024-08-06 16:07:29 +07:00
Truong Vo 2fdd687fc9 Thực hiện chức năng ngày phép 2024-08-06 16:06:29 +07:00
JOSEPH LE f1e7af7bf4 update structure for ticket function 2024-08-06 14:43:11 +07:00
JOSEPH LE a1b2246666 update UI for timekeeping page 2024-08-06 13:13:04 +07:00
joseph 75637b8499 Merge pull request 'Bổ sung default data migrate cho bảng danh mục' (#2) from truong-sprint-1 into master
Reviewed-on: #2
2024-08-06 12:27:01 +10:00
Truong Vo 2cc8472bc6 Bổ sung migrate bảng ngày nghỉ 2024-08-06 08:44:18 +07:00