Merge branch 'master' into angular-upgrade

Author: arnavbhate

src/app/data.service.ts

@@ -597,12 +597,26 @@ export class DataService {
   }
 
   /** Return true if the current user can view the max content of the event and push email */
-  canViewMaxContent(): boolean {
+  canViewMaxContent(event: IEvent): boolean {
+    if (
+      !this._loggedIn ||
+      !event ||
+      !event.verification_bodies_id ||
+      !event.verification_bodies_id.length
+    )
+      return false;
+
+    const verificationBodyId = event.verification_bodies_id[0];
+
     for (const role of this._currentUser.roles) {
-      if (role.permissions.includes("VerE")) {
+      if (
+        role.permissions.includes("VerE") &&
+        role.bodies.some((body) => body.id === verificationBodyId)
+      ) {
         return true;
       }
     }
+    return false;
   }
 
   /** Mark a UNR for the current user */

src/app/helpers.ts

@@ -170,7 +170,7 @@ export module Helpers {
             /* Init times */
             event.start_time = new Date(event.start_time.toString());
             event.end_time = new Date(event.end_time.toString());
-
+            event.venue_room = event.venue_room || '';
             /* Check for ongoing/ended events */
             let subtitleTime = GetDate(event.start_time);
             const now = new Date();
@@ -183,7 +183,7 @@ export module Helpers {
             }
 
             /* Get the subtitle */
-            return subtitleTime + (event.venues.length > 0 ?  ' | ' + event.venues_str : '');
+            return subtitleTime + (event.venue_room.length > 0 ?  ' | ' + event.venue_room : '')+ (event.venues.length > 0 ?  ' | ' + event.venues_str : '');
         }
         return '';
     }

src/app/interfaces.ts

@@ -46,6 +46,7 @@ export interface IEvent {
     venues: ILocation[];
     venue_names: string[];
     venues_str: string;
+    venue_room: string;
     bodies: IBody[];
     verification_bodies: IBody[];
     verification_bodies_id: string[];

src/app/page/add-event/add-event.component.css

@@ -87,6 +87,11 @@
     float: right;
 }
 
+ .venue-dropdown-panel {
+  max-height: 250px !important;
+  overflow-y: auto !important;
+} 
+
 @media (max-width: 1200px) {
     .full-width-details {
         left: 1%;

src/app/page/add-event/add-event.component.html

@@ -93,32 +93,47 @@
         </mat-form-field>
       </div>
 
-      <div *ngFor="let vn of event.venues; let i = index">
-        <mat-form-field class="full-width-details venue">
-          <input
-            matInput
-            placeholder="Venue"
-            aria-label="Venue"
-            [matAutocomplete]="venueAuto"
-            [formControl]="venueControls[i].form"
-          />
+      <div>
+        <!-- <mat-form-field class="full-width-details venue">
+          <input matInput placeholder="Venue" aria-label="Venue" [matAutocomplete]="venueAuto"
+            [formControl]="venueControls[0].form">
         </mat-form-field>
 
         <mat-autocomplete #venueAuto="matAutocomplete">
-          <mat-option
-            *ngFor="let venue of venueControls[i].filteredLocations | async"
-            [value]="venue.short_name"
-          >
+          <mat-option *ngFor="let venue of venueControls[0].filteredLocations | async" [value]="venue.short_name">
             {{ venue.short_name }}
           </mat-option>
-        </mat-autocomplete>
+        </mat-autocomplete> -->
+
+        <mat-form-field class="full-width-details venue">
+          <mat-select
+            placeholder="Venue / Building"
+            [(ngModel)]="event.venues[0].short_name"
+            required
+            panelClass="venue-dropdown-panel"
+          >
+            <mat-option
+              *ngFor="let location of predefinedLocations"
+              [value]="location"
+            >
+              {{ location }}
+            </mat-option>
+          </mat-select>
+        </mat-form-field>
 
-        <button *ngIf="i == 0" (click)="AddVenue()" mat-icon-button>
+        <mat-form-field class="full-width-details">
+          <input
+            matInput
+            placeholder="Specific Location / Room (optional)"
+            [(ngModel)]="event.venue_room"
+          />
+        </mat-form-field>
+        <!-- <button *ngIf="i==0" (click)="AddVenue()" mat-icon-button>
           <mat-icon>add</mat-icon>
         </button>
         <button *ngIf="i !== 0" (click)="RemoveVenue(i)" mat-icon-button>
           <mat-icon>remove</mat-icon>
-        </button>
+        </button> -->
       </div>
 
       <div>
@@ -146,9 +161,9 @@
       <div>
         <mat-form-field class="full-width-details">
           <mat-select
-            [(ngModel)]="event.verification_bodies_id"
+            [(ngModel)]="event.verification_bodies_id[0]"
             placeholder="Verification Bodies"
-            multiple
+            required
           >
             <mat-option
               *ngFor="let verification_body of verification_bodies"
@@ -167,14 +182,9 @@
         </mat-form-field>
       </div>
 
-      <div class="full-width-details">
-        <app-search-box
-          exploreProp="interests"
-          displayProp="title"
-          placeholder="Notify according to interests"
-          hint="Enter a Interest"
-          (change)="setInterest($event)"
-        >
+      <!-- <div class="full-width-details">
+        <app-search-box exploreProp="interests" displayProp="title" placeholder="Notify according to interests"
+          hint="Enter a Interest" (change)="setInterest($event)">
         </app-search-box>
 
         <app-interest-card
@@ -184,7 +194,8 @@
           [deleteMethod]="deleteInterestFunc"
         >
         </app-interest-card>
-      </div>
+
+      </div> -->
 
       <div>
         <mat-form-field class="full-width-details">
@@ -214,24 +225,24 @@
           <textarea
             matInput
             placeholder="Email Content / InstiApp Description"
-            [(ngModel)]="event.longdescription"
+            [(ngModel)]="event.description"
             (ngModelChange)="event.description = $event"
             rows="8"
           ></textarea>
         </mat-form-field>
       </div>
 
-      <div class="audience-panel" *ngIf="tagCategoryList">
+      <!-- <div class="audience-panel" *ngIf="tagCategoryList">
         <div class="full-width-details">
           <div class="label tag-category">
             Offered Achievements
-            <button mat-button class="has float-right" (click)="addOffer()">
-              Add
-            </button>
-            <div class="sub">Make your event stand out</div>
-          </div>
+            <button mat-button class="has float-right" (click)="addOffer()">Add</button>
+            <div class="sub">
+              Make your event stand out
+            </div>
+          </div> -->
 
-          <mat-accordion>
+      <!-- <mat-accordion>
             <mat-expansion-panel *ngFor="let offer of offeredAchievements">
               <mat-expansion-panel-header>
                 <mat-panel-title>
@@ -266,9 +277,9 @@
             </mat-expansion-panel>
           </mat-accordion>
         </div>
-      </div>
+      </div> -->
 
-      <div class="audience-panel" *ngIf="tagCategoryList">
+      <!-- <div class="audience-panel" *ngIf="tagCategoryList">
         <div class="full-width-details">
           <div class="label">
             Restricted Audience
@@ -320,15 +331,15 @@
             </mat-expansion-panel>
           </mat-accordion>
         </div>
-      </div>
-
+      </div> -->
+      <!--
       <div>
         <div class="full-width-details switch">
           <mat-slide-toggle [(ngModel)]="event.notify">
             Notify followers on creation/updation
           </mat-slide-toggle>
         </div>
-      </div>
+      </div> -->
 
       <div>
         <button
@@ -367,6 +378,6 @@
       is supported
     </div>
     <markdown class="markdown" [data]="event.email_subject"></markdown>
-    <markdown class="markdown" [data]="event.longdescription"></markdown>
+    <markdown class="markdown" [data]="event.description"></markdown>
   </div>
 </app-desktop-split>