diff --git a/src/app/signup/student-signup/student-signup.component.html b/src/app/signup/student-signup/student-signup.component.html index 5563766354257146a0ce94f07388d12f95b931b3..97d3cb67736766645d9bdeb7b54db909ce6a3fca 100644 --- a/src/app/signup/student-signup/student-signup.component.html +++ b/src/app/signup/student-signup/student-signup.component.html @@ -51,27 +51,24 @@ J'accepte qu'OSER utilise mes données personnelles fournies ci-dessus ou dans le formulaire d'inscription adminsitrative, dans le strict respect du cadre spécifié ci-dessus : </p> - </form> - - <mat-checkbox id="checkboxUtilisation" class="checkbox-field" [(ngModel)]="agree" required> - J'accepte cette utilisation - </mat-checkbox> - <p class="text-center"> - <a mat-raised-button color="accent" [disabled]="!agree" + <mat-checkbox id="checkboxUtilisation" class="checkbox-field" formControlName="agree" required> + J'accepte cette utilisation - href="https://docs.google.com/forms/u/1/d/1mIEy-FVgYvrL0Ntl8YpLKVn0DqpjSl9S_ekjqYo53rI/viewform" target="_blank"> - <mat-icon>launch</mat-icon> - Remplir le formulaire - </a> - </p> - <form [formGroup]="formGroup" (ngSubmit)="submit()"> + </mat-checkbox> + <p class="text-center"> + <a mat-raised-button color="accent" [disabled]="formGroup.value.agree == false" + href="https://docs.google.com/forms/u/1/d/1mIEy-FVgYvrL0Ntl8YpLKVn0DqpjSl9S_ekjqYo53rI/viewform" + target="_blank"> + <mat-icon>launch</mat-icon> + Remplir le formulaire + </a> + </p> <mat-checkbox class="checkbox-field" formControlName="filledForm" required> J'ai rempli le formulaire </mat-checkbox> - <p> Il ne te reste plus qu'à choisir un mot de passe. :-) </p> diff --git a/src/app/signup/student-signup/student-signup.component.ts b/src/app/signup/student-signup/student-signup.component.ts index ac78486756ca5897ca1c0deb38a2dc775ba6052c..95a4b368511d13f469b3de1aac8728dc5454ceb2 100644 --- a/src/app/signup/student-signup/student-signup.component.ts +++ b/src/app/signup/student-signup/student-signup.component.ts @@ -41,9 +41,11 @@ export class StudentSignupComponent implements OnInit { phoneNumber: '', password: '', passwordConfirm: '', + agree: [false, Validators.required], filledForm: false, acceptedConditions: false, - }, { validator: (group) => this.checkPasswords(group)}) + }, { validator: (group) => this.checkPasswords(group)},) + console.log(this.formGroup.value.agree) } private checkPasswords(group: FormGroup): null | any {