Skip to content

Commit

Permalink
#116 Update dropdown filters in jobs, analyzers and responders pages
Browse files Browse the repository at this point in the history
  • Loading branch information
nadouani committed Jul 26, 2018
1 parent ee59a77 commit 76e6f52
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 11 deletions.
4 changes: 2 additions & 2 deletions www/src/app/pages/analyzers/analyzers.page.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ <h1>Analyzers ({{$ctrl.pagination.total}})</h1>
<form class="form-inline table-toolbar" ng-submit="$ctrl.applyFilters()">
<div class="form-group">
<div>
<Label>Data Types</Label>
<Label>Data Types ({{$ctrl.datatypes.length}})</Label>
</div>
<multiselect class="pull-left mr-xs" ng-model="$ctrl.filters.dataType" options="$ctrl.datatypes" placeholder="Select" show-select-all="true"
show-unselect-all="true" classes-btn="($ctrl.filters.dataType.length > 0) ? 'btn-block btn-primary' : 'btn-default btn-block'">
show-unselect-all="true" show-search="true" classes-btn="($ctrl.filters.dataType.length > 0) ? 'btn-block btn-primary' : 'btn-default btn-block'">
</multiselect>
</div>
<div class="form-group">
Expand Down
26 changes: 19 additions & 7 deletions www/src/app/pages/jobs/jobs.page.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,37 @@ <h1>Jobs History ({{$ctrl.pagination.total}})</h1>
<div class="box-header">
<form class="form-inline table-toolbar" ng-submit="$ctrl.applyFilters()">
<div class="form-group">
<div><Label>Data Types</Label></div>
<div>
<Label>Data Types ({{$ctrl.datatypes.length}})</Label>
</div>
<multiselect class="pull-left mr-xs" ng-model="$ctrl.filters.dataType" options="$ctrl.datatypes" placeholder="Select" show-select-all="true"
show-unselect-all="true" classes-btn="($ctrl.filters.dataType.length > 0) ? 'btn-block btn-primary' : 'btn-default btn-block'">
show-unselect-all="true" show-search="true" classes-btn="($ctrl.filters.dataType.length > 0) ? 'btn-block btn-primary' :
'btn-default btn-block'">
</multiselect>
</div>
<div class="form-group">
<div>
<Label>Job Type</Label>
<Label>Job Type ({{$ctrl.jobtypes.length}})</Label>
</div>
<multiselect class="pull-left mr-xs" ng-model="$ctrl.filters.jobType" options="$ctrl.jobtypes" placeholder="Select" show-select-all="true"
show-unselect-all="true" classes-btn="($ctrl.filters.jobType.length > 0) ? 'btn-block btn-primary' : 'btn-default btn-block'">
show-unselect-all="true" show-search="true" classes-btn="($ctrl.filters.jobType.length > 0) ? 'btn-block btn-primary' :
'btn-default btn-block'">
</multiselect>
</div>
<div class="form-group">
<div>
<Label>Analyzers</Label>
<Label>Analyzers ({{$ctrl.analyzers.length}})</Label>
</div>
<multiselect class="pull-left mr-xs" ng-model="$ctrl.filters.analyzer" options="$ctrl.analyzers" id-prop="id" display-prop="name"
placeholder="Select" show-select-all="true" show-unselect-all="true" classes-btn="($ctrl.filters.analyzer.length > 0) ? 'btn-block btn-primary' : 'btn-default btn-block'">
<multiselect class="pull-left mr-xs" ng-model="$ctrl.filters.analyzer"
options="$ctrl.analyzers"
show-search="true"
id-prop="id"
display-prop="name"
placeholder="Select"
show-select-all="true"
show-unselect-all="true"
search-limit="100"
classes-btn="($ctrl.filters.analyzer.length > 0) ? 'btn-block btn-primary' : 'btn-default btn-block'">
</multiselect>
</div>
<div class="form-group">
Expand Down
4 changes: 2 additions & 2 deletions www/src/app/pages/responders/responders.page.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ <h1>Responders ({{$ctrl.pagination.total}})</h1>
<form class="form-inline table-toolbar" ng-submit="$ctrl.applyFilters()">
<div class="form-group">
<div>
<Label>Data Types</Label>
<Label>Data Types ({{$ctrl.datatypes.length}})</Label>
</div>
<multiselect class="pull-left mr-xs" ng-model="$ctrl.filters.dataType" options="$ctrl.datatypes" placeholder="Select" show-select-all="true"
show-unselect-all="true" classes-btn="($ctrl.filters.dataType.length > 0) ? 'btn-block btn-primary' : 'btn-default btn-block'">
show-unselect-all="true" show-search="true" classes-btn="($ctrl.filters.dataType.length > 0) ? 'btn-block btn-primary' : 'btn-default btn-block'">
</multiselect>
</div>
<div class="form-group">
Expand Down

0 comments on commit 76e6f52

Please sign in to comment.