status filter in dmp more filters
This commit is contained in:
parent
8305a7e1da
commit
d8e41d02c7
|
@ -24,8 +24,7 @@
|
||||||
],
|
],
|
||||||
"scripts": [
|
"scripts": [
|
||||||
"./../node_modules/bootstrap/dist/js/bootstrap.min.js",
|
"./../node_modules/bootstrap/dist/js/bootstrap.min.js",
|
||||||
"./assets/xml2json.min.js",
|
"./assets/xml2json.min.js"
|
||||||
"./assets/jquery.scrollTo.min.js"
|
|
||||||
],
|
],
|
||||||
"environmentSource": "environments/environment.ts",
|
"environmentSource": "environments/environment.ts",
|
||||||
"environments": {
|
"environments": {
|
||||||
|
|
|
@ -50,6 +50,7 @@ import { DatasetRoutingModule } from './datasets/dataset-routing.module';
|
||||||
|
|
||||||
import { DmpComponent } from './dmps/dmp.component';
|
import { DmpComponent } from './dmps/dmp.component';
|
||||||
import { DmpTableFilterPipe } from './pipes/dmp-table-filter.pipe';
|
import { DmpTableFilterPipe } from './pipes/dmp-table-filter.pipe';
|
||||||
|
import { DmpStatusFilterPipe } from './pipes/dmp-status-filter.pipe';
|
||||||
import { DmpVersionFilterPipe } from './pipes/dmp-version-filter.pipe';
|
import { DmpVersionFilterPipe } from './pipes/dmp-version-filter.pipe';
|
||||||
import { DmpRoutingModule } from './dmps/dmp-routing.module';
|
import { DmpRoutingModule } from './dmps/dmp-routing.module';
|
||||||
|
|
||||||
|
@ -88,6 +89,7 @@ import { UserWorkspaceComponent } from './user-workspace/user-workspace.componen
|
||||||
|
|
||||||
ProjectTableFilterPipe,
|
ProjectTableFilterPipe,
|
||||||
DmpVersionFilterPipe,
|
DmpVersionFilterPipe,
|
||||||
|
DmpStatusFilterPipe,
|
||||||
DmpTableFilterPipe,
|
DmpTableFilterPipe,
|
||||||
DatasetTableFilterPipe,
|
DatasetTableFilterPipe,
|
||||||
DatasetStatusFilterPipe,
|
DatasetStatusFilterPipe,
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
<!-- <div [ngClass]="{true:'visible', false:'invisible'}[editorVisible]"> -->
|
<!-- <div [ngClass]="{true:'visible', false:'invisible'}[editorVisible]"> -->
|
||||||
|
|
||||||
<table class="table table-striped customTable" [mfData]="tableData | dmpTableFilter : filterQuery | dmpVersionFilter : versionFilter"
|
<table class="table table-striped customTable" [mfData]="tableData | dmpTableFilter : filterQuery | dmpVersionFilter : versionFilter |dmpstatusFilter: statusFilter"
|
||||||
#mf="mfDataTable" [mfRowsOnPage]="rowsOnPage" [(mfSortBy)]="sortBy" [(mfSortOrder)]="sortOrder">
|
#mf="mfDataTable" [mfRowsOnPage]="rowsOnPage" [(mfSortBy)]="sortBy" [(mfSortOrder)]="sortOrder">
|
||||||
<thead>
|
<thead>
|
||||||
<tr class = "rowFilter">
|
<tr class = "rowFilter">
|
||||||
|
@ -18,8 +18,10 @@
|
||||||
<th class = "rowFilterTopBorder" colspan="3">
|
<th class = "rowFilterTopBorder" colspan="3">
|
||||||
<button type="button" class="btn btn-info btnMoreFilters" data-toggle="collapse" data-target="#demo">More filters</button>
|
<button type="button" class="btn btn-info btnMoreFilters" data-toggle="collapse" data-target="#demo">More filters</button>
|
||||||
<div id="demo" class="collapse">
|
<div id="demo" class="collapse">
|
||||||
<input class="form-control" [(ngModel)]="filterQuery" placeholder='Search in Labels' />
|
|
||||||
<input class="form-control" type="number" [(ngModel)]="versionFilter" placeholder='Version'/>
|
<input class="form-control" type="number" [(ngModel)]="versionFilter" placeholder='Version'/>
|
||||||
|
<select class="form-control" [id]="statusid" [(ngModel)]="statusFilter" [name]="statusDropDown" #datasetfield >
|
||||||
|
<option *ngFor="let opt of statusDropDown.options" [value]="opt.key">{{opt.value}}</option>
|
||||||
|
</select>
|
||||||
</div>
|
</div>
|
||||||
</th>
|
</th>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
|
@ -0,0 +1,23 @@
|
||||||
|
import * as _ from "lodash";
|
||||||
|
import { Pipe, PipeTransform } from "@angular/core";
|
||||||
|
|
||||||
|
@Pipe({
|
||||||
|
name: "dmpstatusFilter"
|
||||||
|
})
|
||||||
|
export class DmpStatusFilterPipe implements PipeTransform {
|
||||||
|
|
||||||
|
transform(array: any[], status: number): any {
|
||||||
|
|
||||||
|
if (status) {
|
||||||
|
|
||||||
|
return _.filter(array, row => {
|
||||||
|
|
||||||
|
return (
|
||||||
|
row.status == status
|
||||||
|
)
|
||||||
|
});
|
||||||
|
|
||||||
|
}
|
||||||
|
return array;
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue