Merge branch 'authorize-valid-profile' into 'master'

Authorize valid profile

See merge request !75

.vscode/settings.json

+{
+    "python.pythonPath": "C:\\Users\\feliv\\anaconda3\\python.exe"
+}
\ No newline at end of file

src/app/members/account/my-data/my-data.component.ts

+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',
@@ -11,10 +18,13 @@ import {User} from 'app/core'
 })
 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",
@@ -25,6 +35,16 @@ export class MyDataComponent implements OnInit {
 
   }
 
+  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 = ()=> {
     if(this.validatedAccount==="Données personnelles non remplies"){
@@ -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";
     }
     
   }
 
+  
+
 }
+

src/app/members/visits/shared/adapters.ts

@@ -111,6 +111,7 @@ export class VisitAdapter implements IAdapter<Visit> {
       registrationsOpen: data.registrations_open,
       image: data.image,
       factSheet: data.fact_sheet,
+      contextSheet: data.context_sheet,
       permissionSheet: data.permission,
       participants: participants,
       organizers: organizers,

src/app/members/visits/shared/models.ts

@@ -36,6 +36,7 @@ export class Visit {
   registrationsOpen: boolean;
   image: string;
   factSheet: string;
+  contextSheet: string;
   permissionSheet: string;
   participants: Participant[];
   organizers: Organizer[];
@@ -55,6 +56,7 @@ export class Visit {
     registrationsOpen: boolean,
     image: string;
     factSheet?: string;
+    contextSheet?: string;
     permissionSheet?: string;
     participants?: Participant[];
     organizers?: Organizer[],
@@ -73,6 +75,7 @@ export class Visit {
     this.registrationsOpen = opts.registrationsOpen;
     this.image = opts.image;
     this.factSheet = opts.factSheet;
+    this.contextSheet = opts.contextSheet;
     this.permissionSheet = opts.permissionSheet;
     this.participants = opts.participants || [];
     this.organizers = opts.organizers || [];

src/app/members/visits/visit-detail/visit-detail.component.html

 <div id="visit">
-  <app-register-form [visible]="registerFormActive" (closed)="registerFormActive = false" [userId]="userId" [visit]="visit" (participate)="onParticipate($event)"></app-register-form>
+  <app-register-form [visible]="registerFormActive" (closed)="registerFormActive = false" [userId]="userId"
+    [visit]="visit" (participate)="onParticipate($event)"></app-register-form>
 
-  <app-leave-form [visible]="leaveFormActive" (closed)="leaveFormActive = false" [visit]="visit" [userId]="userId" (left)="participant = null"></app-leave-form>
+  <app-leave-form [visible]="leaveFormActive" (closed)="leaveFormActive = false" [visit]="visit" [userId]="userId"
+    (left)="participant = null"></app-leave-form>
 
   <div class="text-center">
     <h1>{{ visit.title }}</h1>
     <p>
-      <strong>{{ visit.date | date:"EEEE d MMMM" }} – {{ visit.startTime | date:"shortTime"}}</strong> – {{ visit.place.name }}
+      <strong>{{ visit.date | date:"EEEE d MMMM" }} – {{ visit.startTime | date:"shortTime"}}</strong> – {{
+      visit.place.name }}
     </p>
 
     <p *ngIf="visit.summary" class="text-muted">
@@ -15,28 +18,26 @@
 
     <!-- Metadata badges -->
     <div>
-      <app-registration-badge
-        [title]="visit.title"
-        [open]="visit.registrationsOpen"
-        [passed]="visit.passed"
+      <app-registration-badge [title]="visit.title" [open]="visit.registrationsOpen" [passed]="visit.passed"
         [deadline]="visit.deadline"></app-registration-badge>
-      <app-participant-number-badge
-        [number]="acceptedParticipants"></app-participant-number-badge>
+      <app-participant-number-badge [number]="acceptedParticipants"></app-participant-number-badge>
 
       <span *ngIf="participant">
-        <app-participation-badge
-          [accepted]="participant.accepted"
-          [passed]="visit.passed"></app-participation-badge>
+        <app-participation-badge [accepted]="participant.accepted" [passed]="visit.passed"></app-participation-badge>
       </span>
     </div>
 
     <!-- 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
@@ -47,10 +48,17 @@
 
       <!-- Related documents -->
       <p class="alert alert-info" *ngIf="visit.permissionSheet">
-        <i class="fa fa-exclamation-triangle"></i>Avant de te rendre à la sortie, télécharge <a [href]="visit.permissionSheet">l'autorisation de sortie</a>. Fais-la remplir par tes parents et remets-la aux tuteurs le jour de la sortie.
+        <i class="fa fa-exclamation-triangle"></i>Avant de te rendre à la sortie, télécharge <a
+          [href]="visit.permissionSheet">l'autorisation de sortie</a>. Fais-la remplir par tes parents et remets-la aux
+        tuteurs le jour de la sortie.
       </p>
       <p class="alert alert-default" *ngIf="visit.factSheet">
-        <i class="fa fa-file-text"></i> Les organisateurs ont rédigé une <a [href]="visit.factSheet">fiche sortie</a>. N'hésite pas à en prendre connaissance avant de te rendre à la sortie !
+        <i class="fa fa-file-text"></i> Les organisateurs ont rédigé une <a [href]="visit.factSheet">fiche sortie</a>.
+        N'hésite pas à en prendre connaissance avant de te rendre à la sortie !
+      </p>
+      <p class="alert alert-default" *ngIf="visit.contextSheet">
+        <i class="fa fa-file-text"></i> Les organisateurs ont rédigé une <a [href]="visit.contextSheet">fiche de
+          contexte</a> sur la sortie. N'hésite pas à en prendre connaissance avant de te rendre à la sortie !
       </p>
     </div>
 
@@ -71,9 +79,7 @@
   <app-useful-information [visit]="visit"></app-useful-information>
 
   <h2>Se rendre à cette sortie</h2>
-  <app-visit-location-map
-    [geocoder]="geocoder"
-    [address]="visit.address"></app-visit-location-map>
+  <app-visit-location-map [geocoder]="geocoder" [address]="visit.address"></app-visit-location-map>
 
   <div *ngIf="visit.organizers.length > 0">
     <h2>Tuteurs organisateurs</h2>

src/app/members/visits/visit-detail/visit-detail.component.scss

@@ -23,6 +23,8 @@
   margin-top: 1em;
 }
 
+
+
 img#illustration {
   display: block;
   margin: 1em auto;

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 {
   }
 
 }
+

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)})