résolution erreur merge
This commit is contained in:
parent
52cf48a5dd
commit
f6601fcd9c
1 changed files with 109 additions and 113 deletions
|
@ -27,8 +27,6 @@ export class PageAccueilComponent implements OnInit {
|
||||||
public isPricingFilterActive: boolean;
|
public isPricingFilterActive: boolean;
|
||||||
public isRatingFilterActive: boolean;
|
public isRatingFilterActive: boolean;
|
||||||
|
|
||||||
public clickCounter : any;
|
|
||||||
|
|
||||||
constructor(private plantouneService: PlantouneService) {
|
constructor(private plantouneService: PlantouneService) {
|
||||||
this.listData = [];
|
this.listData = [];
|
||||||
this.listCategoriesFilter = [];
|
this.listCategoriesFilter = [];
|
||||||
|
@ -118,8 +116,6 @@ console.log(this.clickCounter)
|
||||||
if (this.listData.length >= 9) {this.listData.length=9}
|
if (this.listData.length >= 9) {this.listData.length=9}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
onListCategory(categoryArray: string[]) {
|
onListCategory(categoryArray: string[]) {
|
||||||
// this.listData=listData;
|
// this.listData=listData;
|
||||||
//console.log(typeof(valueText));
|
//console.log(typeof(valueText));
|
||||||
|
@ -143,7 +139,7 @@ console.log(this.clickCounter)
|
||||||
if(this.listData.length>=9){
|
if(this.listData.length>=9){
|
||||||
this.listData.length=9;
|
this.listData.length=9;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
onRatingFilter(stateNumber: number): void {
|
onRatingFilter(stateNumber: number): void {
|
||||||
this.stateNumber = stateNumber;
|
this.stateNumber = stateNumber;
|
||||||
|
@ -199,7 +195,7 @@ console.log(this.clickCounter)
|
||||||
}
|
}
|
||||||
|
|
||||||
//Tri des prix des plantes par ordre croissant ou décroissant
|
//Tri des prix des plantes par ordre croissant ou décroissant
|
||||||
onPriceTri() : void {
|
onPriceTri() : void {
|
||||||
|
|
||||||
this.clickCounter ++
|
this.clickCounter ++
|
||||||
console.log(this.clickCounter)
|
console.log(this.clickCounter)
|
||||||
|
|
Loading…
Add table
Reference in a new issue