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

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

Browse source
This commit is contained in:
Kittapath 2024-04-03 17:32:26 +07:00
commit 5a2f64ed72
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/controllers/DevelopmentEmployeeHistoryController.ts
View file

@ -242,8 +242,8 @@ export class DevelopmentEmployeeHistoryController extends Controller {
totalDate: getDevelopment.development.totalDate ? getDevelopment.development.totalDate : null,
addressAcademic: getDevelopment.development.addressAcademic ? getDevelopment.development.addressAcademic : null,
topicAcademic: getDevelopment.development.topicAcademic ? getDevelopment.development.topicAcademic : null,
dateStartAcademic: new Date(),
dateEndAcademic: new Date(),
dateStudyStart: getDevelopment.development.dateStudyStart ? getDevelopment.development.dateStudyStart : null,
dateStudyEnd: getDevelopment.development.dateStudyEnd ? getDevelopment.development.dateStudyEnd : null,
org: null,
};

4
src/controllers/DevelopmentHistoryController.ts
View file

@ -238,8 +238,8 @@ export class DevelopmentOfficerHistoryController extends Controller {
totalDate: getDevelopment.development.totalDate ? getDevelopment.development.totalDate : null,
addressAcademic: getDevelopment.development.addressAcademic ? getDevelopment.development.addressAcademic : null,
topicAcademic: getDevelopment.development.topicAcademic ? getDevelopment.development.topicAcademic : null,
dateStartAcademic: new Date(),
dateEndAcademic: new Date(),
dateStudyStart: getDevelopment.development.dateStudyStart ? getDevelopment.development.dateStudyStart : null,
dateStudyEnd: getDevelopment.development.dateStudyEnd ? getDevelopment.development.dateStudyEnd : null,
org: null,
};