Commit Graph

221 Commits

Author SHA1 Message Date
nguentrungthat be6d7be79e Update check working 2025-02-14 16:51:46 +07:00
nguentrungthat 73edecf341 Update select query 2025-02-14 10:49:12 +07:00
nguentrungthat 13a477e883 Update TrackingController.php 2025-02-14 10:44:42 +07:00
nguentrungthat bb12c55ef6 Update TrackingController.php 2025-02-14 09:43:21 +07:00
nguentrungthat 49b681566d fix 2025-02-14 09:42:08 +07:00
nguentrungthat 846df81d44 Update Working review 2025-02-13 17:01:52 +07:00
nguentrungthat 174c8889ce Update Project Review, export 2025-02-07 14:42:31 +07:00
nguentrungthat 4fd18b988e Update 2025-02-06 13:16:07 +07:00
root 07d28e24cd add script detect face 2025-01-17 14:50:09 +07:00
Joseph d80e7c0957 update jwt expried 2025-01-16 14:30:04 +07:00
Truong Vo 7fdf6f3e25 Bổ sung nút report excel trang timekeeping , leave management 2024-12-06 09:07:54 +07:00
Truong Vo 93030b73c7 Bổ sung nút report excel trang timekeeping , leave management 2024-12-05 17:25:07 +07:00
Joseph fcaa2926fd update send mail warning 2024-11-11 16:26:47 +07:00
Joseph 0e875d7cf9 update send mail warning 2024-11-08 16:45:55 +07:00
Joseph f96f445c7f update accoutant role 2024-11-04 07:39:36 +07:00
Joseph 1d9e428587 update $morning_condition_time 2024-10-24 07:28:41 +07:00
Joseph a830791648 update mail subject 2024-10-23 07:54:50 +07:00
Joseph 8d8985a6be update send mail warning checkin late 2024-10-21 14:23:03 +07:00
Joseph d53b786daf update root folder by enviroment 2024-10-16 16:09:56 +07:00
Joseph 2eed0f006b Merge branch 'master' of https://gitea.nswteam.net/joseph/ManagementSystem 2024-10-16 15:38:05 +07:00
Joseph e226ad41d7 create page manage profiles, page add profile user 2024-10-16 15:35:58 +07:00
Truong Vo 4334f3e73d Bổ sung check điều kiện có user check in check out (ngày hợp lệ) 2024-10-16 09:44:29 +07:00
Truong Vo 1c16b4b164 BỔ SUNG CHECK THÊM điều kiện user ticket nguyên ngày 2024-10-16 09:03:52 +07:00
Truong Vo 34b6698696 BỔ SUNG CHECK THÊM điều kiện user ticket nguyên ngày 2024-10-16 07:54:38 +07:00
Truong Vo ceb925f571 Bỏ bắt buộc field Admin notes khi admin duyệt or từ chối ticket 2024-10-14 11:04:44 +07:00
Truong Vo 46d4ffa339 Tạo ticket tự động cho user khi user không check in, check out 2024-10-14 10:11:59 +07:00
Truong Vo d0c1b6894b Tạo ticket tự động cho user khi user không check in, check out 2024-10-14 10:09:04 +07:00
Truong Vo 7fa50478cc Tạo ticket tự động cho user khi user không check in, check out 2024-10-09 10:26:33 +07:00
Truong Vo 9e83615eeb Bổ sung sort theo ngày mới nhất 2024-09-24 16:23:16 +07:00
Truong Vo c0826f814e Hiệu chỉnh api update technical 2024-09-24 16:18:03 +07:00
joseph 5b7ad04a0f Merge pull request 'update personnel allocation' (#85) from joseph.update_navbar_permissions into master
Reviewed-on: #85
2024-09-24 14:20:57 +10:00
JOSEPH LE a9e93d84d1 update personnel allocation 2024-09-24 11:20:36 +07:00
joseph a7015ceedc Merge pull request 'update permission api' (#84) from joseph.update_navbar_permissions into master
Reviewed-on: #84
2024-09-24 12:46:24 +10:00
JOSEPH LE 5df3959dd8 update permission api 2024-09-24 09:45:48 +07:00
joseph 0ce1b1840a Merge pull request 'update permission api' (#83) from joseph.update_navbar_permissions into master
Reviewed-on: #83
2024-09-24 12:30:42 +10:00
JOSEPH LE 29a3e4de36 update permission api 2024-09-24 09:28:14 +07:00
dbdbd9 555934ac5c Technical: fix ui profile technical 2024-09-21 11:29:37 +07:00
Truong Vo db90658482 fix error 2024-09-21 11:21:13 +07:00
JOSEPH LE 7622e7a95b update cache and UI 2024-09-21 10:50:03 +07:00
Truong Vo f38e19f1d7 Hiệu chỉnh format cột bảng dữ liệu export 2024-09-21 10:31:57 +07:00
Truong Vo 2e3cf4702c Hiệu chỉnh format cột bảng dữ liệu export 2024-09-21 10:28:09 +07:00
Truong Vo eb68634582 Hiệu chỉnh format cột bảng dữ liệu export 2024-09-21 10:24:20 +07:00
Truong Vo dff092348a Hiệu chỉnh api download: cập nhật filter fromdate, todate, bổ sung thêm dữ liệu technicals 2024-09-21 10:11:39 +07:00
Truong Vo 0fe9228241 Intergate chức năng staff evaluation 2024-09-20 17:54:46 +07:00
Truong Vo 8ebe9eb57f Cập nhật lại filter api theo ngày hoàn thành sprint 2024-09-20 17:12:24 +07:00
Truong Vo 9d32e3024f Merge branch 'master' into Sprint-4/MS-37-FE-Evaluation 2024-09-20 17:03:56 +07:00
Truong Vo bd4a481aab Intergate api chức năng Staff evaluation 2024-09-20 16:52:56 +07:00
dbdbd9 14fcbd9224 merge code 2024-09-20 16:06:43 +07:00
dbdbd9 977728a22d Evaluation: filter date sprint-review, filter technical name, export report file 2024-09-20 16:02:16 +07:00
Truong Vo e114d5b3ae Bổ sung api get all user 2024-09-20 15:52:33 +07:00
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