Merge pull request #336 from intersective/prerelease

Release 2.2.1.5

src/app/chat/chat-list/chat-list.component.ts

@@ -54,7 +54,6 @@ export class ChatListComponent {
       return;
     }
     this._initialise();
-    this._checkAndSubscribePusherChannels();
     this._loadChatData();
   }
 
@@ -75,6 +74,7 @@ export class ChatListComponent {
       this._groupingChatChannels();
       this.loadingChatList = false;
       this.chatListReady.emit(this.announcementChatChannels.concat(this.groupChatChannels, this.directChatChannels));
+      this._checkAndSubscribePusherChannels();
     });
   }
 

src/app/chat/edit-schedule-message-popup/edit-schedule-message-popup.component.html

@@ -1,6 +1,6 @@
 <div class="ion-padding" [ngClass]="{'main-container': updateSuccess}">
   <ng-container *ngIf="!updateSuccess; else messageCreated">
-    <p class="subtitle-2 popup-title">{{ reScheduled ? 'Modify Shedule' : 'Edit Message' }}</p>
+    <p class="subtitle-2 popup-title">{{ reScheduled ? 'Modify Schedule' : 'Edit Message' }}</p>
 
     <p class="caption hint-message" *ngIf="reScheduled"><strong>{{ utils.browserTimezone() }} Timezone</strong></p>
 

src/app/chat/group-chat-popup/group-chat-popup.component.html

@@ -8,7 +8,7 @@
       <ion-label class="ion-text-wrap">
         <p class="black subtitle-2 channel-title">Cohort Open Discussion</p>
         <p class="caption grey-50">Add experience participants in one channel to boost your 
-          comunity. <strong>All participants can send messages to this channel.</strong></p>
+          community. <strong>All participants can send messages to this channel.</strong></p>
       </ion-label>
     </ion-item>
   </ion-list>

src/app/chat/schedule-message-popup/schedule-message-popup.component.html

@@ -10,11 +10,11 @@
     <div class="form-container">
 
       <p class="subtitle-2 popup-subtitle">Date</p>
-      <ion-input class="date-time-pickers" type="date" [(ngModel)]="selectedDate"></ion-input>
+      <ion-input class="date-time-pickers" type="date" [(ngModel)]="selectedDate" (ionChange)="validateDateTime()"></ion-input>
 
 
       <p class="subtitle-2 popup-subtitle">Time</p>
-      <ion-input class="date-time-pickers" type="time" [(ngModel)]="selectedTime"></ion-input>
+      <ion-input class="date-time-pickers" type="time" [(ngModel)]="selectedTime" (ionChange)="validateDateTime()"></ion-input>
 
       <p class="subtitle-2 popup-error" *ngIf="invalidDateTime">Selected date and time is not valid</p>
 
@@ -41,11 +41,11 @@
   </ng-template>
 </div>
 <div class="message-popup-footer">
-  <ion-button tabindex="2" color="light" class="btn-cancle" (click)="close()" [disabled]="sending">
+  <ion-button tabindex="2" color="light" class="btn-cancel" (click)="close()" [disabled]="sending">
     {{ createdMessage ? 'Close' : 'Cancel' }}
   </ion-button>
   <ion-button *ngIf="!createdMessage" tabindex="3" color="ocean" (click)="scheduleMessage()"
-    [disabled]="sending || !selectedDate || !selectedTime || !channelUuid">
+    [disabled]="sending || invalidDateTime || !channelUuid">
     {{ sending ? 'sending..' : 'Schedule Message'}}
   </ion-button>
 </div>

src/app/chat/schedule-message-popup/schedule-message-popup.component.ts

@@ -1,6 +1,5 @@
 import { Component, OnInit, Input } from '@angular/core';
 import { ModalController } from '@ionic/angular';
-import * as moment from 'moment';
 
 import { StorageService } from '@services/storage.service';
 import { UtilsService } from '@services/utils.service';
@@ -43,10 +42,11 @@ export class ScheduleMessagePopupComponent implements OnInit {
   }
 
   private _initialise() {
+    const today = new Date();
     this.uploading = false;
     this.sending = false;
-    this.selectedDate = '';
-    this.selectedTime = '';
+    this.selectedDate = today.toLocaleDateString();
+    this.selectedTime = (today.getHours() < 10 ? '0' : '') + today.getHours() + ':00';
     this.uploadedFile = null;
     this.invalidDateTime = false;
     this.createdMessage = null;
@@ -61,6 +61,10 @@ export class ScheduleMessagePopupComponent implements OnInit {
     });
   }
 
+  validateDateTime() {
+    this.invalidDateTime = !this.isValidDateTime(`${this.selectedDate} ${this.selectedTime}`);
+  }
+
   scheduleMessage() {
     if (!this.selectedDate || !this.selectedTime || !this.channelUuid) {
       return;

src/app/overview/overview.component.html

@@ -9,7 +9,7 @@ <h1>Experiences</h1>
       </div>
       <div class="title-bar-tools col-md-6">
         <button class="btn btn-link" [disabled]="loadingExps" (click)="createReport()">Download data</button>
-        <button class="btn btn-primary btn-sm" style='border-radius: 20px; font-size: .8em;' (click)="goToLink('https://help.practera.com/en/articles/4820081-communicating-with-learners-and-experts')"><ion-icon size='small' name="help-circle-outline"></ion-icon><span>help</span></button>
+        <button class="btn btn-primary btn-sm" style='border-radius: 20px; font-size: .8em;' (click)="goToLink('https://practera.com/docs/the-experience-portal-explained-practera-2/')"><ion-icon size='small' name="help-circle-outline"></ion-icon><span>help</span></button>
       </div>
     </div>
   </header>

src/styles.scss

@@ -163,7 +163,7 @@ ion-item.sc-ion-select-popover {
   flex-direction: row;
   flex-wrap: wrap;
 
-  .btn-cancle {
+  .btn-cancel {
     &::part(native) {
       border: 1px solid;
       border-color: var(--practera-grey-25);