diff --git a/APP/src/app/features/members/components/member-form-dialog/member-form-dialog.component.html b/APP/src/app/features/members/components/member-form-dialog/member-form-dialog.component.html
index c53745f..df19494 100644
--- a/APP/src/app/features/members/components/member-form-dialog/member-form-dialog.component.html
+++ b/APP/src/app/features/members/components/member-form-dialog/member-form-dialog.component.html
@@ -38,9 +38,9 @@
+ [defaultItem]="{ label: '-- Select --/請選擇', value: null }">
@@ -51,7 +51,8 @@
-
+
diff --git a/APP/src/app/features/members/components/member-form-dialog/member-form-dialog.component.ts b/APP/src/app/features/members/components/member-form-dialog/member-form-dialog.component.ts
index 98a0605..9f1a143 100644
--- a/APP/src/app/features/members/components/member-form-dialog/member-form-dialog.component.ts
+++ b/APP/src/app/features/members/components/member-form-dialog/member-form-dialog.component.ts
@@ -9,6 +9,7 @@ import { DateInputsModule } from '@progress/kendo-angular-dateinputs';
import { LayoutModule } from '@progress/kendo-angular-layout';
import { ButtonsModule } from '@progress/kendo-angular-buttons';
import { MemberDto, CreateMemberRequest } from '../../models/member.model';
+import { GENDER_OPTIONS, MEMBER_STATUS_OPTIONS } from '../../../../shared/i18n/option-lists';
@Component({
selector: 'app-member-form-dialog',
@@ -27,12 +28,8 @@ export class MemberFormDialogComponent implements OnInit {
form!: FormGroup;
isEditMode = false;
- readonly statusOptions = ['Member', 'Visitor', 'Inactive', 'Former'];
- readonly genderOptions = [
- { text: 'Male', value: 'M' },
- { text: 'Female', value: 'F' },
- { text: 'Other', value: 'Other' },
- ];
+ readonly statusOptions = MEMBER_STATUS_OPTIONS;
+ readonly genderOptions = GENDER_OPTIONS;
readonly langOptions = [
{ text: 'English', value: 'en' },
{ text: '中文', value: 'zh-TW' },
diff --git a/APP/src/app/features/members/pages/members-page/members-page.component.html b/APP/src/app/features/members/pages/members-page/members-page.component.html
index 8ad813f..90fb61d 100644
--- a/APP/src/app/features/members/pages/members-page/members-page.component.html
+++ b/APP/src/app/features/members/pages/members-page/members-page.component.html
@@ -17,7 +17,7 @@
diff --git a/APP/src/app/features/members/pages/members-page/members-page.component.ts b/APP/src/app/features/members/pages/members-page/members-page.component.ts
index 777f141..93f9a52 100644
--- a/APP/src/app/features/members/pages/members-page/members-page.component.ts
+++ b/APP/src/app/features/members/pages/members-page/members-page.component.ts
@@ -13,6 +13,7 @@ import {
MemberListItemDto, MemberDto, CreateMemberRequest,
PagedResult, memberDisplayName
} from '../../models/member.model';
+import { MEMBER_STATUS_OPTIONS } from '../../../../shared/i18n/option-lists';
@Component({
selector: 'app-members-page',
@@ -36,7 +37,10 @@ export class MembersPageComponent implements OnInit {
// Filters
searchText = '';
filterStatus = '';
- readonly statusOptions = ['', 'Member', 'Visitor', 'Inactive', 'Former'];
+ readonly statusOptions = [
+ { value: '', label: 'All Status/全部狀態' },
+ ...MEMBER_STATUS_OPTIONS,
+ ];
// Dialogs
showMemberDialog = false;