isa44.74/organizee-front
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #91 from AlineRinquin/fix-humeur

Browse source 
fix humeur + ajout des couleur par page pour la side bar
This commit is contained in:
AlineRinquin 2022-03-07 11:59:12 +01:00 • committed by GitHub
commit 2ca1b760d9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/app/components/alert/alert.component.html
View file

@ -1,4 +1,4 @@
<div class="alert alert-{{alert.type}} alert-dismissible fade show" role="alert" style="position:absolute;z-index:9999;top:10px;right:50%;transform: translateX(50%);width:600px; text-align:center;"> <div class="alert alert-{{alert.type}} alert-dismissible fade show" role="alert" style="position:fixed;z-index:9999;top:10px;right:50%;transform: translateX(50%);width:600px; text-align:center;">
{{alert.content}} {{alert.content}}
<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close" (click)="onClickCloseAlert()"></button> <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close" (click)="onClickCloseAlert()"></button>
</div> </div>

8
src/app/components/humeur/humeur.component.ts
View file

@ -31,18 +31,18 @@ alert: any;
const userId = this.tokenService.getCurrentMembreId(); const userId = this.tokenService.getCurrentMembreId();
this.membreService.getMembreId(userId).subscribe({ this.membreService.getMembreId(userId).subscribe({
next: result => { next: result => {
this.monHumeurTitle= [this.tabHumeur[result.smiley].title]; //this.monHumeurTitle= [this.tabHumeur[result.smiley].title];
this.monHumeurLien= [this.tabHumeur[result.smiley].lien]; this.monHumeurLien= result.smiley;
// console.log("resultat smiley ", result.smiley); // console.log("resultat smiley ", result.smiley);
} }
}) })
} }
onChoixHumeur(numero: number){ onChoixHumeur(numero: any){
this.monHumeurTitle= [this.tabHumeur[numero].title]; this.monHumeurTitle= [this.tabHumeur[numero].title];
this.monHumeurLien= [this.tabHumeur[numero].lien]; this.monHumeurLien= [this.tabHumeur[numero].lien];
this.membreService.updateHumeur(numero)?.subscribe( this.membreService.updateHumeur(this.tabHumeur[numero].lien)?.subscribe(
{ {
next: result => { next: result => {
this.alert={"type":"success", "content":"L'humeur a bien été modifiée"}; this.alert={"type":"success", "content":"L'humeur a bien été modifiée"};

2
src/app/pages/page-agenda/page-agenda.component.html
View file

@ -1,5 +1,5 @@
<app-header></app-header> <app-header></app-header>
<app-side-bar></app-side-bar> <app-side-bar [backgroundColor]="'#F178B6'"></app-side-bar>
<app-alert <app-alert
*ngIf="isShow" *ngIf="isShow"

2
src/app/pages/page-ajout-evenements/page-ajout-evenements.component.html
View file

@ -2,7 +2,7 @@
<div class="row"> <div class="row">
<div class="col-md-auto"> <div class="col-md-auto">
<app-side-bar class="sidebarMenu"></app-side-bar> <app-side-bar [backgroundColor]="'#F178B6'"></app-side-bar>
</div> </div>
<div class="col-md-4 offset-md-4 text-center"> <div class="col-md-4 offset-md-4 text-center">
<h2>Ajouter un évènement à l'agenda</h2> <h2>Ajouter un évènement à l'agenda</h2>

2
src/app/pages/page-dashboard/page-dashboard.component.html
View file

@ -1,5 +1,5 @@
<app-header></app-header> <app-header></app-header>
<app-side-bar></app-side-bar> <app-side-bar [backgroundColor]="'#c3c3e7'"></app-side-bar>
<div class="container"> <div class="container">
<div class="row p-1 col-12 "> <div class="row p-1 col-12 ">

2
src/app/pages/page-menu-semaine/page-menu-semaine.component.html
View file

@ -2,7 +2,7 @@
<div class="row"> <div class="row">
<div class="col-md-auto"> <div class="col-md-auto">
<app-side-bar class="sidebarMenu"></app-side-bar> <app-side-bar [backgroundColor]="'#F7C02B'"></app-side-bar>
</div> </div>
<div class="col menu text-center"> <div class="col menu text-center">
<h2>Menu de la semaine</h2> <h2>Menu de la semaine</h2>

2
src/app/pages/page-not-found/page-not-found.component.html
View file

@ -1,5 +1,5 @@
<app-header></app-header> <app-header></app-header>
<app-side-bar></app-side-bar> <app-side-bar [backgroundColor]="'#c3c3e7'"></app-side-bar>
<div> <div>
<div class="ctn-link min-vh-100"> <div class="ctn-link min-vh-100">

2
src/app/services/membre.service.ts
View file

@ -58,7 +58,7 @@ export class MembreService {
} }
} }
updateHumeur(numero : number) : Observable<any> | void { updateHumeur(numero : any) : Observable<any> | void {
const userId = this.tokenService.getCurrentMembreId(); const userId = this.tokenService.getCurrentMembreId();
if (userId){ if (userId){
return this.http.put(`${this.apiUrl}/membres/update/smiley/${userId}`, numero); return this.http.put(`${this.apiUrl}/membres/update/smiley/${userId}`, numero);