Commit graph

7573 commits

Author SHA1 Message Date
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
521c091e86 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m38s
2026-02-10 14:12:44 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
0c88ef429b fix(retirement):message DialogConfirm 2026-02-10 14:12:04 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
f6af5fa2ee Merge branch 'dev' of https://192.168.1.60/hrms-bangkok/hrms-mgt into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m44s
2026-02-10 12:00:26 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
56bb9fe13a Merge branch 'develop' into dev 2026-02-10 12:00:16 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
4e9cf9fe1d fix(leave-detail): delete dialogMessageNotify selected.length === 0 2026-02-10 11:59:36 +07:00
9e50ae2163 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 3m1s
* develop:
  fix word
  fix:delete dialogconfirn   disable btn submit
  fix list operate
  feat:add Table Operator
2026-02-09 19:23:49 +07:00
5f4b5bbead
Merge pull request #1539 from Frappet/feat/operator
feat:add Table Operator
2026-02-09 19:22:59 +07:00
8742cab8e6 fix word 2026-02-09 19:21:52 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
aeaea7ca4a fix:delete dialogconfirn disable btn submit 2026-02-09 17:47:39 +07:00
c55780914c fix list operate 2026-02-09 17:43:09 +07:00
7136ac966c Merge branch 'develop' into feat/operator
* develop:
  fix:genReport
  แก้ข้อความยืนยันการบรรจุแล้ว
  เปิดปุ่มแก้ไขเป้ามายตามแผน ของผู้เกี่ยวข้องส่วนของโครงการะบบพัฒนา
  fix
  add code show salary history
2026-02-09 17:25:34 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
b263f120a2 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 3m0s
2026-02-09 17:17:28 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
021b12ea8d fix:genReport 2026-02-09 17:16:51 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
b3b69c5b2a feat:add Table Operator 2026-02-09 16:23:02 +07:00
6db6523f0b Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 3m58s
* develop:
  แก้ข้อความยืนยันการบรรจุแล้ว
2026-02-06 20:58:14 +07:00
8c6751ee55 แก้ข้อความยืนยันการบรรจุแล้ว 2026-02-06 20:57:56 +07:00
ddabdb573b Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 3m36s
* develop:
  เปิดปุ่มแก้ไขเป้ามายตามแผน ของผู้เกี่ยวข้องส่วนของโครงการะบบพัฒนา
2026-02-06 20:44:38 +07:00
188d12f34b เปิดปุ่มแก้ไขเป้ามายตามแผน ของผู้เกี่ยวข้องส่วนของโครงการะบบพัฒนา 2026-02-06 20:44:14 +07:00
726c4fa818 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m52s
* develop:
  fix
  add code show salary history
2026-02-06 17:33:50 +07:00
34217aff11 fix 2026-02-06 17:33:38 +07:00
2dcc167355 Merge branch 'develop' of github.com:Frappet/hrms-mgt into develop
* 'develop' of github.com:Frappet/hrms-mgt:
  fix(development):display btn projectStatus !== 'FINISH'
  fix(registry):display govAgeBkk
2026-02-06 17:05:39 +07:00
b7d9555b87 add code show salary history 2026-02-06 17:05:13 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
e3fd96d479 Merge branch 'develop' into dev
Some checks failed
Build & Deploy on Dev / build (push) Failing after 1m58s
2026-02-06 17:03:27 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
b0b64059f1 fix(development):display btn projectStatus !== 'FINISH' 2026-02-06 17:03:11 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
78d1a06942 fix(development): display btn projectStatus !== 'FINISH' 2026-02-06 17:01:41 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
7deec1a5c6 Merge branch 'develop' into dev
Some checks failed
Build & Deploy on Dev / build (push) Failing after 2m11s
2026-02-06 15:06:42 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
d1600281f9 fix(registry):display govAgeBkk 2026-02-06 15:06:28 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
aa90e8b9db Merge branch 'develop' into dev
Some checks failed
Build & Deploy on Dev / build (push) Failing after 2m38s
2026-02-06 11:01:54 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
597cbc4ed3 fix:API plan role special edit-indicator 2026-02-06 10:53:50 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
2f060d2522 fix(KPI-LIST):checkPermission.attrIsUpdate 2026-02-06 10:48:57 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
6ff749ab5f fix: rules prefix 2026-02-06 10:32:36 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
b0b16131ab fix:bug showload profile 2026-02-06 10:07:32 +07:00
cc128ccbb9 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 4m2s
* develop:
  add: leaveCount in permission leave
2026-02-05 12:16:32 +07:00
91c870955b add: leaveCount in permission leave 2026-02-05 12:16:18 +07:00
1da61d9be9 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 4m10s
* develop:
  fix: upload file
2026-02-05 11:07:55 +07:00
906c6066e3 fix: upload file 2026-02-05 11:06:10 +07:00
13c14c7382 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 5m3s
* develop:
  issue: add menu issue
2026-02-04 21:49:07 +07:00
af54914bbb issue: add menu issue 2026-02-04 21:48:48 +07:00
d25d4a8213 Merge branch 'dev' of https://192.168.1.60/hrms-bangkok/hrms-mgt into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 5m44s
* 'dev' of https://192.168.1.60/hrms-bangkok/hrms-mgt:
2026-02-04 21:05:43 +07:00
4d65ed9991 Merge branch 'develop' into dev
* develop:
  fix(registry-officer):add btn delete btn edit
  fix:add btn delete development
2026-02-04 21:05:27 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
49bcb5673a Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m40s
2026-02-04 16:29:24 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
7daf29d974 fix(registry-officer):add btn delete btn edit 2026-02-04 16:29:08 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
e5a44f4b64 Merge branch 'dev' of https://192.168.1.60/hrms-bangkok/hrms-mgt into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m30s
2026-02-04 15:06:45 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
6737b5b5f1 Merge branch 'develop' into dev 2026-02-04 15:06:37 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
488e959809 fix:add btn delete development 2026-02-04 15:06:19 +07:00
56b1d800ef Merge branch 'dev' of https://192.168.1.60/hrms-bangkok/hrms-mgt into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m35s
* 'dev' of https://192.168.1.60/hrms-bangkok/hrms-mgt:
2026-02-04 13:44:46 +07:00
c9e5f1cd71 Merge branch 'develop' into dev
* develop:
  fix:add fiedl email phone
  fix: show workflow EMP
  fix:disable radio Digital
  fix:profileId To citizenId
  fix: form upload Attachment
  fix:bug
  fix:btn position
  fix: img
  fix:interface
  feat:page issues
  fix:org name
  fix:path upload
  fix
  fix: max-file-size="5000000"
  feat:issue
2026-02-04 13:44:40 +07:00
8646e76d70
Merge pull request #1538 from Frappet/feat/issue
feat:issue
2026-02-04 13:44:04 +07:00
e3f35a189c Merge branch 'develop' into feat/issue
* develop:
  fix: show workflow EMP
  fix:disable radio Digital
  fix:profileId To citizenId
  fix: form upload Attachment
  fix:bug
  fix: active act org level 0 only
  add: บันทึกรักษาการในตำแหน่ง (owner only)
  fix: convertCommandCodeName columns commandCode
  test
  fix:default profileAvatar
  fix:show btn delete avatar active
  fix: approveCheck
  fix: statusCheck PENDING
  fix(leave):approveCheck logic for commander approval status
  fix: disabled organization view
  fix(indicator-plan):fix nodeDnaId
  fix: title by issue #2156 ปรับระดับชั้นงาน-ย้ายลูกจ้าง (ข้อความเมนูไม่เหมือนกัน)
  fix(timestamp):clear_rowData
  ปิดปุ่มแก้ไข และเพิ่มของประวัติตำแหน่ง เงินเดือน แก้ได้แค่ owner เท่านั้น

# Conflicts:
#	src/api/02_organizational/api.organization.ts
2026-02-04 13:43:52 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
5c7be2e4a8 fix:add fiedl email phone 2026-02-04 13:01:41 +07:00