 vincent.vo
|
13148a1be1
|
Merge pull request 'truong-sprint-1' (#14) from truong-sprint-1 into master
Reviewed-on: #14
|
2024-08-14 14:18:10 +10:00 |
Truong Vo
|
745b34b1e3
|
Hiệu chỉnh view thời gian của trang tickets, tickets managements
|
2024-08-14 11:12:28 +07:00 |
|
Truong Vo
|
2a419dc9ec
|
Hiệu chỉnh job tính ngày phép dư năm rồi
|
2024-08-14 10:05:26 +07:00 |
|
Truong Vo
|
377cb2d079
|
Hiệu chỉnh job tính ngày phép dư năm rồi
|
2024-08-14 10:04:08 +07:00 |
|
Truong Vo
|
93aa85be8c
|
QUản lý danh sách ngày nghỉ: Cập nhật view tooltip all off
|
2024-08-14 09:43:06 +07:00 |
|
vincent.vo
|
3b7704c473
|
Merge pull request 'Bổ sung tooltip ngày nghỉ , tổng ngày nghỉ, custom màu cho cột total, off, remaining' (#13) from truong-sprint-1 into master
Reviewed-on: #13
|
2024-08-13 19:33:00 +10:00 |
|
Truong Vo
|
5e0c48e3b9
|
Bổ sung tooltip ngày nghỉ , tổng ngày nghỉ, custom màu cho cột total, off, remaining
|
2024-08-13 16:31:22 +07:00 |
 joseph
|
0129d0fe42
|
Merge pull request 'truong-sprint-1' (#12) from truong-sprint-1 into master
Reviewed-on: #12
|
2024-08-13 12:18:37 +10:00 |
|
Truong Vo
|
f87db7cda5
|
Hiệu chỉnh padding template gửi email
|
2024-08-13 09:12:35 +07:00 |
|
Truong Vo
|
35969295cc
|
Hiệu chỉnh padding template gửi email
|
2024-08-13 09:01:25 +07:00 |
|
joseph
|
45747931f2
|
Merge pull request 'fix bug' (#11) from truong-sprint-1 into master
Reviewed-on: #11
|
2024-08-12 13:35:35 +10:00 |
|
Truong Vo
|
0ca6b837e9
|
fix bug
|
2024-08-12 10:34:22 +07:00 |
|
joseph
|
4e41e7cbcb
|
Merge pull request 'truong-sprint-1' (#10) from truong-sprint-1 into master
Reviewed-on: #10
|
2024-08-12 12:58:09 +10:00 |
|
Truong Vo
|
d53a60382d
|
Gửi email thông báo cho admin khi tạo đơn, trả email thông báo đơn được …
|
2024-08-12 09:39:51 +07:00 |
|
Truong Vo
|
c4803c5c96
|
Merge branch 'master' into truong-sprint-1
|
2024-08-12 09:33:59 +07:00 |
|
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 |