Merge branch 'master' into 8140-add-deepseek-support

open-learning-exchange · Jan 28, 2025 · 117656d · 117656d
2 parents e24cdca + 6a8226f
commit 117656d
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 8 deletions.
diff --git a/src/app/courses/add-courses/courses-add.component.ts b/src/app/courses/add-courses/courses-add.component.ts
@@ -218,11 +218,11 @@ export class CoursesAddComponent implements OnInit, OnDestroy {
   courseChangeComplete(message, response: any, shouldNavigate) {
     this.pouchService.deleteDocEditing(this.dbName, this.courseId);
     this.isSaved = true;
+    this.planetMessageService.showMessage(message);
     if (shouldNavigate) {
       this.navigateBack();
       return;
     }
-    this.planetMessageService.showMessage(message);
     if (this.isDestroyed) {
       return;
     }

diff --git a/src/app/health/health-event-dialog.component.html b/src/app/health/health-event-dialog.component.html
@@ -19,7 +19,6 @@ <h4 class="primary-text-color" *ngIf="hasConditionAndTreatment" i18n>Other Notes
   <p *ngIf="event.treatments"><strong class="mat-body-strong" i18n>Treatments: </strong><td-markdown [content]="event.treatments"></td-markdown>
   <p *ngIf="event.medications"><strong class="mat-body-strong" i18n>Medications: </strong><td-markdown [content]="event.medications"></td-markdown>
   <p *ngIf="event.immunizations"><strong class="mat-body-strong" i18n>Immunizations: </strong><td-markdown [content]="event.immunizations"></td-markdown>
-  <p *ngIf="event.allergies"><strong class="mat-body-strong" i18n>Allergies: </strong><td-markdown [content]="event.allergies"></td-markdown>
   <p *ngIf="event.xrays"><strong class="mat-body-strong" i18n>X-rays: </strong><td-markdown [content]="event.xrays"></td-markdown>
   <p *ngIf="event.tests"><strong class="mat-body-strong" i18n>Lab Tests: </strong><td-markdown [content]="event.tests"></td-markdown>
   <p *ngIf="event.referrals"><strong class="mat-body-strong" i18n>Referrals: </strong><td-markdown [content]="event.referrals"></td-markdown>

diff --git a/src/app/health/health-event.component.html b/src/app/health/health-event.component.html
@@ -56,9 +56,6 @@ <h4 class="full-width primary-text-color" i18n>Condition and Treatment</h4>
         <mat-form-field class="full-width mat-form-field-type-no-underline">
           <planet-markdown-textbox i18n-placeholder placeholder="Immunization Dates" [formControl]="healthForm.controls.immunizations"></planet-markdown-textbox>
         </mat-form-field>
-        <mat-form-field class="full-width mat-form-field-type-no-underline">
-          <planet-markdown-textbox i18n-placeholder placeholder="Allergies" [formControl]="healthForm.controls.allergies"></planet-markdown-textbox>
-        </mat-form-field>
         <mat-form-field class="full-width mat-form-field-type-no-underline">
           <planet-markdown-textbox i18n-placeholder placeholder="X-rays" [formControl]="healthForm.controls.xrays"></planet-markdown-textbox>
         </mat-form-field>

diff --git a/src/app/health/health-update.component.html b/src/app/health/health-update.component.html
@@ -62,6 +62,9 @@
         <mat-form-field class="full-width mat-form-field-type-no-underline">
           <planet-markdown-textbox i18n-placeholder placeholder="Special Needs" [formControl]="healthForm.controls.specialNeeds"></planet-markdown-textbox>
         </mat-form-field>
+        <mat-form-field class="full-width mat-form-field-type-no-underline">
+          <planet-markdown-textbox i18n-placeholder placeholder="Allergies" [formControl]="healthForm.controls.allergies"></planet-markdown-textbox>
+        </mat-form-field>
         <mat-form-field class="full-width mat-form-field-type-no-underline">
           <planet-markdown-textbox i18n-placeholder placeholder="Other Notes" [formControl]="healthForm.controls.notes"></planet-markdown-textbox>
         </mat-form-field>

diff --git a/src/app/health/health-update.component.ts b/src/app/health/health-update.component.ts
@@ -65,6 +65,7 @@ export class HealthUpdateComponent implements OnInit {
       emergencyContactType: '',
       emergencyContact: '',
       specialNeeds: '',
+      allergies: '',
       notes: ''
     });
     this.healthForm.controls.emergencyContactType.valueChanges.subscribe(value => {

diff --git a/src/app/health/health.component.html b/src/app/health/health.component.html
@@ -66,6 +66,13 @@ <h4 class="primary-text-color" i18n>Emergency Contact</h4>
           </div>
           <mat-divider></mat-divider>
         </div>
+        <div class="full-width">
+          <div>
+            <h4 class="primary-text-color" i18n>Allergies</h4>
+            <td-markdown [content]="healthDetail?.allergies || 'N/A'"></td-markdown>
+          </div>
+          <mat-divider></mat-divider>
+        </div>
         <div class="full-width">
           <div>
             <h4 class="primary-text-color" i18n>Special Needs</h4>

diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html
@@ -43,7 +43,7 @@ <h1><ng-container>Planet</ng-container> {{planetName}}</h1>
       <button mat-icon-button *planetAuthorizedRoles="'only,health'" i18n-title title="Health" routerLink="/health"><mat-icon>local_hospital</mat-icon></button>
     </ng-container>
     <span *ngIf="layout === 'classic' && !forceModern">
-      <button mat-icon-button routerLink="/chat" i18n-title title="Chat"><mat-icon>chat_bubble_outline</mat-icon></button>
+      <button mat-icon-button routerLink="/chat" i18n-title title="Chat"><mat-icon>question_answer</mat-icon></button>
       <button mat-icon-button planetFeedback i18n-title title="Submit Feedback"><mat-icon>feedback_outline</mat-icon></button>
       <button mat-icon-button routerLink="/feedback" i18n-title title="Review Feedback"><mat-icon>mail_outline</mat-icon></button>
       <ng-container *planetAuthorizedRoles>

diff --git a/src/app/shared/forms/planet-tag-selected-input.component.ts b/src/app/shared/forms/planet-tag-selected-input.component.ts
@@ -8,8 +8,8 @@ import { DeviceInfoService, DeviceType } from '../../shared/device-info.service'
       <span *ngSwitchCase="0" i18n>No collections selected</span>
       <span *ngSwitchCase="1"><span i18n>Selected:</span>
         {{ truncatedTooltip }}
-      <span *ngSwitchDefault [matTooltip]="tooltipLabels" i18n>Hover to see selected collections</span>
     </span>
+    <span *ngSwitchDefault [matTooltip]="tooltipLabels"><span i18n>Hover to see selected collections</span></span>
   `,
   selector: 'planet-tag-selected-input'
 })

diff --git a/src/app/teams/teams-view.component.html b/src/app/teams/teams-view.component.html
@@ -228,7 +228,11 @@ <h3 *ngIf="mode==='services'" class="margin-lr-3 ellipsis-title">{{configuration
               <mat-card *ngFor="let request of requests">
                 <mat-card-header>
                   <img mat-card-avatar [src]="request.avatar" class="cursor-pointer" (click)="openMemberDialog(request)">
-                  <a mat-card-title class="cursor-pointer" (click)="openMemberDialog(request)">{{request.userDoc?.fullName || request.userDoc?.doc?.firstName || request.name}}</a>
+                  <a mat-card-title class="cursor-pointer" (click)="openMemberDialog(request)">
+                    {{
+                      truncateText(request.userDoc?.fullName || request.userDoc?.doc?.firstName || request.name, 20)
+                    }}
+                  </a>
                   <mat-card-subtitle>
                     <p class="primary-text-color" *ngIf="request.userPlanetCode !== planetCode"><ng-container i18n>Member of Planet</ng-container> {{request.userPlanetCode}}</p>
                   </mat-card-subtitle>

diff --git a/src/app/teams/teams-view.component.ts b/src/app/teams/teams-view.component.ts
@@ -553,4 +553,10 @@ export class TeamsViewComponent implements OnInit, AfterViewChecked, OnDestroy {
       maxHeight: '90vh'
     });
   }
+
+  truncateText(text: string, maxLength: number): string {
+    if (!text) { return ''; }
+    return text.length > maxLength ? text.slice(0, maxLength) + '...' : text;
+  }
+
 }