Skip to content

Commit

Permalink
#9 Change filter system
Browse files Browse the repository at this point in the history
  • Loading branch information
@Anthony-Jhoiro
Anthony-Jhoiro committed Aug 23, 2019
1 parent 7a58ff6 commit 672199c
Show file tree
Hide file tree
Showing 13 changed files with 129 additions and 168 deletions.
18 changes: 9 additions & 9 deletions src/app/feat-design/campaigns/campaigns-columnsdata.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export var CampainsColumnsData: Column[] = [
flexGrow: 100,
defaultActive: true,
searchable: true,
dropActive: false,
filterDisplayed: false,
multiple: true,
placeholder: 'Select applications',
sSearch: []
Expand All @@ -23,7 +23,7 @@ export var CampainsColumnsData: Column[] = [
defaultActive: true,
searchable: true,
type: COLUMN_TYPE.BOOLEAN,
dropActive: false,
filterDisplayed: false,
multiple: true,
placeholder: 'Select applications',
sSearch: []
Expand All @@ -37,7 +37,7 @@ export var CampainsColumnsData: Column[] = [
defaultActive: true,
searchable: true,
type: COLUMN_TYPE.BOOLEAN,
dropActive: false,
filterDisplayed: false,
multiple: true,
placeholder: 'Select applications',
sSearch: []
Expand All @@ -51,7 +51,7 @@ export var CampainsColumnsData: Column[] = [
defaultActive: true,
searchable: true,
type: COLUMN_TYPE.LONGTEXT,
dropActive: false,
filterDisplayed: false,
multiple: true,
placeholder: 'Select applications',
sSearch: []
Expand All @@ -65,7 +65,7 @@ export var CampainsColumnsData: Column[] = [
defaultActive: true,
searchable: true,
type: COLUMN_TYPE.BOOLEAN,
dropActive: false,
filterDisplayed: false,
multiple: true,
placeholder: 'Select applications',
sSearch: []
Expand All @@ -79,7 +79,7 @@ export var CampainsColumnsData: Column[] = [
defaultActive: true,
searchable: true,
type: COLUMN_TYPE.BOOLEAN,
dropActive: false,
filterDisplayed: false,
multiple: true,
placeholder: 'Select applications',
sSearch: []
Expand All @@ -92,7 +92,7 @@ export var CampainsColumnsData: Column[] = [
flexGrow: 100,
defaultActive: true,
searchable: true,
dropActive: false,
filterDisplayed: false,
multiple: true,
placeholder: 'Select applications',
sSearch: []
Expand All @@ -105,7 +105,7 @@ export var CampainsColumnsData: Column[] = [
flexGrow: 100,
defaultActive: true,
searchable: true,
dropActive: false,
filterDisplayed: false,
multiple: true,
placeholder: 'Select applications',
sSearch: []
Expand All @@ -117,7 +117,7 @@ export var CampainsColumnsData: Column[] = [
active: true,
flexGrow: 100,
defaultActive: true,
dropActive: false,
filterDisplayed: false,
type: COLUMN_TYPE.LONGTEXT,
like: true,
multiple: true,
Expand Down
65 changes: 35 additions & 30 deletions src/app/feat-design/testcaselist/testcaselist.columnsdata.ts
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Column, COLUMN_TYPE } from 'src/app/shared/model/column.model';
import { Column, COLUMN_TYPE, FILTER_MODE } from 'src/app/shared/model/column.model';

export var TestCasesColumnsData: Column[] = [
{
Expand All @@ -9,7 +9,7 @@ export var TestCasesColumnsData: Column[] = [
flexGrow: 100,
defaultActive: true,
searchable: true,
dropActive: false,
filterDisplayed: false,
multiple: true,
placeholder: 'Select applications',
sSearch: []
Expand All @@ -34,7 +34,8 @@ export var TestCasesColumnsData: Column[] = [
flexGrow: 75,
active: true,
defaultActive: true,
like: true,
like: true,
filterMode: FILTER_MODE.SEARCH_FIELD,
multiple: true,
placeholder: 'Search TestCase',
sSearch: []
Expand All @@ -48,7 +49,7 @@ export var TestCasesColumnsData: Column[] = [
defaultActive: true,
sortable: false,
searchable: true,
dropActive: false,
filterDisplayed: false,
flexGrow: 250,
multiple: true,
placeholder: 'Select Labels',
Expand All @@ -62,8 +63,9 @@ export var TestCasesColumnsData: Column[] = [
flexGrow: 250,
defaultActive: true,
active: true,
dropActive: false,
like: true,
filterDisplayed: false,
like: true,
filterMode: FILTER_MODE.SEARCH_FIELD,
multiple: true,
placeholder: 'Search Description...',
sSearch: []
Expand All @@ -76,7 +78,7 @@ export var TestCasesColumnsData: Column[] = [
active: true,
defaultActive: true,
searchable: true,
dropActive: false,
filterDisplayed: false,
flexGrow: 100,
multiple: true,
placeholder: 'Select status',
Expand All @@ -88,7 +90,7 @@ export var TestCasesColumnsData: Column[] = [
contentName: 'priority',
active: true,
defaultActive: true,
dropActive: false,
filterDisplayed: false,
searchable: true,
flexGrow: 100,
multiple: true,
Expand All @@ -101,7 +103,7 @@ export var TestCasesColumnsData: Column[] = [
apiName: 'app.system',
contentName: 'system',
active: false,
dropActive: false,
filterDisplayed: false,
searchable: true,
multiple: true,
placeholder: 'Select System...',
Expand All @@ -114,7 +116,7 @@ export var TestCasesColumnsData: Column[] = [
contentName: 'tcActive',
searchable: true,
active: false,
dropActive: false,
filterDisplayed: false,
type: COLUMN_TYPE.BOOLEAN,
multiple: false,
placeholder: 'Select Gloabl Activation',
Expand All @@ -141,7 +143,7 @@ export var TestCasesColumnsData: Column[] = [
type: COLUMN_TYPE.LABEL,
active: false,
sortable: false,
dropActive: false,
filterDisplayed: false,
multiple: true,
placeholder: 'Select Stickers',
sSearch: []
Expand All @@ -153,7 +155,7 @@ export var TestCasesColumnsData: Column[] = [
contentName: 'labelsREQUIREMENT',
type: COLUMN_TYPE.LABEL,
active: false,
dropActive: false,
filterDisplayed: false,
sortable: false,
multiple: true,
placeholder: 'Select Requirement',
Expand All @@ -166,41 +168,41 @@ export var TestCasesColumnsData: Column[] = [
contentName: 'labelsBATTERY',
type: COLUMN_TYPE.LABEL,
active: false,
dropActive: false,
filterDisplayed: false,
sortable: false
},//
{
displayName: 'QA Activation',
apiName: 'tec.tcactive',
contentName: 'activePROD',
active: false,
dropActive: false,
filterDisplayed: false,
type: COLUMN_TYPE.BOOLEAN
},
{
displayName: 'UAT Activation',
apiName: 'tec.tcactive',
contentName: 'activeQA',
active: false,
dropActive: false,
filterDisplayed: false,
type: COLUMN_TYPE.BOOLEAN
},
{
displayName: 'PROD Activation',
apiName: 'tec.tcactive',
contentName: 'activeUAT',
active: false,
dropActive: false,
filterDisplayed: false,
type: COLUMN_TYPE.BOOLEAN
},
{
displayName: 'Function',
apiName: 'tec.function',
contentName: 'function',
active: false,
dropActive: false,
like: true,

filterDisplayed: false,
like: true,
filterMode: FILTER_MODE.SEARCH_FIELD,
multiple: true,
placeholder: 'Select Function',
sSearch: []
Expand All @@ -210,7 +212,7 @@ export var TestCasesColumnsData: Column[] = [
displayName: 'Project',
apiName: 'tec.project',
contentName: 'Project',
dropActive: false,
filterDisplayed: false,
active: false,

multiple: true,
Expand All @@ -222,7 +224,7 @@ export var TestCasesColumnsData: Column[] = [
displayName: 'Origine',
apiName: 'tec.origine',
contentName: 'origine',
dropActive: false,
filterDisplayed: false,
active: false,

multiple: true,
Expand All @@ -235,8 +237,9 @@ export var TestCasesColumnsData: Column[] = [
apiName: 'tec.refOrigine',
contentName: 'refOrigin',
active: false,
dropActive: false,
like: true,
filterDisplayed: false,
like: true,
filterMode: FILTER_MODE.SEARCH_FIELD,
multiple: true,
placeholder: 'Select Reference Origine',
sSearch: []
Expand All @@ -258,8 +261,9 @@ export var TestCasesColumnsData: Column[] = [
apiName: 'tec.dateCreated',
contentName: 'dateCreated',
active: false,
dropActive: false,
like: true,
filterDisplayed: false,
like: true,
filterMode: FILTER_MODE.SEARCH_FIELD,
multiple: true,
placeholder: 'Select Date Created',
sSearch: []
Expand All @@ -269,7 +273,7 @@ export var TestCasesColumnsData: Column[] = [
displayName: 'User Created',
apiName: 'tec.usrCreated',
contentName: 'usrCreated',
dropActive: false,
filterDisplayed: false,
searchable: true,
active: false,
multiple: true,
Expand All @@ -281,7 +285,7 @@ export var TestCasesColumnsData: Column[] = [
displayName: 'TestCase Version',
apiName: 'tec.testCaseVersion',
contentName: 'testCaseVersion',
dropActive: false,
filterDisplayed: false,
active: false,
multiple: true,
placeholder: 'Select TestCase Version',
Expand All @@ -293,8 +297,9 @@ export var TestCasesColumnsData: Column[] = [
apiName: 'tec.dateModif',
contentName: 'dateModif',
active: false,
dropActive: false,
like: true,
filterDisplayed: false,
like: true,
filterMode: FILTER_MODE.SEARCH_FIELD,
multiple: true,
placeholder: 'Select Date Modification',
sSearch: []
Expand All @@ -304,7 +309,7 @@ export var TestCasesColumnsData: Column[] = [
displayName: 'User Modification',
apiName: 'tec.usrModif',
contentName: 'usrModif',
dropActive: false,
filterDisplayed: false,
active: false,
multiple: true,
placeholder: 'Select User Modification',
Expand Down
13 changes: 7 additions & 6 deletions src/app/shared/datatable-page/datatable/datatable.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,17 +71,18 @@ export class DatatableComponent implements OnInit {
* @param column column to filter
*/
addFilter(column: Column): void {
column.dropActive = !column.dropActive;
column.filterDisplayed = !column.filterDisplayed;
}

/**
/**
* addFilterLike
* * Add a like filter corresponding to the column
* @param column column to filter
* TODO : Remove
*/
addFilterLike(column: Column): void {
column.fieldActive = !column.fieldActive;
}
// addFilterLike(column: Column): void {
// column.fieldActive = !column.fieldActive;
// }

/**
* onSort
Expand Down
10 changes: 5 additions & 5 deletions src/app/shared/datatable-page/filters/filters.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ <h3 class="block-title">
<!--List of filters (underline if selected)-->
<ng-template ng-option-tmp let-item="item" let-index="index">
<div (click)="addFilter(item)">
<span *ngIf="item.dropActive || item.fieldActive; else elseTemplate"
<span *ngIf="item.filterDisplayed; else elseTemplate"
class="text-primary-dark bold">
<i class="ml-1 fa fa-check-circle text-primary-dark"></i>
{{item.displayName}}
Expand All @@ -113,17 +113,17 @@ <h3 class="block-title">
<div class="filter-list form-inline mb-2">
<!--Distinct filters-->
<ng-template ngFor let-column [ngForOf]="columns">
<app-filter *ngIf="column.dropActive" class="filter-drop" [column]="column"
<app-filter *ngIf="column.filterDisplayed" class="filter-drop" [column]="column"
[servlet]="servlet" (applyFilterOutput)=applySystem()
(remove)="removeFilter($event)">
</app-filter>
</ng-template>
<!--Like filters-->
<ng-template ngFor let-column [ngForOf]="columns">
<!--Like filters--><!-- TODO : remove-->
<!-- <ng-template ngFor let-column [ngForOf]="columns">
<app-filterlike *ngIf="column.fieldActive" [column]="column"
(applyFilterOutput)=applySystem() (remove)="removeFilter($event)">
</app-filterlike>
</ng-template>
</ng-template> -->
</div>
</div>
</div>
Expand Down
Loading

0 comments on commit 672199c

Please sign in to comment.