Skip to content

[CORE-6130] Bugfix/empty activities - prerelease #1981

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

Open
trtshen wants to merge 3 commits into
base: prerelease
Choose a base branch
from
Open

[CORE-6130] Bugfix/empty activities - prerelease #1981

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0ba77c3
[AV2-1380] empty tasks handling
trtshen May 10, 2023
7658770
[AV2-1380] "no tasks" indicator
trtshen May 11, 2023
40e4011
Merge branch 'prerelease' into bugfix/AV2-1380/empty-activities-prere…
trtshen Nov 8, 2023
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
18 changes: 10 additions & 8 deletions projects/v3/src/app/components/activity/activity.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<h1 id="activity-name" *ngIf="activity.name" class="headline-2 activity-name">
{{ activity.name }}
</h1>
<ion-skeleton-text *ngIf="!activity.name" animated style="width: 50%;" aria-hidden="true"></ion-skeleton-text>
<ion-skeleton-text *ngIf="!activity.tasks" animated style="width: 50%;" aria-hidden="true"></ion-skeleton-text>

<div class="task-count">
<ion-text *ngIf="activity.tasks" class="subtitle-3" color="grey-75" i18n>
Expand All @@ -20,6 +20,9 @@ <h1 id="activity-name" *ngIf="activity.name" class="headline-2 activity-name">

<ng-container *ngIf="isForTeamOnly === false; else notInATeamAndForTeamOnly">
<ion-item class="headline-4 task-header" lines="none" i18n>{activity.tasks.length, plural, =1 {Task} other {Tasks}}</ion-item>

<ng-container *ngTemplateOutlet="noTasks"></ng-container>

<app-list-item class="focusable"
role="button"
tabindex="0"
Expand All @@ -44,15 +47,10 @@ <h1 id="activity-name" *ngIf="activity.name" class="headline-2 activity-name">
<ng-template #notInATeamAndForTeamOnly>
<ion-item class="headline-4 task-header" lines="none" i18n>{activity.tasks.length, plural, =1 {Task} other
{Tasks}}</ion-item>
<app-list-item class="focusable"
role="button"
tabindex="0"
lines="full"
subtitle1Color="grey-50"
<app-list-item class="focusable" role="button" tabindex="0" lines="full" subtitle1Color="grey-50"
title="For team members only"></app-list-item>
</ng-template>


<ng-template #noActivity>
<div *ngIf="!activity" class="ion-padding"
aria-live="polite" aria-label="loading">
Expand All @@ -63,4 +61,8 @@ <h1 id="activity-name" *ngIf="activity.name" class="headline-2 activity-name">
</div>
</ng-template>


<ng-template #noTasks>
<div *ngIf="activity?.tasks?.length === 0" class="ion-padding" aria-live="polite" aria-label="no tasks available">
<app-list-item lines="none" subtitle1Color="grey-50" title="No tasks available." i18n-title></app-list-item>
</div>
</ng-template>
11 changes: 7 additions & 4 deletions projects/v3/src/app/services/activity.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,9 @@ export class ActivityService {
}
return this.getActivityBase(id).pipe(
map(res => this._normaliseActivity(res.data, goToNextTask, afterTask))
).subscribe(_res => {
).subscribe(res => {
if (callback instanceof Function) {
return callback(_res);
return callback(res);
}
return;
});
Expand Down Expand Up @@ -247,7 +247,7 @@ export class ActivityService {
}

// if there is no next task
if (!nextTask) {
if (this.utils.isEmpty(nextTask)) {
if (afterTask) {
this.assessment.getAssessment(
afterTask.id,
Expand All @@ -259,7 +259,10 @@ export class ActivityService {
}
nextTask = tasks[0]; // go to the first task
}
this.goToTask(nextTask);

if (!this.utils.isEmpty(nextTask)) {
return this.goToTask(nextTask);
}
}

// obtain latest activity to decide next task
Expand Down