AnandaTon
|
0f217da42c
|
Merge branch 'develop' of https://github.com/Frappet/bma-ehr-organization into develop
|
2024-05-17 10:11:40 +07:00 |
|
AnandaTon
|
fdb5844ad8
|
แก้ไข patch salary employee
|
2024-05-17 10:11:30 +07:00 |
|
|
|
243b5d3f4f
|
Merge branch 'develop' into adiDev
|
2024-05-17 09:51:02 +07:00 |
|
|
|
91b177190c
|
add nationality
|
2024-05-17 09:50:19 +07:00 |
|
AnandaTon
|
ef62099e92
|
Merge branch 'develop' of https://github.com/Frappet/bma-ehr-organization into develop
|
2024-05-17 09:43:58 +07:00 |
|
AnandaTon
|
6f74d3ddcc
|
แก้ไขบัค employeeSalary
|
2024-05-17 09:42:49 +07:00 |
|
Kittapath
|
056f40ab4c
|
migrate
|
2024-05-17 09:41:02 +07:00 |
|
Bright
|
c03fa76295
|
ตัดฟิลด์ couple
|
2024-05-16 16:06:11 +07:00 |
|
AnandaTon
|
3b5096c005
|
fix SalaryEmployee ลบไฟล์ รวมไฟล์ เพิ่ม field
|
2024-05-16 15:03:29 +07:00 |
|
Kittapath
|
4676b62a6f
|
no message
|
2024-05-16 14:10:08 +07:00 |
|
Kittapath
|
3ea5ec3486
|
อัพรูป
|
2024-05-16 12:13:46 +07:00 |
|
AnandaTon
|
701ab5af6e
|
แก้ไขบัคปรับ salary
|
2024-05-16 11:36:17 +07:00 |
|
|
|
0bbd172f2b
|
Merge branch 'develop' into adiDev
|
2024-05-16 10:33:42 +07:00 |
|
|
|
ffb5b38936
|
empAddress and fix durationYear
|
2024-05-16 10:32:51 +07:00 |
|
Kittapath
|
73c91bd9b1
|
update_table_ProfileAvatar_add_isactive
|
2024-05-16 10:01:59 +07:00 |
|
AnandaTon
|
b510ae62aa
|
แก้โค้ด
|
2024-05-16 09:35:11 +07:00 |
|
|
|
9f2357b81c
|
Merge branch 'develop' into adiDev
|
2024-05-15 18:07:12 +07:00 |
|
|
|
cf3c3feba2
|
fix entity and store dateRetire
|
2024-05-15 18:06:28 +07:00 |
|
Bright
|
4fa11d2aea
|
ปรับ children
|
2024-05-15 18:02:16 +07:00 |
|
Kittapath
|
9365c6c62e
|
no message
|
2024-05-15 15:29:23 +07:00 |
|
Bright
|
b7ca6795cb
|
Fix Entity
|
2024-05-15 14:34:21 +07:00 |
|
Bright
|
34d988b8a4
|
เพิ่ม zipcode
|
2024-05-15 11:29:32 +07:00 |
|
Bright
|
20ccb3f26d
|
Fix District/subDistrict
|
2024-05-15 10:04:19 +07:00 |
|
Kittapath
|
27fefee8d7
|
วันที่เกษียณ
|
2024-05-14 17:54:17 +07:00 |
|
Bright
|
3e0bcd8a08
|
Merge branch 'develop' into develop-Bright
# Conflicts:
# src/entities/Profile.ts
# src/entities/ProfileEmployee.ts
|
2024-05-14 17:42:38 +07:00 |
|
Bright
|
968842557a
|
family entity (father, mother, couple)
|
2024-05-14 17:39:32 +07:00 |
|
Kittapath
|
09b543763b
|
Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop
# Conflicts:
# src/entities/Profile.ts
|
2024-05-14 17:29:14 +07:00 |
|
Kittapath
|
0114e41c3a
|
แก้ไขบุตร
|
2024-05-14 17:26:06 +07:00 |
|
AnandaTon
|
fcbbdbf4d1
|
fix bug แก้ชื่อ
|
2024-05-14 17:24:38 +07:00 |
|
Kittapath
|
291d3199d2
|
Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop
|
2024-05-14 16:48:17 +07:00 |
|
Bright
|
e99bd89b1e
|
ปรับrelation geverment
|
2024-05-14 16:21:38 +07:00 |
|
Kittapath
|
b8cbbb3a6f
|
no message
|
2024-05-14 16:20:36 +07:00 |
|
AnandaTon
|
dd06c1f71f
|
fix bug salary / nopaid
|
2024-05-14 16:16:24 +07:00 |
|
Kittapath
|
2eee5404a1
|
migrate responsibility
|
2024-05-14 15:29:05 +07:00 |
|
|
|
f1a8652587
|
Merge branch 'develop' into adiDev
|
2024-05-14 14:42:23 +07:00 |
|
|
|
596b7f0b97
|
duty
|
2024-05-14 14:37:23 +07:00 |
|
Bright
|
4671825e8d
|
เพิ่มฟิลด์ ProfileGovernment.profileEmployeeId
|
2024-05-14 12:03:07 +07:00 |
|
|
|
e1db0a0a73
|
Merge branch 'develop' into adiDev
|
2024-05-14 11:55:36 +07:00 |
|
|
|
4f1488ff6b
|
add duty
|
2024-05-14 11:55:00 +07:00 |
|
AnandaTon
|
9b92863196
|
เพิ่มเงินเดือน
|
2024-05-14 11:50:52 +07:00 |
|
|
|
a826726c80
|
Merge branch 'develop' into adiDev
|
2024-05-14 10:33:48 +07:00 |
|
|
|
ac82b6351f
|
crud emp myinfo
|
2024-05-14 10:29:05 +07:00 |
|
AnandaTon
|
be804c356a
|
ข้อมูลอื่นๆ
|
2024-05-13 17:38:21 +07:00 |
|
AnandaTon
|
1afe64bdd3
|
แก้ไขข้อมูลราชการเเละบันทึกไม่ได้รับเงินเดือนเพิ่มเติม
|
2024-05-13 17:26:04 +07:00 |
|
|
|
f42f200c8a
|
Merge branch 'develop' into adiDev
|
2024-05-13 17:22:39 +07:00 |
|
|
|
c441df3dc9
|
fix and relation emp
|
2024-05-13 17:21:19 +07:00 |
|
Bright
|
4faefe54f3
|
ข้อมูลผลงาน ทะเบียนประวัติลูกจ้าง
|
2024-05-13 17:09:34 +07:00 |
|
AnandaTon
|
b1c6f5fead
|
relation profileEmployee
|
2024-05-13 16:37:51 +07:00 |
|
Bright
|
a9f0458f1b
|
no message
|
2024-05-13 15:28:53 +07:00 |
|
Bright
|
59607aafd1
|
relation profileEmployee
|
2024-05-13 15:06:52 +07:00 |
|
