fix(virtual-classroom): filter updates AN-23398

kaltura · Sep 25, 2024 · be2aab3 · be2aab3
1 parent ab5c732
commit be2aab3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/app/modules/entry-ep/entry-ep-view.component.html b/src/app/modules/entry-ep/entry-ep-view.component.html
@@ -30,10 +30,10 @@ <h1 *ngIf="_viewConfig.title" class="kTitle kTruncateTitle" [kTooltip]="_entry?.
         <div class="kReports" [class.vc]="_isVirtualClassroom">
           <div class="kReportContainer" *ngIf="!_loadingEntry">
             <div [class.kHidden]="!_viewConfig.miniViewers" class="kMiniReportContainer kSocialHighlights" [class.vc]="_isVirtualClassroom">
-              <app-ep-mini-viewers [isVirtualClassroom]="_isVirtualClassroom" [exporting]="_exporting" [entryIdIn]="_allEntryIds" [startDate]="_eventStartDate" [endDate]="_now"></app-ep-mini-viewers>
+              <app-ep-mini-viewers [isVirtualClassroom]="_isVirtualClassroom" [exporting]="_exporting" [entryIdIn]="_isVirtualClassroom ? _liveEntryIds : _allEntryIds" [startDate]="_eventStartDate" [endDate]="_isVirtualClassroom ? _eventEndDate : _now"></app-ep-mini-viewers>
             </div>
             <div [class.kHidden]="!_viewConfig.miniMinutesViewed" class="kMiniReportContainer kSocialHighlights">
-              <app-ep-mini-minutes-viewed [isVirtualClassroom]="_isVirtualClassroom" [entryIdIn]="_allEntryIds" [startDate]="_eventStartDate" [endDate]="_now"></app-ep-mini-minutes-viewed>
+              <app-ep-mini-minutes-viewed [isVirtualClassroom]="_isVirtualClassroom" [entryIdIn]="_isVirtualClassroom ? _liveEntryIds : _allEntryIds" [startDate]="_eventStartDate" [endDate]="_isVirtualClassroom ? _eventEndDate : _now"></app-ep-mini-minutes-viewed>
             </div>
           </div>
 
@@ -58,11 +58,11 @@ <h1 *ngIf="_viewConfig.title" class="kTitle kTruncateTitle" [kTooltip]="_entry?.
         </div>
 
         <div *ngIf="!_loadingEntry" [class.kHidden]="!_viewConfig.geo" [class.exporting]="_exporting" class="kReportContainer">
-          <app-ep-geo [isVirtualClassroom]="_isVirtualClassroom" [entryIdIn]="_allEntryIds" [startDate]="_eventStartDate" [endDate]="_now" [exporting]="_exporting"></app-ep-geo>
+          <app-ep-geo [isVirtualClassroom]="_isVirtualClassroom" [entryIdIn]="_isVirtualClassroom ? _liveEntryIds : _allEntryIds" [startDate]="_eventStartDate" [endDate]="_isVirtualClassroom ? _eventEndDate : _now" [exporting]="_exporting"></app-ep-geo>
         </div>
 
         <div *ngIf="!_loadingEntry" [class.kHidden]="!_viewConfig.devices" [class.exporting]="_exporting" class="kReportContainer">
-          <app-ep-devices [isVirtualClassroom]="_isVirtualClassroom" [entryIdIn]="_allEntryIds" [startDate]="_eventStartDate" [endDate]="_now" [exporting]="_exporting"></app-ep-devices>
+          <app-ep-devices [isVirtualClassroom]="_isVirtualClassroom" [entryIdIn]="_isVirtualClassroom ? _liveEntryIds : _allEntryIds" [startDate]="_eventStartDate" [endDate]="_isVirtualClassroom ? _eventEndDate : _now" [exporting]="_exporting"></app-ep-devices>
         </div>
 
         <div class="disclaimers" *ngIf="_exporting">

diff --git a/src/app/modules/entry-ep/entry-ep-view.component.ts b/src/app/modules/entry-ep/entry-ep-view.component.ts
@@ -171,9 +171,9 @@ export class EntryEpViewComponent implements OnInit, OnDestroy {
               this._cuepointOptions = [];
               this._cuePoints.forEach(cuepoint => {
                 const duration = moment.duration(cuepoint.duration, 'seconds');
-                const format = cuepoint.duration > 3599 ? 'hh:mm:ss' : 'mm:ss';
+                const format = cuepoint.duration > 3599 ? 'HH:mm:ss' : 'mm:ss';
                 this._cuepointOptions.push({
-                  label: `${moment(cuepoint.startTime * 1000).format('MMMM DD, YYYY')}\u00A0\u00A0\u00A0${moment(cuepoint.startTime * 1000).format('hh:mm')} - ${moment(cuepoint.endTime * 1000).format('hh:mm')}\u00A0\u00A0\u00A0(${moment.utc(duration.as('milliseconds')).format(format)})`,
+                  label: `${moment(cuepoint.startTime * 1000).format('MMMM DD, YYYY')}\u00A0\u00A0\u00A0${moment(cuepoint.startTime * 1000).format('HH:mm')} - ${moment(cuepoint.endTime * 1000).format('HH:mm')}\u00A0\u00A0\u00A0(${moment.utc(duration.as('milliseconds')).format(format)})`,
                   value: cuepoint
                 });
               });