Commit Graph

500 Commits

Author SHA1 Message Date
Admin e7aa80f14b feat(tkw): update ui 2025-12-11 10:34:26 +07:00
Admin 2a5f7b0b25 feat(tkw): update file main models 2025-12-11 10:04:29 +07:00
Admin cdce726ff1 feat(tkw): update file main code 2025-12-11 09:35:01 +07:00
Admin 647fc455d5 feat(tkw): Update static file 2025-12-11 09:30:39 +07:00
zelda b5f5fa1748 Merge pull request 'update client for server' (#142) from zelda.push-tracking-tool-web into master
Reviewed-on: #142
2025-12-11 13:11:33 +11:00
Admin 5a564e3703 update client for server 2025-12-11 09:10:42 +07:00
joseph 0af2357bc2 Merge pull request 'feat(tkw): Tracking tool web' (#141) from zelda.push-tracking-tool-web into master
Reviewed-on: #141
2025-12-10 20:29:24 +11:00
Admin a623659b52 feat(tkw): Tracking tool web 2025-12-10 16:23:45 +07:00
joseph b35d4d7ca5 Merge pull request 'dev' (#140) from dev into master
Reviewed-on: #140
2025-08-05 19:13:38 +10:00
joseph 522034ab76 Merge pull request 'update timekeeping, leave UI' (#139) from vi into dev
Reviewed-on: #139
2025-08-05 19:13:12 +10:00
dbdbd9 56d2889297 update timekeeping, leave UI 2025-08-05 16:08:48 +07:00
joseph 7c36add579 Merge pull request 'dev' (#138) from dev into master
Reviewed-on: #138
2025-08-05 18:27:42 +10:00
joseph 6c61819f2e Merge pull request 'update handle for separated user' (#137) from vi into dev
Reviewed-on: #137
2025-08-05 18:26:09 +10:00
dbdbd9 f649b2a6ac Merge branch 'dev' of https://gitea.nswteam.net/joseph/ManagementSystem into vi 2025-08-05 15:19:15 +07:00
dbdbd9 d335803cf8 update handle for separated user 2025-08-05 15:14:50 +07:00
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 a4751e9d38 Merge branch 'dev' of https://gitea.nswteam.net/joseph/ManagementSystem into vi.ticket-email 2025-07-31 09:15:59 +07:00
dbdbd9 b52537cfe4 fix calculate work time 2025-07-31 09:14:33 +07:00
joseph efaf906f0a Merge pull request 'dev' (#134) from dev into master
Reviewed-on: #134
2025-07-02 12:54:43 +10:00
joseph 3e865e5575 Merge pull request 'update permission display for leave management' (#133) from vi.ticket-email into dev
Reviewed-on: #133
2025-07-02 11:23:51 +10: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
dbdbd9 ee281986b8 update permission display for leave management 2025-07-01 16:36:21 +07:00
joseph 6e1e452bf1 Merge pull request 'Deploy to prod' (#132) from dev into master
Reviewed-on: #132
2025-07-01 17:54:53 +10:00
joseph 6528b7bc59 Merge pull request 'add update note status' (#131) from vi.ticket-email into dev
Reviewed-on: #131
2025-07-01 17:26:34 +10:00
dbdbd9 fd1be27414 Merge branch 'dev' of https://gitea.nswteam.net/joseph/ManagementSystem into vi.ticket-email 2025-07-01 13:41:05 +07:00
dbdbd9 d064b242e6 add update note status 2025-07-01 13:40:48 +07:00
joseph 8f6977be72 Merge pull request 'dev' (#130) from dev into master
Reviewed-on: #130
2025-06-30 18:37:38 +10:00
joseph af67644416 Merge pull request 'adjust UI, add send mail when delete note/update refuse ticket' (#129) from vi.ticket-email into dev
Reviewed-on: #129
2025-06-30 18:14:26 +10:00
dbdbd9 705e8f9216 adjust UI, add send mail when delete note/update refuse ticket 2025-06-30 14:58:06 +07:00
joseph db4feedde3 Merge pull request 'update handle calculate onleave ticket in next months' (#128) from vi.ticket-email into dev
Reviewed-on: #128
2025-06-30 16:11:00 +10:00
dbdbd9 27b59ae939 update msg 2025-06-30 11:04:44 +07:00
dbdbd9 034b9eee2c update handle calculate onleave ticket in next months 2025-06-30 10:57:02 +07:00
joseph 543b1af58c Merge pull request 'update UI leave management, add func update old data' (#127) from vi.ticket-email into dev
Reviewed-on: #127
2025-06-27 12:51:16 +10:00
dbdbd9 d09fa6d432 comment log 2025-06-27 09:48:15 +07:00
dbdbd9 40f80579dc update UI leave management, add func update old data 2025-06-27 09:45:21 +07:00
joseph b1e7aaa1ea Merge pull request 'fix calculate onleave day' (#126) from vi.ticket-email into dev
Reviewed-on: #126
2025-06-25 13:37:41 +10:00
hoangvi.ng a883662f0b fix calculate onleave day 2025-06-25 10:34:02 +07:00
joseph a11f67f252 Merge pull request 'refactor create, handle ticket' (#125) from vi.ticket-email into dev
Reviewed-on: #125
2025-06-24 18:45:44 +10:00
dbdbd9 fb6c58f1c0 handle onleave new user, adjust background jobs 2025-06-24 15:39:11 +07:00
dbdbd9 c2c9322e7d update delete note, add update ticket 2025-06-21 11:11:02 +07:00
dbdbd9 3263bce784 fix refactor function check leave day, update handle ticket send mail 2025-06-20 14:29:47 +07:00
dbdbd9 500d6ec34d fix warnning on_leave_note_pay message 2025-06-18 15:23:55 +07:00
dbdbd9 1b35f8481b refactor create, handle ticket 2025-06-17 15:44:44 +07:00
vincent.vo 172af363de Merge pull request 'truong-leave-day' (#124) from truong-leave-day into dev
Reviewed-on: #124
2025-06-16 16:34:55 +10:00
Truong Vo cd9c01cdee fix 2025-06-16 13:34:41 +07:00
Truong Vo 2c8bb92775 Bổ sung check ngày phép tối đa 1 tháng mặc dù còn nhiều phép 2025-06-16 13:31:15 +07:00
Truong Vo 5b65415d76 Bổ sung check ticket đang được duyệt k thể tạo 2025-06-16 09:41:54 +07:00
Truong Vo 655d9cd4c6 Hiệu chỉnh ngày phép 2025-06-16 09:29:45 +07:00
Truong Vo e05e92b96b fix lỗi có phép được duyệt trong thời gian được chọn khi tạo ticket 2025-06-16 08:15:14 +07:00