Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v3.13.3-beta1 #163

Merged
merged 2 commits into from
Jan 26, 2024
Merged

v3.13.3-beta1 #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a1d538
Clean up error handling for extend.
sei-bstein Jan 25, 2024
ea8705e
Hide session alignment warning in external game admin until deploy is…
sei-bstein Jan 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions projects/gameboard-ui/src/app/admin/admin-player-session/admin-player-session.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<!-- Copyright 2021 Carnegie Mellon University. All Rights Reserved. -->
<!-- Released under a MIT (SEI)-style license. See LICENSE.md in the project root for license information. -->

<app-error-div [errors]="errors"></app-error-div>

<ng-container *ngIf="team$ | async as team; else loading">
<div class="timeline-container px-3">
<div>Timeline <span class="badge badge-info">[BETA]</span></div>
Expand Down
7 changes: 4 additions & 3 deletions projects/gameboard-ui/src/app/admin/admin-player-session/admin-player-session.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export class PlayerSessionComponent implements OnInit {
showRaw = false;
statusText = "Loading your session...";
faInfo = faInfoCircle;
errors: any[] = [];
protected errors: any[] = [];

protected isExtending = false;
protected isLoadingChallenges = false;
Expand All @@ -53,14 +53,15 @@ export class PlayerSessionComponent implements OnInit {
try {
this.isExtending = true;
await firstValueFrom(this.teamService.extendSession({ teamId: team.teamId, sessionEnd: team.sessionEnd }));

const friendlySessionEnd = DateTime.fromISO(team.sessionEnd.toString());
this.toastService.showMessage(`Team session extended to ${friendlySessionEnd.toLocaleString(DateTime.DATETIME_FULL)}.`);
}
catch (err: any) {
this.errors.push(err);
}

this.isExtending = false;
const friendlySessionEnd = DateTime.fromISO(team.sessionEnd.toString());
this.toastService.showMessage(`Team session extended to ${friendlySessionEnd.toLocaleString(DateTime.DATETIME_FULL)}.`);
}

toggleRawView(isExpanding: boolean): void {
Expand Down
6 changes: 3 additions & 3 deletions ...eboard-ui/src/app/admin/components/external-game-admin/external-game-admin.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ <h3 class="sync-session-date fs-12" *ngIf="sessionDateDescription">
</app-confirm-button>
</div>

<alert *ngIf="context.hasNonStandardSessionWindow" type="warning" class="my-4">
<alert *ngIf="context.startTime && context.hasNonStandardSessionWindow" type="warning" class="my-4">
<h3>Warning</h3>

<p>
This game has been deployed and started, but there are multiple "start" and "end" dates
among challenges and player sessions. You may need to use the session align tool to ensure
these line up (coming soon™).
among challenges and player sessions. If you see this and haven't manually extended
someone's session, there may be an issue.
</p>
</alert>

Expand Down
Loading