Merge branch 'master' into 8024-december-challange-error

package.json

@@ -1,7 +1,7 @@
 {
   "name": "planet",
   "license": "AGPL-3.0",
-  "version": "0.16.25",
+  "version": "0.16.30",
   "myplanet": {
     "latest": "v0.21.55",
     "min": "v0.20.55"

src/app/chat/chat-sidebar/chat-sidebar.component.html

@@ -13,8 +13,8 @@
       <button mat-icon-button color="primary" (click)="resetFilter()" [disabled]="!titleSearch && !searchType" matTooltip="Clear search" i18n-matTooltip [matTooltipDisabled]="!titleSearch && !searchType">
         <mat-icon>delete</mat-icon>
       </button><br>
-      <span style="font-size: small; font-style: italic;" i18n>Full Conversation Search </span>
       <mat-checkbox [checked]="fullTextSearch" (change)="toggleSearchType()"></mat-checkbox>
+      <span style="font-size: small; font-style: italic;" i18n>Full Conversation Search </span>
       <button style="text-align: end;" mat-icon-button (mouseenter)="toggleOverlay()" (mouseleave)="toggleOverlay()" cdkOverlayOrigin #trigger="cdkOverlayOrigin">
         <mat-icon>help_outline</mat-icon>
       </button>

src/app/chat/chat-sidebar/chat-sidebar.scss

@@ -81,6 +81,10 @@ li:hover {
   margin-left: 4px;
 }
 
+.mat-checkbox {
+  margin-right: 4px;
+}
+
 @media only screen and (max-width: $screen-md) {
   .expand-button {
     top: 10px;

src/app/community/community.scss

@@ -66,6 +66,7 @@ planet-calendar {
     top: -0.25rem;
     right: -0.25rem;
   }
+  word-break: break-word;
 }
 
 mat-tab-group, mat-tab {

src/app/dashboard/dashboard-tile.scss

@@ -25,7 +25,7 @@
         flex-wrap: wrap;
         font-size: 1.25rem;
       }
-
+      color: #fff;
     }
 
     .right-tile {

src/app/health/health-event-dialog.component.html

@@ -27,6 +27,6 @@ <h4 class="primary-text-color" *ngIf="hasConditionAndTreatment" i18n>Other Notes
 <mat-dialog-actions>
   <button type="button" mat-raised-button mat-dialog-close i18n>Close</button>
   <button type="button" color="primary" mat-dialog-close (click)="editExam(event)" *ngIf="canUpdate" mat-raised-button>
-    <span i18n>Edit</span> <ng-container *ngIf="minutes">({{ minutes }}:{{ seconds }})</ng-container>
+    <span i18n>Edit <ng-container *ngIf="minutes">({{ minutes }}:{{ seconds }})</ng-container></span> 
   </button>
 </mat-dialog-actions>

src/app/health/health.component.html

@@ -6,6 +6,7 @@
 
 <div class="space-container">
   <mat-toolbar class="primary-color font-size-1 action-buttons">
+    <span class="toolbar-fill"></span>
     <a mat-raised-button color="accent" i18n [routerLink]="['update']" *ngIf="isOwnUser">Update Details</a>
     <a mat-raised-button color="accent" i18n [routerLink]="['event', { id: userDetail._id }]">Add Examination</a>
     <span *ngIf="userDetail.firstName === undefined"><ng-container i18n>Member login:</ng-container> {{userDetail.name}}</span>

src/app/tasks/tasks.component.ts

@@ -73,20 +73,20 @@ export class TasksComponent implements OnInit {
   }
 
   isTaskDueSoon(task): boolean {
-    if (!task || task.completed || !task.deadline) return false;
-  
+    if (!task || task.completed || !task.deadline) { return false; }
+
     const now = new Date();
     const deadline = new Date(task.deadline);
     const twentyFourHoursFromNow = new Date(now.getTime() + 24 * 60 * 60 * 1000);
-  
+
     const isWithinNextDay = deadline <= twentyFourHoursFromNow && deadline > now;
-  
+
     return isWithinNextDay;
   }
 
   isTaskOverdue(task): boolean {
-    if (task.completed || !task.deadline) return false;
-    
+    if (task.completed || !task.deadline) { return false; }
+
     const now = new Date();
     const deadline = new Date(task.deadline);
     return deadline < now;