update for diff categories

harshbaldwa · Sep 28, 2019 · 746c793 · 746c793
1 parent 300d3ce
commit 746c793
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 17 deletions.
diff --git a/src/app/app.service.ts b/src/app/app.service.ts
@@ -73,7 +73,6 @@ export class LadderService {
     this.http.post<string>(BackendURLNotifications + 'challenges/', myId)
       .subscribe((notification) => {
         this.challengesN = Number(notification[0]);
-        console.log(this.challengesN);
         this.challengesP = Number(notification[1]);
         this.challengesC = Number(notification[2]);
         // tslint:disable: triple-equals

diff --git a/src/app/auth/auth-data.model.ts b/src/app/auth/auth-data.model.ts
@@ -3,7 +3,10 @@ export interface AuthData {
   roll: string;
   hostel: string;
   gender: string;
-  category: string;
+  categorySquash: string;
+  categoryTT: string;
+  categoryTennis: string;
+  categoryBadminton: string;
   preferred: string;
   contact: string;
   password: string;

diff --git a/src/app/auth/auth.service.ts b/src/app/auth/auth.service.ts
@@ -39,11 +39,15 @@ export class AuthService {
     roll: string,
     hostel: string,
     gender: string,
-    category: string,
+    categorySquash: string,
+    categoryTT: string,
+    categoryTennis: string,
+    categoryBadminton: string,
     preferred: string,
     contact: string,
     password: string) {
-    const authData: AuthData = {name, roll, hostel, gender, category, preferred, contact, password};
+    // tslint:disable-next-line: max-line-length
+    const authData: AuthData = {name, roll, hostel, gender, categorySquash, categoryTT, categoryTennis, categoryBadminton, preferred, contact, password};
     this.http.post(environment.apiUrl + 'signup', authData)
       .subscribe();
     this.openSnackBar('Successfully signed up!', 'OK');

diff --git a/src/app/auth/signup/signup.component.html b/src/app/auth/signup/signup.component.html
@@ -38,22 +38,52 @@
       </mat-select>
     </mat-form-field>
     <mat-form-field>
-      <mat-label>Category</mat-label>
-      <mat-select name="category" [(ngModel)]="category" placeholder="Category" required>
+      <mat-label>Preferred Sport</mat-label>
+      <mat-select name="preferred" [(ngModel)]="preferred" required multiple>
+        <mat-option value="squash">Squash</mat-option>
+        <mat-option value="tt">Table Tennis</mat-option>
+        <mat-option value="tennis">Lawn Tennis</mat-option>
+        <mat-option value="badminton">Badminton</mat-option>
+      </mat-select>
+    </mat-form-field>
+    <mat-form-field *ngIf="this.preferred.includes('squash')">
+      <mat-label>Category - Squash</mat-label>
+      <mat-select name="categorySquash" [(ngModel)]="categorySquash" placeholder="Category - Squash" required>
         <mat-option value="Inter IIT Team">Inter IIT Team</mat-option>
         <mat-option value="Inter IIT Camp">Inter IIT Camp</mat-option>
         <mat-option value="Intermediate">Intermediate</mat-option>
         <mat-option value="NSO">NSO</mat-option>
         <mat-option value="Beginner">Beginner</mat-option>
       </mat-select>
     </mat-form-field>
-    <mat-form-field>
-      <mat-label>Preferred Sport</mat-label>
-      <mat-select name="preferred" [(ngModel)]="preferred" required multiple>
-        <mat-option value="squash">Squash</mat-option>
-        <mat-option value="tt">Table Tennis</mat-option>
-        <mat-option value="tennis">Lawn Tennis</mat-option>
-        <mat-option value="badminton">Badminton</mat-option>
+    <mat-form-field *ngIf="this.preferred.includes('tt')">
+      <mat-label>Category - Table Tennis</mat-label>
+      <mat-select name="categoryTT" [(ngModel)]="categoryTT" placeholder="Category - Table Tennis" required>
+        <mat-option value="Inter IIT Team">Inter IIT Team</mat-option>
+        <mat-option value="Inter IIT Camp">Inter IIT Camp</mat-option>
+        <mat-option value="Intermediate">Intermediate</mat-option>
+        <mat-option value="NSO">NSO</mat-option>
+        <mat-option value="Beginner">Beginner</mat-option>
+      </mat-select>
+    </mat-form-field>
+    <mat-form-field *ngIf="this.preferred.includes('tennis')">
+      <mat-label>Category - Lawn Tennis</mat-label>
+      <mat-select name="categoryTennis" [(ngModel)]="categoryTennis" placeholder="Category - Lawn Tennis" required>
+        <mat-option value="Inter IIT Team">Inter IIT Team</mat-option>
+        <mat-option value="Inter IIT Camp">Inter IIT Camp</mat-option>
+        <mat-option value="Intermediate">Intermediate</mat-option>
+        <mat-option value="NSO">NSO</mat-option>
+        <mat-option value="Beginner">Beginner</mat-option>
+      </mat-select>
+    </mat-form-field>
+    <mat-form-field *ngIf="this.preferred.includes('badminton')">
+      <mat-label>Category - Badminton</mat-label>
+      <mat-select name="categoryBadminton" [(ngModel)]="categoryBadminton" placeholder="Category - Badminton" required>
+        <mat-option value="Inter IIT Team">Inter IIT Team</mat-option>
+        <mat-option value="Inter IIT Camp">Inter IIT Camp</mat-option>
+        <mat-option value="Intermediate">Intermediate</mat-option>
+        <mat-option value="NSO">NSO</mat-option>
+        <mat-option value="Beginner">Beginner</mat-option>
       </mat-select>
     </mat-form-field>
     <mat-form-field>

diff --git a/src/app/auth/signup/signup.component.ts b/src/app/auth/signup/signup.component.ts
@@ -2,7 +2,6 @@ import { Component } from '@angular/core';
 import { NgForm } from '@angular/forms';
 
 import { AuthService } from '../auth.service';
-import { invalid } from '@angular/compiler/src/render3/view/util';
 
 @Component({
   templateUrl: './signup.component.html',
@@ -13,8 +12,11 @@ export class SignupComponent {
   public roll: string;
   public hostel: string;
   public gender: string;
-  public category: string;
-  public preferred: string;
+  public categorySquash = '';
+  public categoryTT = '';
+  public categoryTennis = '';
+  public categoryBadminton = '';
+  public preferred = '';
   public contact: number;
   public pass: string;
   public pass1: string;
@@ -45,7 +47,10 @@ export class SignupComponent {
       form.value.roll,
       form.value.hostel,
       form.value.gender,
-      form.value.category,
+      form.value.categorySquash,
+      form.value.categoryTT,
+      form.value.categoryTennis,
+      form.value.categoryBadminton,
       sports,
       form.value.contact,
       form.value.password