diff --git a/src/app/members/account/my-data/my-data.component.ts b/src/app/members/account/my-data/my-data.component.ts index 08b27e436b58c0077c62abd42fb4ffe3708914e3..824b925fa5e384fbac9b9009d8d3e6fc3ea2ed07 100644 --- a/src/app/members/account/my-data/my-data.component.ts +++ b/src/app/members/account/my-data/my-data.component.ts @@ -1,20 +1,30 @@ +import { Injectable } from '@angular/core'; import { Component, OnInit } from '@angular/core'; import {ActivatedRoute,Router} from '@angular/router' import {PersonalData} from '../core' import * as moment from 'moment' import {User} from 'app/core' + +@Injectable({ + providedIn: 'root', +}) + + @Component({ selector: 'app-my-data', templateUrl: './my-data.component.html', styleUrls: ['./my-data.component.scss'] }) -export class MyDataComponent implements OnInit { +export class MyDataComponent implements OnInit{ - personalData: PersonalData; - validatedAccount : String; - dateNow: Date; - currentYear: String; + private personalData: PersonalData; + public validatedAccount : String; + public dateNow: Date; + public currentYear: String; + + + public validState: boolean; public grade = { "troisieme": "Troisième", @@ -24,6 +34,16 @@ export class MyDataComponent implements OnInit { "classe passerelle":"Classe Passerelle" } + + public getValidState() : boolean { + if (this.validatedAccount=="Validé"){ + return true + } + else { + return false + } + } + //Styles validated account label depending on the status of the account public styleValidatedAccount = ()=> { @@ -52,8 +72,8 @@ export class MyDataComponent implements OnInit { public editData = ()=> { this.router.navigate(['./membres/compte/modifier_donnees']) } + - constructor(private route: ActivatedRoute, private router:Router) { } @@ -68,13 +88,16 @@ export class MyDataComponent implements OnInit { } if(this.personalData.registration.validated){ - this.validatedAccount= "Validé" + this.validatedAccount= "Validé"; }else if(this.personalData.year===this.currentYear){ - this.validatedAccount="En cours de validation" + this.validatedAccount="En cours de validation"; }else{ - this.validatedAccount="Données personnelles non remplies" + this.validatedAccount="Données personnelles non remplies"; } } + + } + diff --git a/src/app/members/visits/visit-detail/visit-detail.component.html b/src/app/members/visits/visit-detail/visit-detail.component.html index 69a6aafa28607a322ed246b4cbd61923b4422787..545335fe899ab70d3e2feffde188c3b75d4d09bc 100644 --- a/src/app/members/visits/visit-detail/visit-detail.component.html +++ b/src/app/members/visits/visit-detail/visit-detail.component.html @@ -29,12 +29,15 @@ <!-- Show register button if user does not participate --> <div *ngIf="visit.registrationsOpen && !participant" class="text-center"> - <button id="participate-btn" type="button" name="button" class="btn-success" - (click)="registerFormActive = true">Je m'inscris</button> + <button id="participate-btn" type="button" name="button" class="btn-primary" [disabled]="!isValid" (click)="registerFormActive = true"> + Je m'inscris</button> + </div> - <div *ngIf="participant && !visit.passed"> + <div class="text-muted-sm">{{errorMessageRegistration}}</div> + + <div *ngIf="participant && !visit.passed"> <!-- And a shy-ish unregister link --> <p class="text-muted-sm"> Tu as un empêchement et souhaites diff --git a/src/app/members/visits/visit-detail/visit-detail.component.scss b/src/app/members/visits/visit-detail/visit-detail.component.scss index db849a895ace9be539f1a83784189e119de6a438..e466b8dc9badbedb63dd18683696bc4c18b12b25 100644 --- a/src/app/members/visits/visit-detail/visit-detail.component.scss +++ b/src/app/members/visits/visit-detail/visit-detail.component.scss @@ -23,6 +23,8 @@ margin-top: 1em; } + + img#illustration { display: block; margin: 1em auto; diff --git a/src/app/members/visits/visit-detail/visit-detail.component.ts b/src/app/members/visits/visit-detail/visit-detail.component.ts index ce98d8d176022b07af11dd07088ae94e3eeefb75..d7d0a8abc4f6e8b8ca23af99edde2e60eb76c32d 100644 --- a/src/app/members/visits/visit-detail/visit-detail.component.ts +++ b/src/app/members/visits/visit-detail/visit-detail.component.ts @@ -3,6 +3,11 @@ import { Observable, Subject } from 'rxjs'; import { ActivatedRoute } from '@angular/router'; import { AuthService, Geocoder } from 'app/core'; import { Visit, Participant } from '../shared'; +import {MyDataComponent} from 'app/members/account/my-data/my-data.component'; + + + + @Component({ selector: 'app-visit-detail', @@ -19,18 +24,27 @@ export class VisitDetailComponent implements OnInit { formLoading: boolean = false; leaveFormActive = false; geocoder: Geocoder; + errorMessageRegistration= ""; + isValid : boolean; constructor( private route: ActivatedRoute, private auth: AuthService, - ) { } + private dataC: MyDataComponent, + + ) {this.isValid=dataC.getValidState()} ngOnInit() { + this.visit = this.route.snapshot.data['visit']; this.geocoder = this.route.snapshot.data['geocoder']; this.userId = this.auth.getUserSnapshot().id; this.getParticipant(); this.getAcceptedParticipants(); + if (!this.isValid) + { + this.errorMessageRegistration="Tu dois valider ton compte pour pouvoir t'inscrire aux sorties." + } } getParticipant() { @@ -52,3 +66,4 @@ export class VisitDetailComponent implements OnInit { } } + diff --git a/src/app/signup/student-signup/student-signup.component.ts b/src/app/signup/student-signup/student-signup.component.ts index 1069166c86cd905054944b8e17b2f6ee0f1fa435..5f04fc109e6b3325e95958f359deb7c840f079f2 100644 --- a/src/app/signup/student-signup/student-signup.component.ts +++ b/src/app/signup/student-signup/student-signup.component.ts @@ -127,7 +127,7 @@ export class StudentSignupComponent implements OnInit { tap(() => this.loading = false), tap(() => { setTimeout(()=>{ - this.router.navigate(['./membres']) + this.router.navigate(['./membres/compte/donnees']) },3000)}) diff --git a/src/assets/img/groupe.jpg b/src/assets/img/groupe.jpg index 9b99cc1860312a635b4d883efa526783c80b0d9b..d96732b0f12d9947e1b6b4579bcd66b4e2191851 100644 Binary files a/src/assets/img/groupe.jpg and b/src/assets/img/groupe.jpg differ diff --git a/src/favicon.ico b/src/favicon.ico index 32695caf0b97ae74b9e7cbe7f5f0e1c39c7261c8..c465b57f742777089d7d2cdd32186c3c00915034 100644 Binary files a/src/favicon.ico and b/src/favicon.ico differ