diff --git a/APP/src/app/features/expense/components/expense-form-dialog/expense-form-dialog.component.html b/APP/src/app/features/expense/components/expense-form-dialog/expense-form-dialog.component.html index afb07ff..88b73ae 100644 --- a/APP/src/app/features/expense/components/expense-form-dialog/expense-form-dialog.component.html +++ b/APP/src/app/features/expense/components/expense-form-dialog/expense-form-dialog.component.html @@ -19,11 +19,11 @@ @@ -31,12 +31,12 @@ @@ -44,11 +44,11 @@ diff --git a/APP/src/app/features/expense/pages/expenses-page/expenses-page.component.html b/APP/src/app/features/expense/pages/expenses-page/expenses-page.component.html index 483e1e1..1460f95 100644 --- a/APP/src/app/features/expense/pages/expenses-page/expenses-page.component.html +++ b/APP/src/app/features/expense/pages/expenses-page/expenses-page.component.html @@ -17,11 +17,11 @@ Ministry + [defaultItem]="{ id: null, label: 'All Ministries/全部事工' }"> @@ -29,8 +29,11 @@ Status + [defaultItem]="{ value: null, label: 'All Status/全部狀態' }"> diff --git a/APP/src/app/features/expense/pages/expenses-page/expenses-page.component.ts b/APP/src/app/features/expense/pages/expenses-page/expenses-page.component.ts index 6ffb827..c8065b4 100644 --- a/APP/src/app/features/expense/pages/expenses-page/expenses-page.component.ts +++ b/APP/src/app/features/expense/pages/expenses-page/expenses-page.component.ts @@ -7,10 +7,11 @@ import { DropDownsModule } from '@progress/kendo-angular-dropdowns'; import { InputsModule } from '@progress/kendo-angular-inputs'; import { DialogsModule } from '@progress/kendo-angular-dialog'; import { DateInputsModule } from '@progress/kendo-angular-dateinputs'; +import { EXPENSE_STATUS_OPTIONS } from '../../../../shared/i18n/option-lists'; import { ExpenseApiService, ExpenseQuery } from '../../services/expense-api.service'; import { MinistryApiService } from '../../services/ministry-api.service'; import { ExpenseFormDialogComponent, ExpenseFormResult } from '../../components/expense-form-dialog/expense-form-dialog.component'; -import { ExpenseListItemDto, MinistryDto, ExpenseStatus } from '../../models/expense.model'; +import { ExpenseListItemDto, MinistryDto } from '../../models/expense.model'; import { switchMap, of } from 'rxjs'; @Component({ @@ -31,7 +32,7 @@ export class ExpensesPageComponent implements OnInit { loading = false; ministries: MinistryDto[] = []; - readonly statuses: ExpenseStatus[] = ['Draft', 'PendingApproval', 'Approved', 'Paid', 'Rejected']; + readonly statuses = EXPENSE_STATUS_OPTIONS; filter: ExpenseQuery = {};