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 |
|
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 |
|
Kittapath
|
d57d4220dd
|
migrate
|
2024-05-14 11:17:00 +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 |
|
Kittapath
|
660deeb3a4
|
migrate
|
2024-05-13 17:52:55 +07:00 |
|
AnandaTon
|
be804c356a
|
ข้อมูลอื่นๆ
|
2024-05-13 17:38:21 +07:00 |
|
AnandaTon
|
2d582be2a1
|
Merge branch 'develop' of https://github.com/Frappet/bma-ehr-organization into develop
|
2024-05-13 17:26:14 +07:00 |
|
AnandaTon
|
1afe64bdd3
|
แก้ไขข้อมูลราชการเเละบันทึกไม่ได้รับเงินเดือนเพิ่มเติม
|
2024-05-13 17:26:04 +07:00 |
|
Kittapath
|
d2b9d38e28
|
migrate
|
2024-05-13 17:25:58 +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 |
|
AnandaTon
|
ea31c06fba
|
ข้อมูลราชการเเละบันทึกไม่ได้รับเงินเดือน
วินัย
การลา
ปฎิบัติราชการพิเศษ
|
2024-05-13 17:17:33 +07:00 |
|
Bright
|
4faefe54f3
|
ข้อมูลผลงาน ทะเบียนประวัติลูกจ้าง
|
2024-05-13 17:09:34 +07:00 |
|
Kittapath
|
497db161c4
|
migrate
|
2024-05-13 16:43:17 +07:00 |
|
AnandaTon
|
b1c6f5fead
|
relation profileEmployee
|
2024-05-13 16:37:51 +07:00 |
|
Kittapath
|
9a7adc4eb5
|
migrate
|
2024-05-13 15:38:56 +07:00 |
|
