From 4386c4b4741ec09e4ffd01ec6246e713b48dc496 Mon Sep 17 00:00:00 2001
From: AlineRinquin <aline.rinquin.ar@gmail.com>
Date: Sat, 26 Feb 2022 17:48:12 +0100
Subject: [PATCH] redirection page acceuil et miseen place de privation
d'action si enfant
---
.../fiche-contact/fiche-contact.component.html | 8 ++++++--
.../fiche-contact/fiche-contact.component.ts | 15 +++++++++++++--
.../pages/page-accueil/page-accueil.component.ts | 11 ++++++++++-
.../page-dashboard/page-dashboard.component.scss | 4 ++--
.../page-repertoire.component.html | 4 +---
.../page-repertoire/page-repertoire.component.ts | 12 +++++++++++-
6 files changed, 43 insertions(+), 11 deletions(-)
diff --git a/src/app/components/fiche-contact/fiche-contact.component.html b/src/app/components/fiche-contact/fiche-contact.component.html
index ad8df74..33b89bc 100644
--- a/src/app/components/fiche-contact/fiche-contact.component.html
+++ b/src/app/components/fiche-contact/fiche-contact.component.html
@@ -4,13 +4,17 @@
<div class="couleur col-7" [style.background-color]="personne.couleur"></div>
<div class="col-5">
<div class="col">
- <button routerLink="../modifier-contact/{{personne.id}}"
+ <button
+ *ngIf="parent"
+ routerLink="../modifier-contact/{{personne.id}}"
class=" btn btn-sm btn-rounded btn-secondary mb-2">
Modifier
</button>
</div>
<div class="col">
- <button class=" btn btn-sm btn-rounded btn-secondary" (click)="onClickDelete(personne.id)">
+ <button
+ *ngIf="parent"
+ class=" btn btn-sm btn-rounded btn-secondary" (click)="onClickDelete(personne.id)">
Supprimer
</button>
</div>
diff --git a/src/app/components/fiche-contact/fiche-contact.component.ts b/src/app/components/fiche-contact/fiche-contact.component.ts
index f6c1a8a..2c2a1b5 100644
--- a/src/app/components/fiche-contact/fiche-contact.component.ts
+++ b/src/app/components/fiche-contact/fiche-contact.component.ts
@@ -1,4 +1,5 @@
import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { TokenService } from 'src/app/services/token.service';
@Component({
selector: 'app-fiche-contact',
@@ -8,10 +9,20 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
export class FicheContactComponent implements OnInit {
@Input() personne: any;
@Output() clickDelete = new EventEmitter();
+ parent: boolean;
- constructor() {}
- ngOnInit(): void {}
+ constructor(private tokenService: TokenService) {
+ this.parent = false;
+ }
+
+ ngOnInit(): void {
+ const roleUser = this.tokenService.getRole();
+
+ if(roleUser == "ROLE_PARENT"){
+ this.parent = true;
+ }
+ }
onClickDelete(numPerson: number){
window.alert("Le contact à bien été supprimé!")
diff --git a/src/app/pages/page-accueil/page-accueil.component.ts b/src/app/pages/page-accueil/page-accueil.component.ts
index a3a39fd..490000a 100644
--- a/src/app/pages/page-accueil/page-accueil.component.ts
+++ b/src/app/pages/page-accueil/page-accueil.component.ts
@@ -1,4 +1,7 @@
+import { HttpClient } from '@angular/common/http';
import { Component, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
+import { TokenService } from 'src/app/services/token.service';
@Component({
selector: 'app-page-accueil',
@@ -7,9 +10,15 @@ import { Component, OnInit } from '@angular/core';
})
export class PageAccueilComponent implements OnInit {
- constructor() { }
+ constructor(private http: HttpClient, private router: Router, private tokenService: TokenService) {
+
+ }
ngOnInit(): void {
+ const token = this.tokenService.getToken();
+ if(token){
+ this.router.navigate(['tableau-de-bord']);
+ }
}
}
diff --git a/src/app/pages/page-dashboard/page-dashboard.component.scss b/src/app/pages/page-dashboard/page-dashboard.component.scss
index 11c3260..d2d8bff 100644
--- a/src/app/pages/page-dashboard/page-dashboard.component.scss
+++ b/src/app/pages/page-dashboard/page-dashboard.component.scss
@@ -12,7 +12,7 @@
.container {
display: flex;
- padding: 10px;
+ padding: 20px;
}
@@ -26,7 +26,7 @@ button{
#boxFour{
height: 150px;
- margin-top: -70px;
+ margin-top: -99px;
width: fit-content;
}
diff --git a/src/app/pages/page-repertoire/page-repertoire.component.html b/src/app/pages/page-repertoire/page-repertoire.component.html
index 298c97e..d390bff 100644
--- a/src/app/pages/page-repertoire/page-repertoire.component.html
+++ b/src/app/pages/page-repertoire/page-repertoire.component.html
@@ -7,10 +7,8 @@
<div class="col compte text-center py-3 border">
<div>
- <button class="btn btn-sm btn-rounded btn-secondary m-3" type="submit">
- Tous les contacts
- </button>
<button
+ *ngIf="parent"
routerLink="/ajouter-contact"
class="btn btn-sm btn-rounded btn-secondary m-3"
>
diff --git a/src/app/pages/page-repertoire/page-repertoire.component.ts b/src/app/pages/page-repertoire/page-repertoire.component.ts
index 8870890..c387247 100644
--- a/src/app/pages/page-repertoire/page-repertoire.component.ts
+++ b/src/app/pages/page-repertoire/page-repertoire.component.ts
@@ -2,6 +2,7 @@ import { Component, OnInit } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { Contact } from 'src/app/models/contact';
import { RepertoireService } from 'src/app/services/repertoire.service';
+import { TokenService } from 'src/app/services/token.service';
@Component({
selector: 'app-page-repertoire',
@@ -15,18 +16,27 @@ export class PageRepertoireComponent implements OnInit {
public personneid: any;
keyword: any;
openDetails: any;
+ parent: boolean;
constructor(
private repertoireService: RepertoireService,
private router: Router,
- private route: ActivatedRoute
+ private route: ActivatedRoute,
+ private tokenService: TokenService
) {
this.listContact = [];
this.listFull = [];
this.listContactInfo = '';
+ this.parent = false;
}
ngOnInit(): void {
+ const roleUser = this.tokenService.getRole();
+
+ if(roleUser == "ROLE_PARENT"){
+ this.parent = true;
+ }
+
//récupère tout les contact et leurs info
this.repertoireService.getContact().subscribe((listContact: any[]) => {
console.log(listContact);