Commit graph

1150 commits

Author SHA1 Message Date
Bright
3e62126570 ปรับ family 2024-05-16 11:12:17 +07:00
Kittapath
0524653f4b แก้รูปเก่า false 2024-05-16 10:54:13 +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
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
1a017dcd76 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-05-15 16:09:42 +07:00
Kittapath
277805791d no message 2024-05-15 16:09:25 +07:00
Bright
702ed615ea Family Controller 2024-05-15 15:41:51 +07:00
0df3191fcc Merge branch 'develop' into adiDev 2024-05-15 15:31:51 +07:00
Kittapath
9365c6c62e no message 2024-05-15 15:29:23 +07:00
c9c14f052b orderBy 2024-05-15 15:29:12 +07:00
67c54e3273 fix word 2024-05-15 13:44:17 +07:00
298d92666a Merge branch 'develop' into adiDev 2024-05-15 13:39:14 +07:00
89cdee99b3 validate citizenId 2024-05-15 13:38:00 +07:00
Kittapath
db06615e5a Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-05-15 12:29:15 +07:00
Kittapath
3129cb10b0 no message 2024-05-15 12:28:58 +07:00
a6f575bff3 Merge branch 'develop' into adiDev 2024-05-15 11:46:31 +07:00
56960aeb47 คำนวนเลขบัตรประชาชน (ยังไม่ได้ validate) 2024-05-15 11:45:06 +07:00
Bright
e4d7c034e8 no message 2024-05-15 11:42:37 +07:00
Bright
20ccb3f26d Fix District/subDistrict 2024-05-15 10:04:19 +07:00
Kittapath
73ae98ce0e comment family 2024-05-14 17:32:36 +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
40205a3a97 Merge branch 'develop' into adiDev 2024-05-14 17:25:38 +07:00
AnandaTon
fcbbdbf4d1 fix bug แก้ชื่อ 2024-05-14 17:24:38 +07:00
9506128842 changName update and validate citizenId 2024-05-14 17:24:33 +07:00
Kittapath
291d3199d2 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-05-14 16:48:17 +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
566b4db692 path รูป 2024-05-14 15:43:24 +07:00
Kittapath
3429fa29a2 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-05-14 15:30:28 +07:00
Kittapath
2eee5404a1 migrate responsibility 2024-05-14 15:29:05 +07:00
Bright
fa6b7c91bf no message 2024-05-14 15:28:26 +07:00
Bright
d2c8a3b741 ข้อมูลราชการ (ลูกจ้าง) 2024-05-14 13:27:20 +07:00
Kittapath
e223b98ac3 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-05-14 12:07:36 +07:00
Bright
4671825e8d เพิ่มฟิลด์ ProfileGovernment.profileEmployeeId 2024-05-14 12:03:07 +07:00
Kittapath
35891a371a migrate 2024-05-14 11:56:40 +07:00
AnandaTon
b766112870 Merge branch 'develop' of https://github.com/Frappet/bma-ehr-organization into develop 2024-05-14 11:51:56 +07:00
AnandaTon
f73e0b1261 Update ProfileSalaryEmployeeController.ts 2024-05-14 11:51:40 +07:00
Kittapath
c5e99ee771 sort จังหวัด 2024-05-14 11:51:40 +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
5f0e3f9cf6 Merge branch 'develop' of https://github.com/Frappet/bma-ehr-organization into develop 2024-05-13 18:07:31 +07:00
AnandaTon
56d620d02f แก้ไขชื่อ และเงื่อนไขตอนลบ 2024-05-13 18:07:20 +07:00
Bright
6127a594bd rename controller 2024-05-13 17:59:11 +07:00
AnandaTon
be804c356a ข้อมูลอื่นๆ 2024-05-13 17:38:21 +07:00