Commit Graph

171 Commits

Author SHA1 Message Date
Truong Vo 1aeda710e1 Bổ sung api Technical 2024-09-20 15:27:32 +07:00
Truong Vo b599316f57 bổ sung migrate 2024-09-19 15:46:47 +07:00
Truong Vo 774ab9033f Merge branch 'master' into Sprint-3/MS-23 2024-09-19 10:45:47 +07:00
Truong Vo 80bc1de1a3 Bổ sung chức năng cập nhật hình ảnh cho Profiles 2024-09-19 10:39:44 +07:00
vincent.vo eb5f5d7b44 Merge pull request 'Cập nhật view thông tin createBy' (#43) from Sprint-3/MS-23 into master
Reviewed-on: #43
2024-09-19 12:01:53 +10:00
Truong Vo 2941663e7b Cập nhật view thông tin createBy 2024-09-19 09:01:36 +07:00
JOSEPH LE 38cc2d9155 update env 2024-09-19 08:58:52 +07:00
Truong Vo 41794d7c40 Fix lỗi lưu thông tin create by 2024-09-19 08:08:59 +07:00
Truong Vo 7594d00001 remove email tesst 2024-09-19 07:57:22 +07:00
Truong Vo 63d38bb5e3 remove email tesst 2024-09-19 07:56:54 +07:00
Truong Vo bebc37a8f3 Tích hợp cache get user cho danh sáhc Sprint 2024-09-18 17:19:54 +07:00
vincent.vo f78eba7d19 Merge pull request 'fix isssue add data chức năng sprintReview' (#38) from Sprint-3/MS-23 into master
Reviewed-on: #38
2024-09-18 20:03:58 +10:00
Truong Vo a1032bf5d9 fix isssue add data chức năng sprintReview 2024-09-18 17:03:27 +07:00
joseph 6694b1f0e1 Merge pull request 'update cache user jira' (#37) from joseph.Update_personnel_allocation into master
Reviewed-on: #37
2024-09-18 19:30:57 +10:00
JOSEPH LE 3830315a9d update cache user jira 2024-09-18 16:30:34 +07:00
Truong Vo 0abbc2d7a8 remove filed require 2024-09-18 16:26:58 +07:00
Truong Vo d930caf4c0 hiệu chỉnh lôi add test report 2024-09-18 16:18:30 +07:00
Truong Vo 1b604d4880 Gắn tooltip cho criterias của sprint review , navbar avartar sang trái, tích hợp loadding project và sprint 2024-09-18 14:19:33 +07:00
Truong Vo 37c73a2146 Merge branch 'master' into Sprint-3/MS-23 2024-09-18 13:48:42 +07:00
Truong Vo 26282bbe8e Hiệu chỉnh 1 số lỗi chức năng sprint review 2024-09-18 13:48:21 +07:00
JOSEPH LE d6f707085d update init data 2024-09-18 09:39:52 +07:00
JOSEPH LE 309d949faf update highlight when not in progress 2024-09-18 09:35:20 +07:00
Truong Vo 790d7cf60f Bổ sung file migrations cho cột user_email 2024-09-18 07:46:19 +07:00
Truong Vo cf7c8be280 Intergate api Profiles 2024-09-18 03:45:26 +07:00
Truong Vo 5554be97e0 Intergate api test report 2024-09-18 02:10:13 +07:00
Truong Vo c800178848 Intergate chức năng Sprint Review 2024-09-18 00:25:18 +07:00
Truong Vo 43371f1915 Merge branch 'master' into Sprint-3/MS-23 2024-09-17 16:39:54 +07:00
Truong Vo 75eb89406f commit code 2024-09-17 16:38:37 +07:00
JOSEPH LE d41aec6d79 Merge branch 'master' of https://gitea.nswteam.net/joseph/ManagemetSystem into joseph.Update_personnel_allocation 2024-09-17 16:36:22 +07:00
JOSEPH LE a855787a47 update allocation 2024-09-17 16:31:09 +07:00
Truong Vo fb47cc509d Bổ sung api cho chức năng profile and criterias 2024-09-17 10:36:17 +07:00
Truong Vo 8c24cffe95 Tạo api trang criterias and test report 2024-09-16 16:20:36 +07:00
JOSEPH LE 4ab40c3523 update allocation 2024-09-16 13:46:04 +07:00
JOSEPH LE 8c06526757 update doing 2024-09-16 07:47:38 +07:00
Truong Vo e4745f1636 Thực hiện tạo page Sprint Review 2024-09-13 01:39:45 +07:00
JOSEPH LE 16af707711 create migrate file 2024-09-12 08:49:31 +07:00
JOSEPH LE 482f1bbe60 asd 2024-09-07 09:19:10 +07:00
JOSEPH LE cc16dd6020 update qrcode 2024-09-07 09:06:02 +07:00
JOSEPH LE bb3c9b2106 create function user manament 2024-09-06 16:28:59 +07:00
JOSEPH LE 8f6092be62 update user list 2024-08-23 08:19:50 +07:00
JOSEPH LE efe33eb21e update view permission 2024-08-16 14:14:25 +07:00
Truong Vo 5245b34a20 Hiệu chỉnh template gửi email 2024-08-15 15:27:56 +07:00
Truong Vo 163e073f24 Hiệu chỉnh template gửi email 2024-08-15 15:13:34 +07:00
Truong Vo 3e2d9c2af4 Hiệu chỉnh template gửi email 2024-08-15 15:10:46 +07:00
Truong Vo 9ae6a72ae4 Hiệu chỉnh template gửi email 2024-08-15 15:00:00 +07:00
Truong Vo ebe031afac fix check quyền user admin ở page ticket and tracking 2024-08-15 09:24:22 +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 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
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
Truong Vo 0ca6b837e9 fix bug 2024-08-12 10:34:22 +07: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 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 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 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 3c182ac914 Merge branch 'master' into truong-sprint-1 2024-08-08 17:12:54 +07:00
Truong Vo 64d3bc72f0 Build page Ticket management 2024-08-08 17:09:12 +07:00
JOSEPH LE 74a20a714b update migration 2024-08-08 13:36:30 +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 a0a740cca3 create API ticker 2024-08-07 13:22:21 +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
Truong Vo 3adc832da7 Update 2024_08_02_025714_create_categories_table.php 2024-08-06 16:11:43 +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
Truong Vo 2cc8472bc6 Bổ sung migrate bảng ngày nghỉ 2024-08-06 08:44:18 +07:00
Truong Vo 2cb4eabcf0 Bổ sung migrate bảng ngày nghỉ 2024-08-06 08:34:22 +07:00
Truong Vo d69e01d6c7 Bổ sung default data migrate cho bảng danh mục 2024-08-06 07:57:45 +07:00
Truong Vo ae5737c3bf Bổ sung note cho Timekepping 2024-08-05 17:02:29 +07:00
Truong Vo b203e8d82c View note theo ngày và note tổng chức năng timekepping 2024-08-05 08:38:39 +07:00
JOSEPH LE 3723cfac64 update whereBetween 2024-07-31 22:01:39 +07:00
JOSEPH LE dd6977a4b9 update whereBetween 2024-07-31 22:00:00 +07:00
JOSEPH LE 0ea97cb0c5 update custom add worklog 2024-07-27 08:24:46 +07:00
JOSEPH LE e7e81dead7 update status 2024-07-26 08:41:12 +07:00
JOSEPH LE 10ab800212 update mail template + content 2024-07-03 15:28:16 +07:00
JOSEPH LE 30d6645355 update sort status list 2024-07-01 16:24:41 +07:00
JOSEPH LE 4ec269cafb update crontab send report 2024-07-01 15:35:26 +07:00
JOSEPH LE 709d3524b4 update working days type 2024-07-01 10:59:56 +07:00
JOSEPH LE b9fa0f8c3e update cache, table cache mothly 2024-07-01 10:51:46 +07:00
Joseph Le 16a2a347c3 change permission 2024-06-21 16:36:34 +07:00
JOSEPH LE e55a632fb9 update timezone 2024-06-20 09:29:45 +07:00
JOSEPH LE abbc810cf0 update timezone 2024-06-20 09:16:04 +07:00
JOSEPH LE 560d6e5f3c Merge branch 'master' of https://gitea.nswteam.net/joseph/ManagemetSystem 2024-06-15 11:41:33 +07:00
JOSEPH LE e0839a4ea8 Merge branch 'master' of https://gitea.nswteam.net/joseph/ManagemetSystem 2024-06-15 11:37:34 +07:00
JOSEPH LE 0781a28a02 upgrade send report 2024-06-15 11:36:47 +07:00
JOSEPH LE d9d4bbfdb8 upgrade send report 2024-06-15 11:36:36 +07:00
Joseph Le 0151d29450 update add multiple record 2024-06-12 21:37:38 +07:00
JOSEPH LE 247abea9e7 update assignee history 2024-06-11 11:29:45 +07:00
JOSEPH LE 4c2e525e28 update permission 2024-06-10 16:30:02 +07:00