hrms-bangkok/hrms-api-org
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop

Browse source
This commit is contained in:
Kittapath 2024-05-17 09:32:23 +07:00
commit 067231d291
2 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/controllers/ProfileFamilyCoupleController.ts
View file

@ -119,6 +119,7 @@ export class ProfileFamilyCoupleController extends Controller {
coupleLastName: y.coupleLastName, coupleLastName: y.coupleLastName,
coupleLastNameOld: y.coupleLastNameOld, coupleLastNameOld: y.coupleLastNameOld,
coupleCareer: y.coupleCareer, coupleCareer: y.coupleCareer,
coupleCitizenId: y.coupleCitizenId,
coupleLive: y.coupleLive, coupleLive: y.coupleLive,
relationship: y.relationship, relationship: y.relationship,
profileFamilyCoupleId: y.profileFamilyCoupleId, profileFamilyCoupleId: y.profileFamilyCoupleId,
@ -156,6 +157,7 @@ export class ProfileFamilyCoupleController extends Controller {
coupleLastName: familyCouple.coupleLastName, coupleLastName: familyCouple.coupleLastName,
coupleLastNameOld: familyCouple.coupleLastNameOld, coupleLastNameOld: familyCouple.coupleLastNameOld,
coupleCareer: familyCouple.coupleCareer, coupleCareer: familyCouple.coupleCareer,
coupleCitizenId: familyCouple.coupleCitizenId,
coupleLive: familyCouple.coupleLive, coupleLive: familyCouple.coupleLive,
relationship: familyCouple.relationship, relationship: familyCouple.relationship,
createdUserId: req.user.sub, createdUserId: req.user.sub,
@ -191,6 +193,7 @@ export class ProfileFamilyCoupleController extends Controller {
history.coupleLastName = familyCouple.coupleLastName, history.coupleLastName = familyCouple.coupleLastName,
history.coupleLastNameOld = familyCouple.coupleLastNameOld, history.coupleLastNameOld = familyCouple.coupleLastNameOld,
history.coupleCareer = familyCouple.coupleCareer, history.coupleCareer = familyCouple.coupleCareer,
history.coupleCitizenId = familyCouple.coupleCitizenId,
history.coupleLive = familyCouple.coupleLive, history.coupleLive = familyCouple.coupleLive,
history.relationship = familyCouple.relationship, history.relationship = familyCouple.relationship,
history.lastUpdateUserId = req.user.sub, history.lastUpdateUserId = req.user.sub,

3
src/controllers/ProfileFamilyCoupleEmployeeController.ts
View file

@ -119,6 +119,7 @@ export class ProfileFamilyCoupleEmployeeController extends Controller {
coupleLastName: y.coupleLastName, coupleLastName: y.coupleLastName,
coupleLastNameOld: y.coupleLastNameOld, coupleLastNameOld: y.coupleLastNameOld,
coupleCareer: y.coupleCareer, coupleCareer: y.coupleCareer,
coupleCitizenId: y.coupleCitizenId,
coupleLive: y.coupleLive, coupleLive: y.coupleLive,
relationship: y.relationship, relationship: y.relationship,
profileFamilyCoupleId: y.profileFamilyCoupleId, profileFamilyCoupleId: y.profileFamilyCoupleId,
@ -156,6 +157,7 @@ export class ProfileFamilyCoupleEmployeeController extends Controller {
coupleLastName: familyCouple.coupleLastName, coupleLastName: familyCouple.coupleLastName,
coupleLastNameOld: familyCouple.coupleLastNameOld, coupleLastNameOld: familyCouple.coupleLastNameOld,
coupleCareer: familyCouple.coupleCareer, coupleCareer: familyCouple.coupleCareer,
coupleCitizenId: familyCouple.coupleCitizenId,
coupleLive: familyCouple.coupleLive, coupleLive: familyCouple.coupleLive,
relationship: familyCouple.relationship, relationship: familyCouple.relationship,
createdUserId: req.user.sub, createdUserId: req.user.sub,
@ -191,6 +193,7 @@ export class ProfileFamilyCoupleEmployeeController extends Controller {
history.coupleLastName = familyCouple.coupleLastName, history.coupleLastName = familyCouple.coupleLastName,
history.coupleLastNameOld = familyCouple.coupleLastNameOld, history.coupleLastNameOld = familyCouple.coupleLastNameOld,
history.coupleCareer = familyCouple.coupleCareer, history.coupleCareer = familyCouple.coupleCareer,
history.coupleCitizenId = familyCouple.coupleCitizenId,
history.coupleLive = familyCouple.coupleLive, history.coupleLive = familyCouple.coupleLive,
history.relationship = familyCouple.relationship, history.relationship = familyCouple.relationship,
history.lastUpdateUserId = req.user.sub, history.lastUpdateUserId = req.user.sub,