Skip to content
Snippets Groups Projects
Commit d715e097 authored by Nathan Bockisch's avatar Nathan Bockisch
Browse files

Fixed the NGAS download filter issues

parent 264ec602
No related branches found
No related tags found
1 merge request!1462Fixed the NGAS download filter issues
Pipeline #11863 passed
......@@ -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>
......
......@@ -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";
}
}
......@@ -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>
......
......@@ -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;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment