EVOgeek
/
Vmeda.Online
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MOBILE-2915 lesson: Improve buttons displayed if finished offline

main
Dani Palou 2019-03-28 09:21:44 +01:00
parent ce8699a03f
commit 322d6ad2ca
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/addon/mod/lesson/components/index/addon-mod-lesson-index.html
View File

@ -58,7 +58,7 @@
<a ion-button block (click)="review()">{{ 'addon.mod_lesson.review' | translate }}</a> <a ion-button block (click)="review()">{{ 'addon.mod_lesson.review' | translate }}</a>
</ion-item> </ion-item>
<ion-item text-wrap *ngIf="leftDuringTimed && !lesson.timelimit"> <ion-item text-wrap *ngIf="leftDuringTimed && !lesson.timelimit && !finishedOffline">
<!-- User left during the session and there is no time limit, ask to continue. --> <!-- User left during the session and there is no time limit, ask to continue. -->
<p [innerHTML]="'addon.mod_lesson.youhaveseen' | translate"></p> <p [innerHTML]="'addon.mod_lesson.youhaveseen' | translate"></p>
<ion-grid> <ion-grid>
@ -73,7 +73,7 @@
</ion-grid> </ion-grid>
</ion-item> </ion-item>
<ion-item text-wrap *ngIf="leftDuringTimed && lesson.timelimit && lesson.retake"> <ion-item text-wrap *ngIf="leftDuringTimed && lesson.timelimit && lesson.retake && !finishedOffline">
<!-- User left during the session with time limit and retakes allowed, ask to continue. --> <!-- User left during the session with time limit and retakes allowed, ask to continue. -->
<p [innerHTML]="'addon.mod_lesson.leftduringtimed' | translate"></p> <p [innerHTML]="'addon.mod_lesson.leftduringtimed' | translate"></p>
<a ion-button block icon-end (click)="start(false)"> <a ion-button block icon-end (click)="start(false)">
@ -87,7 +87,7 @@
<p [innerHTML]="'addon.mod_lesson.leftduringtimednoretake' | translate"></p> <p [innerHTML]="'addon.mod_lesson.leftduringtimednoretake' | translate"></p>
</ion-item> </ion-item>
<ion-item text-wrap *ngIf="!leftDuringTimed"> <ion-item text-wrap *ngIf="!leftDuringTimed && !finishedOffline">
<!-- User hasn't left during the session, show a start button. --> <!-- User hasn't left during the session, show a start button. -->
<a ion-button block *ngIf="!canManage" icon-end (click)="start(false)"> <a ion-button block *ngIf="!canManage" icon-end (click)="start(false)">
{{ 'core.start' | translate }} {{ 'core.start' | translate }}
@ -98,6 +98,14 @@
<ion-icon name="search"></ion-icon> <ion-icon name="search"></ion-icon>
</a> </a>
</ion-item> </ion-item>
<ion-item text-wrap *ngIf="finishedOffline">
<!-- There's an attempt finished in offline. Let the user continue, showing the end of lesson. -->
<a ion-button block icon-end (click)="start(true)">
{{ 'addon.mod_lesson.continue' | translate }}
<ion-icon name="arrow-forward" md="ios-arrow-forward"></ion-icon>
</a>
</ion-item>
</ion-list> </ion-list>
</core-loading> </core-loading>
</ng-template> </ng-template>

6
src/addon/mod/lesson/components/index/index.ts
View File

@ -56,6 +56,7 @@ export class AddonModLessonIndexComponent extends CoreCourseModuleMainActivityCo
reportLoaded: boolean; // Whether the report data has been loaded. reportLoaded: boolean; // Whether the report data has been loaded.
selectedGroupName: string; // The name of the selected group. selectedGroupName: string; // The name of the selected group.
overview: any; // Reports overview data. overview: any; // Reports overview data.
finishedOffline: boolean; // Whether a retake was finished in offline.
protected syncEventName = AddonModLessonSyncProvider.AUTO_SYNCED; protected syncEventName = AddonModLessonSyncProvider.AUTO_SYNCED;
protected accessInfo: any; // Lesson access info. protected accessInfo: any; // Lesson access info.
@ -159,6 +160,11 @@ export class AddonModLessonIndexComponent extends CoreCourseModuleMainActivityCo
} }
})); }));
// Check if the ser has a finished retake in offline.
promises.push(this.lessonOffline.hasFinishedRetake(this.lesson.id).then((finished) => {
this.finishedOffline = finished;
}));
// Update the list of content pages viewed and question attempts. // Update the list of content pages viewed and question attempts.
promises.push(this.lessonProvider.getContentPagesViewedOnline(this.lesson.id, info.attemptscount)); promises.push(this.lessonProvider.getContentPagesViewedOnline(this.lesson.id, info.attemptscount));
promises.push(this.lessonProvider.getQuestionsAttemptsOnline(this.lesson.id, info.attemptscount)); promises.push(this.lessonProvider.getQuestionsAttemptsOnline(this.lesson.id, info.attemptscount));