Commit graph

803 commits

Author SHA1 Message Date
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
Bright
b7ca6795cb Fix Entity 2024-05-15 14:34:21 +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
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
Kittapath
39e6c6e1c5 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-05-14 17:47:03 +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
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
Bright
2369c3f0d5 Merge branch 'develop' into develop-Bright 2024-05-14 16:21:52 +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
Bright
0d86a02f5b ปรับrelation geverment 2024-05-14 16:20:18 +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
Kittapath
6311c9cb0d migrate 2024-05-14 15:06:31 +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
d2c8a3b741 ข้อมูลราชการ (ลูกจ้าง) 2024-05-14 13:27:20 +07:00
Bright
03ba1cda5e Merge branch 'develop' into develop-Bright 2024-05-14 12:40:51 +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
312b2c9d4c Merge branch 'develop' into develop-Bright 2024-05-14 12:03:32 +07:00
Bright
4671825e8d เพิ่มฟิลด์ ProfileGovernment.profileEmployeeId 2024-05-14 12:03:07 +07:00
Kittapath
6cdb8e42e0 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-05-14 12:00:52 +07:00
Bright
4888b36eb1 เพิ่มฟิลด์ ProfileGovernment.profileEmployeeId 2024-05-14 12:00:08 +07:00
Kittapath
35891a371a migrate 2024-05-14 11:56:40 +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