Merge pull request #131 from Morphclue/fix/validate-error

Fix TypeError

apps/frontend/src/app/poll/choose-events/choose-events.component.ts

@@ -72,7 +72,6 @@ export class ChooseEventsComponent implements OnInit {
         this.pollService.getEvents(id).pipe(tap(events => {
           this.pollEvents = events;
           this.bookedEvents = new Array(this.pollEvents.length).fill(false);
-          this.validateNew();
         })),
         this.pollService.getParticipants(id).pipe(tap(participants => this.participants = participants)),
         this.pollService.isAdmin(id, this.token),
@@ -81,6 +80,7 @@ export class ChooseEventsComponent implements OnInit {
       this.setDescription(poll, events, participants);
 
       this.clearSelection();
+      this.validateNew();
       this.bookedEvents = events.map(e => poll.bookedEvents.includes(e._id));
       this.isAdmin = isAdmin;
       this.updateHelpers();
@@ -161,9 +161,6 @@ export class ChooseEventsComponent implements OnInit {
     });
   }
 
-  // View Helpers
-  // TODO called from template, bad practice
-
   validateNew() {
     this.errors = checkParticipant(this.newParticipant, this.poll!, this.participants);
   }
@@ -172,14 +169,17 @@ export class ChooseEventsComponent implements OnInit {
     this.errors = checkParticipant(this.editDto!, this.poll!, this.participants, this.editParticipant!._id);
   }
 
+  // View Helpers
+  // TODO called from template, bad practice
+
   countParticipants(pollEvent: PollEvent) {
     const participants = this.participants.filter(p => p.selection[pollEvent._id] === 'yes');
     const indeterminateParticipants = this.participants.filter(p => p.selection[pollEvent._id] === 'maybe');
     return participants.length + indeterminateParticipants.length;
   }
 
-  userVoted() {
-    return this.participants.some(participant => participant.token === this.token);
+  isPastEvent(event: PollEvent) {
+    return Date.parse(event.start) < this.now;
   }
 
   // Helpers
@@ -216,7 +216,7 @@ export class ChooseEventsComponent implements OnInit {
     return this.countParticipants(event) >= this.poll.settings.maxEventParticipants;
   }
 
-  isPastEvent(event: PollEvent) {
-    return Date.parse(event.start) < this.now;
+  private userVoted() {
+    return this.participants.some(participant => participant.token === this.token);
   }
 }