|
|
63d357ea30
|
Merge branch 'develop' into adiDev
# Conflicts:
# src/controllers/ProfileController.ts
# src/controllers/ProfileEmployeeController.ts
|
2024-05-24 11:09:26 +07:00 |
|
|
|
eea123fbad
|
add field profile and profile-employee search-personal
|
2024-05-24 11:06:43 +07:00 |
|
Kittapath
|
85f8fbb03a
|
get profile by token
|
2024-05-24 01:11:47 +07:00 |
|
Bright
|
58fe2f08fd
|
get ข้อมูล by keycloak (ลูกจ้าง)
|
2024-05-23 18:30:16 +07:00 |
|
Kittapath
|
24c5cbef55
|
แก้ค้นหาประวัติ by token
|
2024-05-23 17:20:15 +07:00 |
|
Kittapath
|
ff0be7af48
|
get ข้อมูล by keycloak
|
2024-05-23 16:44:37 +07:00 |
|
Kittapath
|
f6bcd35e14
|
Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop
# Conflicts:
# src/controllers/ProfileController.ts
|
2024-05-23 15:38:18 +07:00 |
|
Kittapath
|
852525c8f5
|
แก้ค้นหาลูกจ้าง
|
2024-05-23 15:37:13 +07:00 |
|
Bright
|
86fd868adf
|
ปรับ query report
|
2024-05-23 15:28:49 +07:00 |
|
Kittapath
|
689d48aadc
|
no message
|
2024-05-23 14:10:50 +07:00 |
|
|
|
bda7c1328f
|
Merge branch 'develop' into adiDev
|
2024-05-23 10:28:58 +07:00 |
|
|
|
2c64ee1220
|
fix
|
2024-05-23 10:26:43 +07:00 |
|
Bright
|
2149b799dc
|
report ประวัติแบบย่อ
|
2024-05-23 10:11:08 +07:00 |
|
|
|
732467965e
|
Merge branch 'develop' into adiDev
|
2024-05-23 10:07:50 +07:00 |
|
|
|
cd050b2032
|
fix sort
|
2024-05-23 10:07:07 +07:00 |
|
Kittapath
|
8c03528ff3
|
profile/search เพิ่ม profileId
|
2024-05-21 15:00:55 +07:00 |
|
|
|
c56ffece73
|
fix
|
2024-05-21 13:55:26 +07:00 |
|
|
|
40d2a37b34
|
fix
|
2024-05-21 13:30:25 +07:00 |
|
|
|
3b68f7670f
|
api profile/search
|
2024-05-21 13:23:42 +07:00 |
|
Kittapath
|
f6bdfce063
|
Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop
|
2024-05-20 15:27:56 +07:00 |
|
Kittapath
|
7763544a93
|
no message
|
2024-05-20 15:25:18 +07:00 |
|
Bright
|
77e3248a3a
|
ค้นหาประวัติการครองตำแหน่ง ขรก./ลูกจ้าง
|
2024-05-20 15:23:26 +07:00 |
|
|
|
8f74e3a366
|
Merge branch 'develop' into adiDev
|
2024-05-20 11:13:18 +07:00 |
|
|
|
d052f67454
|
fix edu
|
2024-05-20 11:12:23 +07:00 |
|
Kittapath
|
2cfef7abd6
|
get profile by keycloak
|
2024-05-17 17:14:41 +07:00 |
|
AnandaTon
|
391501b665
|
Merge branch 'develop' of https://github.com/Frappet/bma-ehr-organization into develop
|
2024-05-17 14:22:05 +07:00 |
|
AnandaTon
|
ae947a48c0
|
เพิ่มฟิว governant
|
2024-05-17 14:21:53 +07:00 |
|
Kittapath
|
92a865fd3c
|
Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop
|
2024-05-17 14:17:09 +07:00 |
|
Kittapath
|
2869430083
|
no message
|
2024-05-17 14:16:40 +07:00 |
|
|
|
884fe694d0
|
Merge branch 'develop' into adiDev
|
2024-05-17 13:36:27 +07:00 |
|
|
|
25285af736
|
add dateRetireLaw profile
|
2024-05-17 13:35:36 +07:00 |
|
Bright
|
a529207692
|
เช็คเลขบัตร ปชช.
|
2024-05-17 12:54:18 +07:00 |
|
|
|
eb50563dfe
|
Merge branch 'develop' into adiDev
|
2024-05-17 11:23:23 +07:00 |
|
|
|
9045b9ec90
|
fix
|
2024-05-17 11:22:31 +07:00 |
|
Bright
|
c306c85504
|
ค้นหาตำแหน่งในระบบสมัครสอบ ลูกจ้าง
|
2024-05-17 11:16:39 +07:00 |
|
|
|
5361184bfd
|
Merge branch 'develop' into adiDev
|
2024-05-17 11:09:49 +07:00 |
|
|
|
b456b5ca72
|
fix
|
2024-05-17 11:09:04 +07:00 |
|
AnandaTon
|
06db1a6c68
|
fix swap direction
|
2024-05-17 11:03:27 +07:00 |
|
AnandaTon
|
6f74d3ddcc
|
แก้ไขบัค employeeSalary
|
2024-05-17 09:42:49 +07:00 |
|
Kittapath
|
067231d291
|
Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop
|
2024-05-17 09:32:23 +07:00 |
|
Kittapath
|
6525bbcb6f
|
no message
|
2024-05-17 09:32:07 +07:00 |
|
Bright
|
61a68fdb19
|
เพิ่มฟิลด์ coupleCitizenId
|
2024-05-16 17:11:44 +07:00 |
|
Bright
|
c03fa76295
|
ตัดฟิลด์ couple
|
2024-05-16 16:06:11 +07:00 |
|
|
|
a39c33ae0d
|
Merge branch 'develop' into adiDev
|
2024-05-16 15:24:08 +07:00 |
|
|
|
4dac692284
|
fix
|
2024-05-16 15:22:30 +07:00 |
|
AnandaTon
|
d26337caf3
|
แก้ชื่อ function
|
2024-05-16 15:16:00 +07:00 |
|
AnandaTon
|
3b5096c005
|
fix SalaryEmployee ลบไฟล์ รวมไฟล์ เพิ่ม field
|
2024-05-16 15:03:29 +07:00 |
|
AnandaTon
|
9603f895ad
|
Merge branch 'develop' of https://github.com/Frappet/bma-ehr-organization into develop
|
2024-05-16 14:10:20 +07:00 |
|
AnandaTon
|
fe6b5b5b04
|
Update ProfileDisciplineController.ts
|
2024-05-16 14:10:17 +07:00 |
|
Kittapath
|
feb8da3947
|
เพิ่มsearch avatar
|
2024-05-16 13:39:25 +07:00 |
|