From b7c14c3a6ac42e77ea02592e66fc9b0a4f56cf28 Mon Sep 17 00:00:00 2001
From: chiahetcho <44137047+chiahetcho@users.noreply.github.com>
Date: Sun, 29 Sep 2019 21:20:28 +0200
Subject: [PATCH] Change form link (#39)
* 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
* link changed and disabled when unchecked checkbox
---
.../student-signup.component.html | 25 ++++++++-----------
.../student-signup.component.ts | 4 ++-
2 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/src/app/signup/student-signup/student-signup.component.html b/src/app/signup/student-signup/student-signup.component.html
index 5563766..97d3cb6 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 ac78486..95a4b36 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 {
--
GitLab