v3.23.4 (#199)

* Fix tracking of active prac challenge * Minor cleanup and improved console logging * Bug fixes and challenge report tags filter. * Fix event horizon, game center teams, enrollment report stat summary, progress widget * Fix issue with past games not showing ongoing ones * Report improvements, game card rendering * Fix tag rendering in practice reports * Fix game card rendering issues * Minor cleanup
cmu-sei · Oct 17, 2024 · 0f8d590 · 0f8d590
1 parent a6bb473
commit 0f8d590
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 8 deletions.
diff --git a/projects/gameboard-ui/src/app/admin/dashboard/dashboard.component.html b/projects/gameboard-ui/src/app/admin/dashboard/dashboard.component.html
@@ -71,7 +71,7 @@
       <div class="wrapper col-3 my-4" *ngFor="let g of games">
         <app-game-card [game]="g" [routerLink]="['/admin', 'game', g.id]"></app-game-card>
 
-        <div class="info-bubbles d-flex align-items-center">
+        <div class="info-bubbles mt-2 d-flex align-items-center">
           <app-game-info-bubbles class="d-block mt-2" [game]="g" bubbleSize="xl">
           </app-game-info-bubbles>
 

diff --git a/projects/gameboard-ui/src/app/admin/dashboard/dashboard.component.scss b/projects/gameboard-ui/src/app/admin/dashboard/dashboard.component.scss
@@ -2,6 +2,7 @@
 
 .new-game-controls {
   padding: 0.25rem 1.25rem;
+  width: 252px;
 }
 
 ::ng-deep app-dropzone .dropzone {

diff --git a/projects/gameboard-ui/src/app/core/components/game-card-image/game-card-image.component.ts b/projects/gameboard-ui/src/app/core/components/game-card-image/game-card-image.component.ts
@@ -4,7 +4,7 @@ import { Component, Input } from '@angular/core';
   selector: 'app-game-card-image',
   styles: [
     ":host { aspect-ratio: 1/1.44; display: block; }",
-    ".game-card-container { aspect-ratio: 1/1.44;  background-size: cover; }"
+    ".game-card-container { aspect-ratio: 1/1.44; background: #303030 center center/contain no-repeat; }"
   ],
   templateUrl: './game-card-image.component.html'
 })

diff --git a/...components/practice-challenge-state-summary/practice-challenge-state-summary.component.ts b/...components/practice-challenge-state-summary/practice-challenge-state-summary.component.ts
@@ -5,12 +5,12 @@ import { UserService as LocalUserService } from '@/utility/user.service';
 import { UnsubscriberService } from '@/services/unsubscriber.service';
 import { Component } from '@angular/core';
 import { DateTime } from 'luxon';
-import { Observable, combineLatest, firstValueFrom, map, tap, timer } from 'rxjs';
+import { Observable, combineLatest, map, tap, timer } from 'rxjs';
 import { ActiveChallengesRepo } from '@/stores/active-challenges.store';
 import { slug } from '@/../tools/functions';
 import { TeamService } from '@/api/team.service';
 import { ToastService } from '@/utility/services/toast.service';
-import { HubEventAction, NotificationService } from '@/services/notification.service';
+import { NotificationService } from '@/services/notification.service';
 
 @Component({
   selector: 'app-practice-challenge-state-summary',

diff --git a/...rd-ui/src/app/reports/components/reports/challenges-report/challenges-report.component.ts b/...rd-ui/src/app/reports/components/reports/challenges-report/challenges-report.component.ts
@@ -42,7 +42,7 @@ export class ChallengesReportComponent extends ReportComponentBase<ChallengesRep
     deserializer: (value: string, options?: SimpleEntity[]) => options!.find(g => g.id === value) || null
   });
 
-  protected challengeTagsQueryModel: MultiSelectQueryParamModel<string> | null = new MultiSelectQueryParamModel<string>({ paramName: "tags" })
+  protected challengeTagsQueryModel: MultiSelectQueryParamModel<string> | null = new MultiSelectQueryParamModel<string>({ paramName: "tags" });
 
   protected seasonsQueryModel: MultiSelectQueryParamModel<string> | null = new MultiSelectQueryParamModel<string>({
     paramName: "seasons"

diff --git a/...tice-mode-report/practice-mode-report-by-user/practice-mode-report-by-user.component.html b/...tice-mode-report/practice-mode-report-by-user/practice-mode-report-by-user.component.html
@@ -41,8 +41,13 @@
                             [player]="{ userId: record.user.id, name: record.user.name, sponsor: record.user.sponsor }"></app-player-field>
                     </td>
                     <td>
-                        <app-challenge-or-game-field [challengeName]="record.challenge.name"
-                            [game]="record.challenge.game"></app-challenge-or-game-field>
+                        {{ record.challenge.name }}
+                        <ul class="d-flex m-0">
+                            <li *ngFor="let tag of record.challenge.tags">
+                                <app-colored-text-chip [text]="tag"></app-colored-text-chip>
+                            </li>
+                        </ul>
+                        <app-challenge-or-game-field [game]="record.challenge.game"></app-challenge-or-game-field>
                     </td>
 
                     <!--ATTEMPTS-->

diff --git a/...ui/src/app/reports/components/reports/practice-mode-report/practice-mode-report.models.ts b/...ui/src/app/reports/components/reports/practice-mode-report/practice-mode-report.models.ts
@@ -48,6 +48,7 @@ export interface PracticeModeReportByUserRecord extends PracticeModeReportRecord
         name: string;
         game: ReportGame;
         maxPossibleScore: number;
+        tags: string[]
     };
     attempts: {
         player: SimpleEntity;

diff --git a/projects/gameboard-ui/src/app/utility/components/game-card/game-card.component.scss b/projects/gameboard-ui/src/app/utility/components/game-card/game-card.component.scss
@@ -9,7 +9,8 @@
 }
 
 .card {
-  background-size: cover;
+  aspect-ratio: 1/1.44;
+  background: #303030 center center/contain no-repeat;
   box-shadow: rgb(0 0 0 / 15%) 3px 3px 0;
   width: 100%;
   margin: 0;