diff --git a/apps/web/src/app/workspaces/components/active-capability-requests/active-capability-requests.component.html b/apps/web/src/app/workspaces/components/active-capability-requests/active-capability-requests.component.html index 01c0167d6729200808e18f1c55c5af791586f8f0..73e3d5efc96994600fe96cb5371c19ae459efe28 100644 --- a/apps/web/src/app/workspaces/components/active-capability-requests/active-capability-requests.component.html +++ b/apps/web/src/app/workspaces/components/active-capability-requests/active-capability-requests.component.html @@ -50,7 +50,7 @@ <br /> <div> - <app-filter-menu *ngIf="showFilterMenu" [state]="statesToFilter" [exec_status]="execStatusToFilter" [downloadStatus]="downloadStatusToFilter" [stage1QaStaff]="qaStaff['Stage 1']" [stage2QaStaff]="qaStaff['Stage 2']" [srdpStatus]="srdpOptions" [filters]="filters" (filterMenuEventEmitter)="emitFilterEvent($event)"></app-filter-menu> + <app-filter-menu *ngIf="showFilterMenu" [state]="statesToFilter" [exec_status]="execStatusToFilter" [download_status]="downloadStatusToFilter" [stage1QaStaff]="qaStaff['Stage 1']" [stage2QaStaff]="qaStaff['Stage 2']" [srdpStatus]="srdpOptions" [filters]="filters" (filterMenuEventEmitter)="emitFilterEvent($event)"></app-filter-menu> <mat-paginator #requestPaginator [length]="(sortedActiveRequests$ | async)?.length" [pageSize]="pageSize" @@ -86,7 +86,12 @@ <span><i class="text-dark small fas fa-filter"></i></span> </button> </th> - <th>NGAS Download Status</th> + <th> + NGAS Download Status + <button class="btn bg-transparent border-0 btn-light btn-sm" (click)="toggleFilterMenu()"> + <span><i class="text-dark small fas fa-filter"></i></span> + </button> + </th> <th>SDM ID</th> <th>Bands</th> <th>Array Configuration</th> diff --git a/apps/web/src/app/workspaces/components/active-capability-requests/active-capability-requests.component.ts b/apps/web/src/app/workspaces/components/active-capability-requests/active-capability-requests.component.ts index a2dc0f8c49b7b8a4fcf4caa4d1a767e362a94ce3..88429c4573723aae5fffa4c735083b5ce53a45ac 100644 --- a/apps/web/src/app/workspaces/components/active-capability-requests/active-capability-requests.component.ts +++ b/apps/web/src/app/workspaces/components/active-capability-requests/active-capability-requests.component.ts @@ -123,8 +123,8 @@ export class ActiveCapabilityRequestsComponent implements OnInit, OnDestroy { { name: "Complete", filter_val: "Complete" }, ]; public downloadStatusToFilter = [ - { name: "No Versions", filter_val: "" }, - { name: "Not Started", filter_val: "Not started" }, + { name: "Unknown", filter_val: "Unknown" }, + { name: "Not Started", filter_val: "Not Started" }, { name: "In Progress", filter_val: "In Progress" }, { name: "Complete", filter_val: "Complete" }, ]; @@ -709,7 +709,7 @@ export class ActiveCapabilityRequestsComponent implements OnInit, OnDestroy { getFetchStatus(request: CapabilityRequest): string { // figure out the latest version if (request.versions.length == 0) - return "Not started"; + return "Not Started"; let version = request.versions[request.versions.length - 1]; @@ -718,6 +718,6 @@ export class ActiveCapabilityRequestsComponent implements OnInit, OnDestroy { else if (version.workflow_metadata && version.workflow_metadata.fetch_start_time) return "In Progress"; else - return ""; + return "Unknown"; } } diff --git a/apps/web/src/app/workspaces/components/active-capability-requests/components/filter-menu/filter-menu.component.html b/apps/web/src/app/workspaces/components/active-capability-requests/components/filter-menu/filter-menu.component.html index df66136c0142e5aad2ca6e15fd9194175e78db82..301279b4d6d8977b859e6bf0c553dca508d1ddbf 100644 --- a/apps/web/src/app/workspaces/components/active-capability-requests/components/filter-menu/filter-menu.component.html +++ b/apps/web/src/app/workspaces/components/active-capability-requests/components/filter-menu/filter-menu.component.html @@ -18,7 +18,7 @@ <div class="bg-light p-2"> <p>NGAS Download Status</p> - <div *ngFor="let s of downloadStatus" class="form-check"> + <div *ngFor="let s of download_status" class="form-check"> <input class="form-check-input" type="checkbox" [id]="s.name" [value]="s.filter_val" (change)="addFilter(s.filter_val, 'download_status', $event.target.checked)" [checked]="s.isChecked" /> <label class="form-check-label" [for]="s.name">{{s.name}}</label> </div> diff --git a/apps/web/src/app/workspaces/components/active-capability-requests/components/filter-menu/filter-menu.component.ts b/apps/web/src/app/workspaces/components/active-capability-requests/components/filter-menu/filter-menu.component.ts index b6f65691024d5602ce56fae64e88ab067080abd6..37ad547ec8f42b0a7d6b4312f216f8e2649fcb4e 100644 --- a/apps/web/src/app/workspaces/components/active-capability-requests/components/filter-menu/filter-menu.component.ts +++ b/apps/web/src/app/workspaces/components/active-capability-requests/components/filter-menu/filter-menu.component.ts @@ -35,7 +35,7 @@ export interface Filter { export class FilterMenuComponent implements OnInit { @Input() state: any; @Input() exec_status: any; - @Input() downloadStatus: any; + @Input() download_status: any; @Input() stage1QaStaff: any; @Input() stage2QaStaff: any; @Input() srdpStatus: any;