Authorize valid profile (#76)

* Fix Oser to OSER (#55) * adds support for personnal data * modifie le form pour inclure la nationalité * supprime le gg form * supprime le champ section et ajoute la liste des etablissements * adapts for user * adds validation and connects to students api for personnal data * adds classType field and rgpd info * corrects scholarships * removes signup file tab * minor presentation changes * deletes random console.log * changes upload component declarations * changes upload component declarations * changes upload component declarations * changes upload component declarations * changes upload component declarations * changes upload component declarations * changes upload component declarations * filters if the whole list is sent back * adds message after personnal data modifications * fix Oser to OSER * Validated signup file display (#57) * Modify inscription page (#32) * modify the order of blocks * Update dependencies and TravisCI build (#33) * Update dependencies via a clean npm install * Use Node.js 10 in Travis CI * Specify node==10.x for Heroku * adds support for personnal data * modifie le form pour inclure la nationalité * supprime le gg form * supprime le champ section et ajoute la liste des etablissements * adapts for user * adds validation and connects to students api for personnal data * adds classType field and rgpd info * corrects scholarships * removes signup file tab * minor presentation changes * deletes random console.log * changes upload component declarations * changes upload component declarations * changes upload component declarations * changes upload component declarations * changes upload component declarations * changes upload component declarations * changes upload component declarations * filters if the whole list is sent back * adds message after personnal data modifications * adds untested frontend support for showing validated status of signup file * adds phone number validation for personnal data * checks for year field in registration to display correct status Co-authored-by: AurianeStrasser2 <32937502+AurianeStrasser2@users.noreply.github.com> Co-authored-by: chiahetcho <44137047+chiahetcho@users.noreply.github.com> Co-authored-by: Florimond Manca <florimond.manca@gmail.com> Co-authored-by: Dylan Sechet <dylan.sechet82@gmail.com> * Personnal data fix (#58) * adds support for personnal data * modifie le form pour inclure la nationalité * supprime le gg form * supprime le champ section et ajoute la liste des etablissements * adapts for user * adds validation and connects to students api for personnal data * adds classType field and rgpd info * corrects scholarships * removes signup file tab * minor presentation changes * deletes random console.log * changes upload component declarations * changes upload component declarations * changes upload component declarations * changes upload component declarations * changes upload component declarations * changes upload component declarations * changes upload component declarations * filters if the whole list is sent back * adds message after personnal data modifications * adds some options and fixes wrong scholarship in the personnal data form * adds info on phone number format (#61) * Modify inscription page (#32) * modify the order of blocks * Update dependencies and TravisCI build (#33) * Update dependencies via a clean npm install * Use Node.js 10 in Travis CI * Specify node==10.x for Heroku * adds support for personnal data * modifie le form pour inclure la nationalité * supprime le gg form * supprime le champ section et ajoute la liste des etablissements * adapts for user * adds validation and connects to students api for personnal data * adds classType field and rgpd info * corrects scholarships * removes signup file tab * minor presentation changes * deletes random console.log * changes upload component declarations * changes upload component declarations * changes upload component declarations * changes upload component declarations * changes upload component declarations * changes upload component declarations * changes upload component declarations * filters if the whole list is sent back * adds message after personnal data modifications * Validated signup file display (#54) * adds support for personnal data * modifie le form pour inclure la nationalité * supprime le gg form * supprime le champ section et ajoute la liste des etablissements * adapts for user * adds validation and connects to students api for personnal data * adds classType field and rgpd info * corrects scholarships * removes signup file tab * minor presentation changes * deletes random console.log * changes upload component declarations * changes upload component declarations * changes upload component declarations * changes upload component declarations * changes upload component declarations * changes upload component declarations * changes upload component declarations * filters if the whole list is sent back * adds message after personnal data modifications * adds untested frontend support for showing validated status of signup file * adds phone number validation for personnal data * checks for year field in registration to display correct status * adds some options and fixes wrong scholarship in the personnal data form * adds info on phone number format Co-authored-by: AurianeStrasser2 <32937502+AurianeStrasser2@users.noreply.github.com> Co-authored-by: chiahetcho <44137047+chiahetcho@users.noreply.github.com> Co-authored-by: Florimond Manca <florimond.manca@gmail.com> Co-authored-by: Dylan Sechet <dylan.sechet82@gmail.com> * Update student-signup.component.html (#62) * Improve error message (#63) * adds support for personnal data * modifie le form pour inclure la nationalité * supprime le gg form * supprime le champ section et ajoute la liste des etablissements * adapts for user * adds validation and connects to students api for personnal data * adds classType field and rgpd info * corrects scholarships * removes signup file tab * minor presentation changes * deletes random console.log * changes upload component declarations * changes upload component declarations * changes upload component declarations * changes upload component declarations * changes upload component declarations * changes upload component declarations * changes upload component declarations * filters if the whole list is sent back * adds message after personnal data modifications * improves phone number validation format * adds error message when email is already used and redirects after signup (#64) * adds support for personnal data * modifie le form pour inclure la nationalité * supprime le gg form * supprime le champ section et ajoute la liste des etablissements * adapts for user * adds validation and connects to students api for personnal data * adds classType field and rgpd info * corrects scholarships * removes signup file tab * minor presentation changes * deletes random console.log * changes upload component declarations * changes upload component declarations * changes upload component declarations * changes upload component declarations * changes upload component declarations * changes upload component declarations * changes upload component declarations * filters if the whole list is sent back * adds message after personnal data modifications * improves phone number validation format * adds message when email already used and redirects after signup * Change possibleParentsStatus * Change possibleParentStatus * Change possibleParentStatus * Delete groupe.jpg (#72) * Change possibleParentsStatus V2 * Change possibleParentsStatus * Add files via upload (#73) * Autorisation inscription sorties comptes validés + Infos comptes visibles après inscrip * remove * remove2 Co-authored-by: Arthur Guédon <60623551+arthurgdn@users.noreply.github.com> Co-authored-by: AurianeStrasser2 <32937502+AurianeStrasser2@users.noreply.github.com> Co-authored-by: chiahetcho <44137047+chiahetcho@users.noreply.github.com> Co-authored-by: Florimond Manca <florimond.manca@gmail.com> Co-authored-by: Dylan Sechet <dylan.sechet82@gmail.com> Co-authored-by: Secteur Geek <oser.geek@gmail.com> Co-authored-by: ThomasBidot <77505438+ThomasBidot@users.noreply.github.com> Co-authored-by: feli90 <73308577+feli90@users.noreply.github.com> Co-authored-by: Aidli Melissa <melissa.aidli@student-cs.fr>

Authorize valid profile (#76)
8ab2da39 · MelissaAdl · GitHub · 1f89ff69 · 8ab2da39 · 8ab2da39
Unverified Commit 8ab2da39 authored 3 years ago by MelissaAdl Committed by GitHub 3 years ago
--- a/src/app/members/account/my-data/my-data.component.ts
+++ b/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;
+  private personalData: PersonalData;
-  validatedAccount : String;
+  public validatedAccount : String;
-  dateNow: Date;
+  public dateNow: Date;
-  currentYear: String;
+  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";
    }
  }
 }
--- 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"
+      <button id="participate-btn" type="button" name="button" class="btn-primary" [disabled]="!isValid" (click)="registerFormActive = true">
-        (click)="registerFormActive = true">Je m'inscris</button>
+      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

--- 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;

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

--- a/src/assets/img/groupe.jpg
+++ b/src/assets/img/groupe.jpg
--- a/src/favicon.ico
+++ b/src/favicon.ico