Merge branch 'develop' into devTee

# Conflicts:
#	src/api/registry/api.registry.ts
This commit is contained in:
setthawutttty 2024-03-25 14:11:36 +07:00
commit 28fb5ebb9a
20 changed files with 731 additions and 764 deletions

View file

@ -1,11 +1,25 @@
import env from "../index";
const registryNew = `${env.API_URI}/org/profile/`;
const metadata = `${env.API_URI}/org/metadata/`;
export default {
registryNew,
registryNewByProfileId: (profileId: string) => `${registryNew}${profileId}`,
// metadata
profileNewGender: `${metadata}gender`,
profileNewReligion: `${metadata}religion`,
profileNewRelationship: `${metadata}relationship`,
profileNewBloodGroup: `${metadata}bloodGroup`,
// ประวัติส่วนตัว
profileNewProfileByProfileId: (profileId: string) =>
`${registryNew}${profileId}`,
profileNewProfileById: (dataId: string) => `${registryNew}${dataId}`,
profileNewProfileHisById: (dataId: string) =>
`${registryNew}history/${dataId}`,
// บันทึกวันที่ไม่ได้รับเงินเดือนฯ
profileNewNoPaid: `${registryNew}nopaid`,
profileNewNoPaidByProfileId: (profileId: string) =>
@ -83,23 +97,23 @@ export default {
profileNewOtherHisById: (dataId: string) =>
`${registryNew}other/history/${dataId}`,
// ข้อมูลครอบครัว
profileNewFamily: `${registryNew}family`,
profileNewFamilyByProfileId: (profileId: string) =>
`${registryNew}family/${profileId}`,
profileNewFamilyByFamilyId: (familyId: string) =>
`${registryNew}family/${familyId}`,
profileNewFamilyeHisByFamilyId: (familyId: string) =>
`${registryNew}family/history/${familyId}`,
// ข้อมูลครอบครัว
profileNewFamily: `${registryNew}family`,
profileNewFamilyByProfileId: (profileId: string) =>
`${registryNew}family/${profileId}`,
profileNewFamilyByFamilyId: (familyId: string) =>
`${registryNew}family/${familyId}`,
profileNewFamilyeHisByFamilyId: (familyId: string) =>
`${registryNew}family/history/${familyId}`,
// วินัย
profileNewDiscipline: `${registryNew}discipline`,
profileNewDisciplineByProfileId: (profileId: string) =>
`${registryNew}discipline/${profileId}`,
profileNewDisciplineByDisciplineId: (disciplineId: string) =>
`${registryNew}discipline/${disciplineId}`,
profileNewDisciplineHisByDisciplineId: (disciplineId: string) =>
`${registryNew}discipline/history/${disciplineId}`,
// วินัย
profileNewDiscipline: `${registryNew}discipline`,
profileNewDisciplineByProfileId: (profileId: string) =>
`${registryNew}discipline/${profileId}`,
profileNewDisciplineByDisciplineId: (disciplineId: string) =>
`${registryNew}discipline/${disciplineId}`,
profileNewDisciplineHisByDisciplineId: (disciplineId: string) =>
`${registryNew}discipline/history/${disciplineId}`,
// ปฏิบัติราชการพิเศษ
profileNewDuty: `${registryNew}duty`,
@ -122,4 +136,9 @@ profileNewLeaveById:(id:string)=>`${registryNew}leave/${id}`,
profileNewLeaveHistory:(id:string)=>`${registryNew}leave/history/${id}`,
profileCheckDate:()=>`${env.API_URI}/leave/user/check`,
profileNewLeaveType:()=>`${env.API_URI}/leave/type`,
/** ตำแหน่งเงินเดือน*/
profileSalaryNew: `${env.API_URI}/org/profileSalary`,
profileSalaryNewById: (id: string) =>
`${env.API_URI}/org/profileSalary/${id}`,
};