Commit Graph

  • b35d4d7ca5 Merge pull request 'dev' (#140) from dev into master master joseph 2025-08-05 19:13:38 +1000
  • 522034ab76 Merge pull request 'update timekeeping, leave UI' (#139) from vi into dev dev joseph 2025-08-05 19:13:12 +1000
  • 56d2889297 update timekeeping, leave UI vi dbdbd9 2025-08-05 16:08:48 +0700
  • 7c36add579 Merge pull request 'dev' (#138) from dev into master joseph 2025-08-05 18:27:42 +1000
  • 6c61819f2e Merge pull request 'update handle for separated user' (#137) from vi into dev joseph 2025-08-05 18:26:09 +1000
  • f649b2a6ac Merge branch 'dev' of https://gitea.nswteam.net/joseph/ManagementSystem into vi dbdbd9 2025-08-05 15:19:15 +0700
  • d335803cf8 update handle for separated user dbdbd9 2025-08-05 15:14:50 +0700
  • da0bb9ad0d Merge pull request 'dev' (#136) from dev into master joseph 2025-07-31 12:47:25 +1000
  • d3d9acb1ce Merge pull request 'fix calculate work time' (#135) from vi.ticket-email into dev joseph 2025-07-31 12:32:10 +1000
  • a4751e9d38 Merge branch 'dev' of https://gitea.nswteam.net/joseph/ManagementSystem into vi.ticket-email dbdbd9 2025-07-31 09:15:59 +0700
  • b52537cfe4 fix calculate work time vi.ticket-email dbdbd9 2025-07-31 09:14:33 +0700
  • efaf906f0a Merge pull request 'dev' (#134) from dev into master that-fe joseph 2025-07-02 12:54:43 +1000
  • 3e865e5575 Merge pull request 'update permission display for leave management' (#133) from vi.ticket-email into dev joseph 2025-07-02 11:23:51 +1000
  • 4f6f3dd803 Merge branch 'dev' of https://gitea.nswteam.net/joseph/ManagementSystem into vi.ticket-email dbdbd9 2025-07-02 07:46:58 +0700
  • ee281986b8 update permission display for leave management dbdbd9 2025-07-01 16:36:21 +0700
  • 6e1e452bf1 Merge pull request 'Deploy to prod' (#132) from dev into master joseph 2025-07-01 17:54:53 +1000
  • 6528b7bc59 Merge pull request 'add update note status' (#131) from vi.ticket-email into dev joseph 2025-07-01 17:26:34 +1000
  • fd1be27414 Merge branch 'dev' of https://gitea.nswteam.net/joseph/ManagementSystem into vi.ticket-email dbdbd9 2025-07-01 13:41:05 +0700
  • d064b242e6 add update note status dbdbd9 2025-07-01 13:40:48 +0700
  • 8f6977be72 Merge pull request 'dev' (#130) from dev into master joseph 2025-06-30 18:37:38 +1000
  • af67644416 Merge pull request 'adjust UI, add send mail when delete note/update refuse ticket' (#129) from vi.ticket-email into dev joseph 2025-06-30 18:14:26 +1000
  • 705e8f9216 adjust UI, add send mail when delete note/update refuse ticket dbdbd9 2025-06-30 14:58:06 +0700
  • db4feedde3 Merge pull request 'update handle calculate onleave ticket in next months' (#128) from vi.ticket-email into dev joseph 2025-06-30 16:11:00 +1000
  • 27b59ae939 update msg dbdbd9 2025-06-30 11:04:44 +0700
  • 034b9eee2c update handle calculate onleave ticket in next months dbdbd9 2025-06-30 10:57:02 +0700
  • 543b1af58c Merge pull request 'update UI leave management, add func update old data' (#127) from vi.ticket-email into dev joseph 2025-06-27 12:51:16 +1000
  • d09fa6d432 comment log dbdbd9 2025-06-27 09:48:15 +0700
  • 40f80579dc update UI leave management, add func update old data dbdbd9 2025-06-27 09:45:21 +0700
  • b1e7aaa1ea Merge pull request 'fix calculate onleave day' (#126) from vi.ticket-email into dev joseph 2025-06-25 13:37:41 +1000
  • a883662f0b fix calculate onleave day hoangvi.ng 2025-06-25 10:34:02 +0700
  • a11f67f252 Merge pull request 'refactor create, handle ticket' (#125) from vi.ticket-email into dev joseph 2025-06-24 18:45:44 +1000
  • fb6c58f1c0 handle onleave new user, adjust background jobs dbdbd9 2025-06-24 15:39:11 +0700
  • c2c9322e7d update delete note, add update ticket dbdbd9 2025-06-21 11:11:02 +0700
  • 3263bce784 fix refactor function check leave day, update handle ticket send mail dbdbd9 2025-06-20 14:29:47 +0700
  • 500d6ec34d fix warnning on_leave_note_pay message dbdbd9 2025-06-18 15:23:55 +0700
  • 1b35f8481b refactor create, handle ticket dbdbd9 2025-06-17 15:44:44 +0700
  • 172af363de Merge pull request 'truong-leave-day' (#124) from truong-leave-day into dev vincent.vo 2025-06-16 16:34:55 +1000
  • cd9c01cdee fix truong-leave-day Truong Vo 2025-06-16 13:34:41 +0700
  • 2c8bb92775 Bổ sung check ngày phép tối đa 1 tháng mặc dù còn nhiều phép Truong Vo 2025-06-16 13:31:15 +0700
  • 5b65415d76 Bổ sung check ticket đang được duyệt k thể tạo Truong Vo 2025-06-16 09:41:54 +0700
  • 655d9cd4c6 Hiệu chỉnh ngày phép Truong Vo 2025-06-16 09:29:45 +0700
  • e05e92b96b fix lỗi có phép được duyệt trong thời gian được chọn khi tạo ticket Truong Vo 2025-06-16 08:15:14 +0700
  • 1328320713 Merge pull request 'add confirm/refuse in ticket mail' (#123) from vi.ticket-email into dev joseph 2025-06-12 12:54:55 +1000
  • 7217a83e33 add confirm/refuse in ticket mail dbdbd9 2025-06-11 16:44:11 +0700
  • 8474bd97a1 Merge branch 'dev' of https://gitea.nswteam.net/joseph/ManagementSystem into vi.document dbdbd9 2025-06-11 14:52:24 +0700
  • f8c2af2ec8 Merge pull request 'Hiệu chỉnh hàm tính toán ngày phép' (#122) from truong-leave-day into dev vincent.vo 2025-06-11 17:49:54 +1000
  • 5f8b03f558 Hiệu chỉnh hàm tính toán ngày phép Truong Vo 2025-06-11 14:49:16 +0700
  • fa47d32b07 Merge branch 'dev' of https://gitea.nswteam.net/joseph/ManagementSystem into vi.document dbdbd9 2025-06-10 10:05:47 +0700
  • 160596a7a3 Merge pull request 'truong-leave-day' (#116) from truong-leave-day into dev joseph 2025-06-10 12:51:31 +1000
  • 177296a324 fix build Truong Vo 2025-05-07 16:49:47 +0700
  • d5936087ff fix build Truong Vo 2025-05-07 16:49:15 +0700
  • 951c3be613 fix build Truong Vo 2025-05-07 16:48:14 +0700
  • b5a7740d9f Bổ sung form xác nhận trước khi xóa note Truong Vo 2025-05-07 15:13:37 +0700
  • 2011797dd6 Bổ sung xóa ngày phép Truong Vo 2025-05-07 13:28:14 +0700
  • 7dc31bf75b Bổ sung xóa ngày phép Truong Vo 2025-05-07 11:33:52 +0700
  • ca766fc293 Bổ sung check trùng ngày phép đã tạo Truong Vo 2025-04-26 10:43:18 +0700
  • 32b197969c Bổ sung check trùng ngày phép đã tạo Truong Vo 2025-04-26 09:49:52 +0700
  • 462d896e57 Hiệu chỉnh add ticket Truong Vo 2025-04-25 17:03:24 +0700
  • 44fa6b55f7 Hiệu chỉnh add ticket Truong Vo 2025-04-25 10:29:35 +0700
  • ddcb78ef98 Hiệu chỉnh chức năng ngày phép Truong Vo 2025-04-24 16:37:53 +0700
  • d61fd879b7 Hiệu chỉnh chức năng ngày phép Truong Vo 2025-04-24 15:23:25 +0700
  • d3c1d9bf60 Hiệu chỉnh chức năng ngày phép Truong Vo 2025-04-24 15:19:12 +0700
  • 65c4dbcf88 Hiệu chỉnh chức năng ngày phép Truong Vo 2025-04-24 09:55:03 +0700
  • af5721682b [Ngày Phép] Bổ sung chức năng cập nhật ngày nghỉ cho ngày nghỉ đặt biệt (3 ngày nghỉ đám cưới) Truong Vo 2025-04-15 14:07:20 +0700
  • 308f5a3a2e [Ngày Phép] Thực hiện Job cập nhật ngày phép bảng mỗi tháng + 1 ngày phép cho mỗi user, thời gian 00:00 ngày 1 hàng tháng Truong Vo 2025-04-15 10:34:54 +0700
  • 05cb3f722a Merge branch 'dev' into truong-leave-day Truong Vo 2025-04-04 10:39:11 +0700
  • 1f9ab744ae Merge branch 'master' into truong-leave-day Truong Vo 2025-04-04 10:39:00 +0700
  • f807a635bb update logic upload file Joseph 2025-03-27 17:18:53 +0700
  • d2c0e0b95d update logic upload file Joseph 2025-03-27 17:08:49 +0700
  • 4da48df8d7 update logic upload file Joseph 2025-03-27 17:05:32 +0700
  • 5cd7071459 Merge branch 'master' of https://gitea.nswteam.net/joseph/ManagementSystem into vi.document dbdbd9 2025-03-27 07:50:25 +0700
  • 6e2a8c2578 update type file profile upload Joseph 2025-03-26 09:29:14 +0700
  • c6a9fc28a3 update url Joseph 2025-03-26 08:56:06 +0700
  • db5c9b09a8 Merge pull request 'master' (#121) from master into dev joseph 2025-03-14 19:36:10 +1100
  • 9a9a94e5d4 update download link Joseph 2025-03-14 15:32:13 +0700
  • d803d69b72 update download link Joseph 2025-03-14 15:29:58 +0700
  • d1f889c996 update search datatable Joseph 2025-03-14 15:16:04 +0700
  • e174146678 test Joseph 2025-03-14 14:40:34 +0700
  • cd2570bc07 Merge pull request 'dev' (#120) from dev into master joseph 2025-03-14 18:31:12 +1100
  • 230beb4ed7 Merge pull request 'fix search, show file' (#119) from vi.document into dev joseph 2025-03-14 18:30:52 +1100
  • 60925a83af fix search, show file vi.document dbdbd9 2025-03-14 14:26:57 +0700
  • b6476feae5 Merge pull request 'dev' (#118) from dev into master joseph 2025-03-14 14:52:35 +1100
  • 8b9e18bdcb Merge pull request 'adjust Create, Update logic, add permission' (#117) from vi.document into dev joseph 2025-03-14 14:47:05 +1100
  • 4896461838 Merge branch 'dev' of https://gitea.nswteam.net/joseph/ManagementSystem into vi.document dbdbd9 2025-03-14 10:07:16 +0700
  • 7ef2897469 Merge branch 'master' of https://gitea.nswteam.net/joseph/ManagementSystem into vi.document dbdbd9 2025-03-14 10:07:11 +0700
  • 88870e075c adjust Create, Update logic, add permission dbdbd9 2025-03-14 10:06:49 +0700
  • 008c335b79 Merge pull request 'fix library type' (#115) from vi.document into dev joseph 2025-03-13 20:45:38 +1100
  • 650cfe1b13 [Ngày Phép] Cập nhật loại phép nộp: WFH, Nghỉ phép năm, Nghỉ không lương Truong Vo 2025-03-13 15:41:43 +0700
  • 20745381db fix lib type dbdbd9 2025-03-13 15:09:22 +0700
  • 8ce0d957b1 [Ngày Phép] Cập nhật lại tên cột cho bảng ngày nghỉ phép năm Truong Vo 2025-03-13 14:54:37 +0700
  • a5ece4d65d Merge pull request 'dev' (#114) from dev into master joseph 2025-03-13 18:53:52 +1100
  • d8cbb7e01b Merge pull request 'BE, FE Document' (#113) from vi.document into dev joseph 2025-03-13 18:53:32 +1100
  • 86f2bb12fc [Ngày Phép] Cập nhật lại tên cột cho bảng ngày nghỉ phép năm Truong Vo 2025-03-13 14:50:57 +0700
  • 78bdca4e23 update permission dbdbd9 2025-03-13 14:48:26 +0700
  • e026b70e66 fix show file document detail, update document dbdbd9 2025-03-13 14:14:43 +0700
  • 0c5f56d30c add BE, FE Document dbdbd9 2025-03-12 16:48:05 +0700
  • 2561d39b4a update ignore project truong-frame-drawio Joseph 2025-02-21 15:52:03 +0700
  • 12a1447931 Merge pull request 'dev' (#112) from dev into master joseph 2025-02-21 19:23:55 +1100
  • 35ecaa802d Merge pull request 'truong-frame-drawio' (#111) from truong-frame-drawio into dev joseph 2025-02-21 19:23:35 +1100
  • 1018172b58 Merge branch 'master' into dev Truong Vo 2025-02-21 11:12:15 +0700