From 0de69216365e7aabe44ee40fcac1b29946fffc2b Mon Sep 17 00:00:00 2001 From: puriphatt Date: Tue, 8 Apr 2025 11:12:42 +0700 Subject: [PATCH] refactor: update training labels and add agency status to user types --- public/option/option.json | 54 ++++++++++++++++++++++++++++++--------- src/i18n/eng.ts | 6 ++++- src/i18n/tha.ts | 4 +++ src/stores/user/types.ts | 12 +++++++++ 4 files changed, 63 insertions(+), 13 deletions(-) diff --git a/public/option/option.json b/public/option/option.json index 7b9f975f..c5ea33cd 100644 --- a/public/option/option.json +++ b/public/option/option.json @@ -207,29 +207,44 @@ } ], - "training": [ + "border": [ { - "label": "Myanmar Labor Training Center - Mae Sot, Tak Province", + "label": "Mae Sot, Tak Province", "value": "trainingTak" }, { - "label": "Myanmar Labor Training Center - Kawthoung, Ranong Province", + "label": "Koh Song, Ranong province", "value": "trainingRanong" }, { - "label": "Laos Labor Training Center - Nong Khai, Nong Khai Province", + "label": "Nong Khai, Nong Khai Province", "value": "trainingNongKhai" }, { - "label": "Cambodian Labor Training Center - Aranyaprathet, Sa Kaeo Province", + "label": "Aranyaprathet, Sa Kaeo Province", "value": "trainingSaKaeo" }, { - "label": "Cambodian Labor Training Center - Ban Laem, Chanthaburi Province", + "label": "Ban Laem, Chanthaburi Province", "value": "trainingChanthaburi" } ], + "training": [ + { + "label": "The first center accepts work. and end of employment Tak Province", + "value": "trainingTak" + }, + { + "label": "The first center accepts work. and end of employment Nong Khai Province", + "value": "trainingNongKhai" + }, + { + "label": "The first center accepts work. and end of employment Sa Kaeo Province", + "value": "trainingSaKaeo" + } + ], + "nationality": [ { "label": "Thai", @@ -1281,29 +1296,44 @@ } ], - "training": [ + "border": [ { - "label": "สถานที่อบรมแรงงานเมียนมา-แม่สอด จ.ตาก", + "label": "แม่สอด จ.ตาก", "value": "trainingTak" }, { - "label": "สถานที่อบรมแรงงานเมียนมา-เกาะสอง จ.ระนอง", + "label": "เกาะสอง จ.ระนอง", "value": "trainingRanong" }, { - "label": "สถานที่อบรมแรงงานลาว-หนองคาย จ.หนองคาย", + "label": "หนองคาย จ.หนองคาย", "value": "trainingNongKhai" }, { - "label": "สถานที่อบรมแรงงานกัมพูชา-อรัญประเทศ จ.สระแก้ว", + "label": "อรัญประเทศ จ.สระแก้ว", "value": "trainingSaKaeo" }, { - "label": "สถานที่อบรมแรงงานกัมพูชา-บ้านแหลม จ.จันทบุรี", + "label": "บ้านแหลม จ.จันทบุรี", "value": "trainingChanthaburi" } ], + "training": [ + { + "label": "ศูนย์แรกรับเข้าทำงาน และสิ้นสุดการจ้าง จังหวัดตาก", + "value": "trainingTak" + }, + { + "label": "ศูนย์แรกรับเข้าทำงาน และสิ้นสุดการจ้าง จังหวัดหนองคาย", + "value": "trainingNongKhai" + }, + { + "label": "ศูนย์แรกรับเข้าทำงาน และสิ้นสุดการจ้าง จังหวัดสระแก้ว", + "value": "trainingSaKaeo" + } + ], + "nationality": [ { "label": "ไทย", diff --git a/src/i18n/eng.ts b/src/i18n/eng.ts index ba87cc2d..9d3e74fa 100644 --- a/src/i18n/eng.ts +++ b/src/i18n/eng.ts @@ -452,7 +452,7 @@ export default { responsibleArea: 'Responsibel Area', discount: 'Discount Condition', sourceNationality: 'Source Nationality', - importNationality: 'import Nationality', + importNationality: 'Import Nationality', trainingPlace: 'Training Place', checkpoint: 'Checkpoint', checkpointEN: 'Checkpoint (EN)', @@ -460,6 +460,10 @@ export default { citizenId: 'Citizen ID', citizenIssue: 'Citizen Issue', citizenExpire: 'Citizen Expire', + agencyStatus: 'Agency Status', + normal: 'Normal', + canceled: 'Canceled', + blacklist: 'Black list', }, }, customer: { diff --git a/src/i18n/tha.ts b/src/i18n/tha.ts index afdcf8f8..a87f67e8 100644 --- a/src/i18n/tha.ts +++ b/src/i18n/tha.ts @@ -456,6 +456,10 @@ export default { citizenId: 'เลขที่บัตรประชาชน', citizenIssue: 'วันที่ออกบัตร', citizenExpire: 'วันที่หมดอายุ', + agencyStatus: 'สถานะการเป็นเอเจนซี่', + normal: 'ปกติ', + canceled: 'ยกเลิก', + blacklist: 'แบล็คลิสต์', }, }, customer: { diff --git a/src/stores/user/types.ts b/src/stores/user/types.ts index 7ce8ee7e..bf4632e9 100644 --- a/src/stores/user/types.ts +++ b/src/stores/user/types.ts @@ -57,6 +57,9 @@ export type User = { citizenIssue?: Date | null; citizenId: string; branch: Branch[]; + + remark?: string; + agencyStatus?: AgencyStatus; }; export type UserCreate = { @@ -105,8 +108,17 @@ export type UserCreate = { citizenExpire?: Date | null; citizenIssue?: Date | null; citizenId: string; + + remark?: string; + agencyStatus?: AgencyStatus; }; +export enum AgencyStatus { + Normal = 'Normal', + Canceled = 'Canceled', + Blacklist = 'Blacklist', +} + export type UserAttachment = { name: string; url: string;