Merge branch 'Romain' into dev
This commit is contained in:
Romain Verger
commit
9e03cf2750
5 changed files with 133 additions and 114 deletions
|
|
@ -17,14 +17,16 @@
|
|||
aria-labelledby="panelsStayOpen-headingOne">
|
||||
<div class="accordion-body">
|
||||
<div class="distance p-3">
|
||||
<span>Veuillez sélectionner la distance souhaitée</span>
|
||||
<span>Veuillez sélectionner la distance souhaitée (En Km) </span>
|
||||
</div>
|
||||
<input type="range" class="form-range" min="{{minDistance}}" max="{{maxDistance}}"
|
||||
(change)="OnChangeValueDistance($event)">
|
||||
<div class="valuesDistance d-flex d-flex justify-content-between">
|
||||
<span>0 KM</span>
|
||||
<span>2 KM</span>
|
||||
<span>4 KM</span>
|
||||
<span>0</span>
|
||||
<span>1</span>
|
||||
<span>2</span>
|
||||
<span>3</span>
|
||||
<span>4</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -109,28 +111,10 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<!-------------------------------------------------------------------------- Accordéon Avis -------------------------------------------------------------------------->
|
||||
|
||||
<div class="accordion-item">
|
||||
<h2 class="accordion-header" id="panelsStayOpen-headingFive">
|
||||
<button class="accordion-button" type="button" data-bs-toggle="collapse"
|
||||
data-bs-target="#panelsStayOpen-collapseFive">
|
||||
<p style="font-family:'Roboto'; font-size: 20px;">Avis</p>
|
||||
</button>
|
||||
</h2>
|
||||
<div id="panelsStayOpen-collapseFive" class="accordion-collapse collapse"
|
||||
aria-labelledby="panelsStayOpen-headingFive">
|
||||
<div class="accordion-body">
|
||||
<div class="titreAvis m-3 d-flex justify-content-around">
|
||||
<span>Choisissez parmi les avis déjà donnés</span>
|
||||
</div>
|
||||
<app-avis-bar (stateNumber)="onStateNumberChange($event)"></app-avis-bar>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!---------------------------------------------------------------------------------------------------------------------------------------------------->
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
<button class="btn-search btn-primary" type="button" (click)="onSendFilters()" (click)="onSendRating()">LANCER LA
|
||||
RECHERCHE</button>
|
||||
<button class="btn-search btn-primary" type="button" (click)="onSendFilters()">LANCER LA
|
||||
RECHERCHE</button>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
import { Component, EventEmitter, OnInit, Output } from '@angular/core';
|
||||
import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
|
||||
import { ActivatedRoute, Router } from '@angular/router';
|
||||
import { ApiBackService } from 'src/app/services/api-back.service';
|
||||
|
||||
|
|
@ -9,101 +9,133 @@ import { ApiBackService } from 'src/app/services/api-back.service';
|
|||
})
|
||||
export class FiltersPageComponent implements OnInit {
|
||||
|
||||
public minDistance : any;
|
||||
public maxDistance : any;
|
||||
public minDistance: any;
|
||||
public maxDistance: any;
|
||||
|
||||
public minPrice : any;
|
||||
public maxPrice: any;
|
||||
public selectPrice : number;
|
||||
public selectDistance : any;
|
||||
public selectPmr :any;
|
||||
public selectSurPlace : any;
|
||||
public selectEmporter : any;
|
||||
|
||||
@Output() stateNumber = new EventEmitter();
|
||||
@Output() rangeNumber = new EventEmitter();
|
||||
public minPrice: any;
|
||||
public maxPrice: any;
|
||||
public selectPrice: any;
|
||||
public selectDistance: any;
|
||||
public selectPmr: any;
|
||||
public selectSurPlace: any;
|
||||
public selectEmporter: any;
|
||||
public selectRating: number;
|
||||
|
||||
|
||||
|
||||
|
||||
public listRestau: any[];
|
||||
|
||||
|
||||
constructor(private apiBackService : ApiBackService, private route : Router, private activatedRoute : ActivatedRoute) {
|
||||
constructor(private apiBackService: ApiBackService, private route: Router, private activatedRoute: ActivatedRoute) {
|
||||
|
||||
this.minDistance = 0;
|
||||
this.maxDistance = 4;
|
||||
this.selectDistance = null;
|
||||
this.maxDistance = 4000;
|
||||
|
||||
this.minPrice = 1;
|
||||
this.maxPrice = 4;
|
||||
this.selectPrice = 0;
|
||||
|
||||
this.selectPrice = null;
|
||||
this.selectDistance = null;
|
||||
this.selectPmr = false;
|
||||
this.selectEmporter = false;
|
||||
this.selectSurPlace = false;
|
||||
|
||||
this.selectRating = 0;
|
||||
|
||||
this.listRestau = [];
|
||||
|
||||
|
||||
}
|
||||
|
||||
ngOnInit(): void {
|
||||
this.apiBackService.getRestaurants().subscribe((restaurants: any[]) => {
|
||||
this.listRestau = restaurants;
|
||||
});
|
||||
|
||||
|
||||
this.apiBackService.getRestaurants().subscribe((restaurants: any[]) => {
|
||||
this.listRestau = restaurants;
|
||||
});
|
||||
console.log(this.listRestau);
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
OnChangeValueDistance(valueDistance: any){
|
||||
this.selectDistance = valueDistance.target.value;
|
||||
}
|
||||
|
||||
OnChangeValuePrice(valuePrice: any){
|
||||
this.selectPrice = valuePrice.target.value;
|
||||
}
|
||||
|
||||
OnChangeValuePMR(valuePmr : any){
|
||||
this.selectPmr = (valuePmr.target.checked);
|
||||
}
|
||||
|
||||
OnChangeValueSurPlace(valuePlace : any){
|
||||
this.selectSurPlace = valuePlace.target.checked;
|
||||
}
|
||||
|
||||
OnChangeValueEmporter(valueEmporter : any){
|
||||
this.selectEmporter = valueEmporter.target.checked;
|
||||
}
|
||||
|
||||
onStateNumberChange(stateNumber: number): void {
|
||||
this.selectRating = stateNumber;
|
||||
}
|
||||
|
||||
onSendRating() {
|
||||
this.stateNumber.emit(this.selectRating);
|
||||
}
|
||||
OnChangeValueDistance(valueDistance: any) {
|
||||
this.selectDistance = valueDistance.target.value;
|
||||
}
|
||||
|
||||
|
||||
onSendFilters() : void{
|
||||
let restaus = this.listRestau;
|
||||
OnChangeValuePrice(valuePrice: any) {
|
||||
this.selectPrice = valuePrice.target.value;
|
||||
}
|
||||
|
||||
restaus = restaus.filter((restau)=>
|
||||
OnChangeValuePMR(valuePmr: any) {
|
||||
this.selectPmr = (valuePmr.target.checked);
|
||||
}
|
||||
|
||||
this.selectPrice == restau.prix
|
||||
OnChangeValueSurPlace(valuePlace: any) {
|
||||
this.selectSurPlace = valuePlace.target.checked;
|
||||
}
|
||||
|
||||
),
|
||||
console.log( this.activatedRoute.snapshot.routeConfig?.path);
|
||||
|
||||
OnChangeValueEmporter(valueEmporter: any) {
|
||||
this.selectEmporter = valueEmporter.target.checked;
|
||||
}
|
||||
|
||||
this.apiBackService.setListRestau(restaus, this.activatedRoute.snapshot.routeConfig?.path);
|
||||
onSendFilters(): void {
|
||||
let restaus = this.listRestau;
|
||||
|
||||
|
||||
// ------------------------------------------------Filtre par Distance-------------------------------------------------------------------------
|
||||
|
||||
if (this.selectDistance != null) {
|
||||
restaus = restaus.filter((restau) =>
|
||||
this.selectDistance >= Math.round(
|
||||
this.apiBackService.setDistance(
|
||||
48.86201110271593 , //latitude Simplon
|
||||
2.4361804827725417, //longitude Simplon
|
||||
restau.latitude,
|
||||
restau.longitude)
|
||||
))
|
||||
|
||||
}
|
||||
// ------------------------------------------------Filtre par Prix-------------------------------------------------------------------------
|
||||
|
||||
if (this.selectPrice != null) {
|
||||
restaus = restaus.filter((restau) =>
|
||||
this.selectPrice == restau.prix
|
||||
)
|
||||
}
|
||||
|
||||
// ------------------------------------------------Filtre par Acces PMR---------------------------------------------------------------------
|
||||
|
||||
if (this.selectPmr === true) {
|
||||
restaus = restaus.filter((restau) =>
|
||||
this.selectPmr === restau.accesPMR
|
||||
)
|
||||
}
|
||||
|
||||
// ------------------------------------------------Filtre par A emporter--------------------------------------------------------------------
|
||||
|
||||
if (this.selectEmporter === true) {
|
||||
restaus = restaus.filter((restau) =>
|
||||
this.selectEmporter === restau.aEmporter
|
||||
)
|
||||
}
|
||||
|
||||
// ------------------------------------------------Filtre par Sur Place----------------------------------------------------------------------
|
||||
|
||||
if (this.selectSurPlace === true) {
|
||||
restaus = restaus.filter((restau) =>
|
||||
this.selectSurPlace === restau.surPlace
|
||||
)
|
||||
}
|
||||
|
||||
// -------------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
console.log(this.activatedRoute.snapshot.routeConfig?.path);
|
||||
console.log(restaus);
|
||||
|
||||
this.apiBackService.setListRestau(restaus, this.activatedRoute.snapshot.routeConfig?.path);
|
||||
// on fait passer en second parametre le path de la route c'est a dire "filtres"
|
||||
|
||||
this.route.navigate(['restaurants']);
|
||||
|
||||
}
|
||||
|
||||
this.route.navigate(['restaurants']);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue