Skip to content

Commit

Permalink
Update request set default status option 'new'
Browse files Browse the repository at this point in the history
  • Loading branch information
esdd1995 committed Feb 7, 2025
1 parent 3bb4498 commit 28adfd9
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 11 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<app-table-filters [tabIndex]="tabIndex" [tableFilterKeys]="tableFilterKeys" [statusFilterOptions]="statusFilterOptions"
(onFilterChanged)="onApplyFilter($event)">
[defaultStatusFilter]="defaultStatusFilter" (onFilterChanged)="onApplyFilter($event)">
</app-table-filters>

<div class="table-responsive">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { Dispute, DisputeStatus } from 'app/api';
import { LoggerService } from '@core/services/logger.service';
import { AuthService, KeycloakProfile } from 'app/services/auth.service';
import { DateUtil } from '@shared/utils/date-util';
import { TableFilter, TableFilterKeys, TableFilterStatus, TableFilterStatusOptions } from '@shared/models/table-filter-options.model';
import { TableFilter, TableFilterKeys, TableFilterStatus, TableFilterStatusOptions, UpdateRequestTableStatusDefault } from '@shared/models/table-filter-options.model';
import { TableFilterService } from 'app/services/table-filter.service';

@Component({
Expand All @@ -21,6 +21,7 @@ export class UpdateRequestInboxComponent implements OnInit, AfterViewInit {
dataSource = new MatTableDataSource();
tableFilterKeys: TableFilterKeys[] = ["dateSubmittedFrom", "dateSubmittedTo", "disputantSurname", "status", "ticketNumber"];
statusFilterOptions = TableFilterStatusOptions;
defaultStatusFilter = UpdateRequestTableStatusDefault;
displayedColumns: string[] = [
'submittedTs',
'ticketNumber',
Expand Down Expand Up @@ -52,7 +53,7 @@ export class UpdateRequestInboxComponent implements OnInit, AfterViewInit {
this.userProfile = userProfile;
}
})

// when authentication token available, get data
this.getAllDisputesWithPendingUpdates();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export class TableFiltersComponent implements OnInit {
@Input() tabIndex: number;
@Input() tableFilterKeys: TableFilterKeys[] = [];
@Input() statusFilterOptions: DisputeStatus[] = [];
@Input() statusFilterDefaultText: string = 'ALL';
@Input() defaultStatusFilter: TableFilterStatus = TableFilterStatusDefault;
@Input() courthouseTeamNames: string[] = [];
@Output() onFilterChanged: EventEmitter<TableFilter> = new EventEmitter();

Expand Down Expand Up @@ -42,17 +42,17 @@ export class TableFiltersComponent implements OnInit {
this.tableFilterConfigs[key] = true;
})
this.dataFilters = this.tableFilterService.tableFilters[this.tabIndex];
this.dataFilters.status = this.dataFilters.status ?? TableFilterStatusDefault;
this.dataFilters.status = this.dataFilters.status ?? this.defaultStatusFilter;
}

resetSearchFilters() {
// Will update search filters in UI
this.dataFilters = new TableFilter();
this.dataFilters.status = this.defaultStatusFilter;
// Will re-execute the filter function, but will block UI rendering
// Put this call in a Timeout to keep UI responsive.
setTimeout(() => {
this.tableFilterService.tableFilters[this.tabIndex] = this.dataFilters;
//this.dataFilters.status = this.dataFilters.status ?? [];
this.onFilterChanged.emit(this.dataFilters);
}, 100);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
import { Injectable } from '@angular/core';
import { TableFilter } from '@shared/models/table-filter-options.model';
import { TableFilter, UpdateRequestTableStatusDefault} from '@shared/models/table-filter-options.model';

@Injectable({
providedIn: 'root',
})
export class TableFilterService { // Temp
tableFilters: TableFilter[] = new Array(4).fill(new TableFilter());
tableFilters: TableFilter[] = Array.from({ length: 4 }, () => new TableFilter());
currentPage: number[] = new Array(4).fill(1);
constructor(
) {
constructor() {
//default status for Update Request inbox set to 'New'
this.tableFilters[2].status = UpdateRequestTableStatusDefault;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ export const TableFilterStatusOptions = [{
},
];

export const TableFilterStatusDefault = TableFilterStatusOptions[0];
export const TableFilterStatusDefault: TableFilterStatus = TableFilterStatusOptions[0];
export const UpdateRequestTableStatusDefault: TableFilterStatus = TableFilterStatusOptions[1];

export class TableFilter {
dateSubmittedFrom?: string;
Expand Down

0 comments on commit 28adfd9

Please sign in to comment.