Revert "Testbranch (#66)" (#67)

This reverts commit 6cfa4b90.

.vscode/settings.json

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

src/app/signup/core/email.matcher.ts

-import { FormControl, FormGroupDirective, NgForm } from '@angular/forms';
-import { ErrorStateMatcher } from '@angular/material';
-
-// From: https://stackoverflow.com/a/51606362
-export class EmailErrorStateMatcher implements ErrorStateMatcher {
-    isErrorState(control: FormControl | null, form: FormGroupDirective | NgForm | null): boolean {
-        const invalidParent = !!(control && control.parent && control.parent.invalid && control.parent.dirty);
-        return (control && control.dirty && invalidParent);
-    }
-}
\ No newline at end of file

src/app/signup/core/index.ts

@@ -3,4 +3,3 @@ export * from './registration.service';
 export * from './personnalData.model';
 export * from './personnalData.service';
 export * from './password.matcher';
-export * from './email.matcher';

src/app/signup/student-signup/student-signup.component.html

@@ -26,15 +26,6 @@
       </mat-hint>
     </mat-form-field>
 
-    <!-- Confirm Email -->
-    <mat-form-field class="full-width">
-      <input matInput type="email" formControlName="emailConfirm" placeholder="Confirmer l'adresse email"
-        [errorStateMatcher]="emailMatcher">
-      <mat-error *ngIf="formGroup.hasError('emailsDifferent')">
-        Les adresses emails doivent être identiques.
-      </mat-error>
-    </mat-form-field>
-
     <mat-form-field class="full-width">
       <input matInput type="tel" formControlName="phoneNumber" placeholder="Numéro de téléphone" required>
       <mat-hint>
@@ -55,7 +46,7 @@
     <!-- Confirm password -->
     <mat-form-field class="full-width">
       <input matInput type="password" formControlName="passwordConfirm" placeholder="Confirmer le mot de passe"
-        [errorStateMatcher]="passwordMatcher">
+        [errorStateMatcher]="matcher">
       <mat-error *ngIf="formGroup.hasError('passwordsDifferent')">
         Les mots de passe doivent être identiques.
       </mat-error>

src/app/signup/student-signup/student-signup.component.ts

@@ -4,7 +4,7 @@ import { Router } from '@angular/router';
 import { MatSnackBar } from '@angular/material';
 import { Observable } from 'rxjs';
 import { tap, mergeMap } from 'rxjs/operators';
-import { Registration, RegistrationService, PasswordErrorStateMatcher, EmailErrorStateMatcher, PersonnalData, PersonnalDataService } from '../core';
+import { Registration, RegistrationService, PasswordErrorStateMatcher,PersonnalData,PersonnalDataService } from '../core';
 import { AuthService } from 'app/core';
 
 
@@ -52,8 +52,7 @@ export class StudentSignupComponent implements OnInit {
     {id:"no",name:"Non"},
   ]
 
-  passwordMatcher = new PasswordErrorStateMatcher();
-  emailMatcher = new EmailErrorStateMatcher();
+  matcher = new PasswordErrorStateMatcher();
 
   constructor(
     private registrationService: RegistrationService,
@@ -75,7 +74,6 @@ export class StudentSignupComponent implements OnInit {
       firstName: '',
       lastName: '',
       email: ['', Validators.email],
-      emailConfirm: '',
       phoneNumber: '',
       gender:'',
       adressNumber:'',
@@ -99,7 +97,7 @@ export class StudentSignupComponent implements OnInit {
       agree: [false, Validators.required],
       filledForm: false,
       acceptedConditions: false,
-    }, { validator:[(group) => this.checkPasswords(group), (group)=>this.checkEmails(group)] })
+    }, { validator: (group) => this.checkPasswords(group)},)
     console.log(this.formGroup.value.agree)
   }
 
@@ -108,17 +106,15 @@ export class StudentSignupComponent implements OnInit {
     const passwordConfirm = group.controls.passwordConfirm.value;
     return password === passwordConfirm ? null : { passwordsDifferent: true };
   }
-  private checkEmails(group: FormGroup): null | any {
-    const email = group.controls.email.value;
-    const emailConfirm = group.controls.emailConfirm.value;
-    return email === emailConfirm ? null : { emailsDifferent: true };
+  toggleShowPersonnalDataForm(){
+    this.showPersonnalDataForm = !this.showPersonnalDataForm;
   }
-
-  
   submit() {
     this.loading = true;
     const {email,firstName,lastName,phoneNumber} = this.formGroup.value
+    //const {gender,adressNumber,street,zipCode,city,personnalPhone,parentsPhone,parentsEmail,school,grade,section,specialTeaching,scholarship,fatherActivity,motherActivity,parentsStatus,dependantsNumber} = this.formGroup.value;
     const registration: Registration = {email,firstName,lastName,phoneNumber};
+   // const personnalData: PersonnalData = {gender,adressNumber,street,zipCode,city,personnalPhone,parentsPhone,parentsEmail,school,grade,section,specialTeaching,scholarship,fatherActivity,motherActivity,parentsStatus,dependantsNumber};
    
     const password: string = this.formGroup.controls.password.value;
     this.registrationService.create(registration, password).pipe(
@@ -134,8 +130,7 @@ export class StudentSignupComponent implements OnInit {
        setTimeout(()=>{
           this.router.navigate(['./membres'])
           
-        }, 3000)
-      })
+        },3000)})
       
     ).subscribe(
       () => {},
@@ -148,7 +143,6 @@ export class StudentSignupComponent implements OnInit {
           this.error = "Erreur, cet email est déjà utilisé !"
         }
       } 
-
     );
     // this.personnalDataService.create(personnalData).pipe(
     //   tap(() => this.loading = false),