fix(appointment): disallows booking of multiple appointments

Fixes: #53
Sirimangalo · Aug 6, 2016 · 47a2e63 · 47a2e63
1 parent e8aca2d
commit 47a2e63
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/src/app/appointment/appointment.component.ts b/src/app/appointment/appointment.component.ts
@@ -23,6 +23,7 @@ export class AppointmentComponent {
   appointmentSocket;
   rightBeforeAppointment: boolean = false;
   loadedInitially: boolean = false;
+  userHasAppointment: boolean = false;
 
   constructor(
     public appointmentService: AppointmentService,
@@ -43,6 +44,7 @@ export class AppointmentComponent {
    * Method for querying appointments
    */
   loadAppointments(): void {
+    this.userHasAppointment = false;
     this.appointmentService
       .getAll()
       .map(res => res.json())
@@ -53,7 +55,9 @@ export class AppointmentComponent {
         // find current user and check if appointment is now
         for (const appointment of res.appointments) {
           if (!appointment.user) continue;
+          if (appointment.user._id !== this.getUserId()) continue;
 
+          this.userHasAppointment = true;
           const format: string = appointment.hour < 1000 ? 'Hmm' : 'HHmm';
 
           // show Hangouts Button 5 minutes before and after appointment time
@@ -62,10 +66,7 @@ export class AppointmentComponent {
           const hourEnd = moment.utc('' + appointment.hour, format)
             .add(5, 'minutes');
 
-          if (appointment.user._id === this.getUserId()
-            && moment.utc() >= hourStart
-            && moment.utc() <= hourEnd
-          ) {
+          if (moment.utc() >= hourStart && moment.utc() <= hourEnd) {
             this.activateHangoutsButton();
             break;
           }

diff --git a/src/app/appointment/appointment.html b/src/app/appointment/appointment.html
@@ -30,7 +30,7 @@ <h3>You can start the meeting via this button:</h3>
           <span *ngIf="app.hour == hour && app.weekDay == day">
             <a *ngIf="app.user && app.user._id !== getUserId()" class="taken-appointment">
               <span class="appointment-username">{{ app.user.name }}</span>
-              <span class="appointment-taken">my</span>
+              <span class="appointment-taken">taken</span>
             </a>
             <a href="#"
               *ngIf="app.user && app.user._id === getUserId()"
@@ -41,12 +41,18 @@ <h3>You can start the meeting via this button:</h3>
               <span class="appointment-taken">my</span>
             </a>
             <a href="#"
-              *ngIf="!app.user"
+              *ngIf="!app.user && !userHasAppointment"
               class="free-appointment"
               (click)="toggleRegistration($event, app)"
             >
               free
             </a>
+            <a
+              *ngIf="!app.user && userHasAppointment"
+              class="free-appointment"
+            >
+              free
+            </a>
           </span>
         </span>
       </td>