GuzhavinAleksey/Vmeda.Online
1
0
Fork 0
forked from CIT/Vmeda.Online
Code Pull Requests Activity

MOBILE-2915 lesson: Fix review after sync if no retakes

Browse Source
This commit is contained in:
Dani Palou 2019-03-28 11:00:49 +01:00
parent 322d6ad2ca
commit f969f99e01
1 changed files with 49 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,61 +51,64 @@
</ion-card> </ion-card>
<core-loading [hideUntil]="!showSpinner"> <core-loading [hideUntil]="!showSpinner">
<ion-list *ngIf="lesson && (!preventMessages || !preventMessages.length)">
<ion-list *ngIf="(lesson && (!preventMessages || !preventMessages.length)) || retakeToReview">
<ion-item text-wrap *ngIf="retakeToReview"> <ion-item text-wrap *ngIf="retakeToReview">
<!-- A retake was finished in a synchronization, allow reviewing it. --> <!-- A retake was finished in a synchronization, allow reviewing it. -->
<p>{{ 'addon.mod_lesson.retakefinishedinsync' | translate }}</p> <p padding-bottom>{{ 'addon.mod_lesson.retakefinishedinsync' | translate }}</p>
<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 && !finishedOffline"> <ng-container *ngIf="lesson && (!preventMessages || !preventMessages.length)">
<!-- User left during the session and there is no time limit, ask to continue. --> <ion-item text-wrap *ngIf="leftDuringTimed && !lesson.timelimit && !finishedOffline">
<p [innerHTML]="'addon.mod_lesson.youhaveseen' | translate"></p> <!-- User left during the session and there is no time limit, ask to continue. -->
<ion-grid> <p [innerHTML]="'addon.mod_lesson.youhaveseen' | translate"></p>
<ion-row> <ion-grid>
<ion-col> <ion-row>
<a ion-button block color="light" (click)="start(false)">{{ 'core.no' | translate }}</a> <ion-col>
</ion-col> <a ion-button block color="light" (click)="start(false)">{{ 'core.no' | translate }}</a>
<ion-col> </ion-col>
<a ion-button block (click)="start(true)">{{ 'core.yes' | translate }}</a> <ion-col>
</ion-col> <a ion-button block (click)="start(true)">{{ 'core.yes' | translate }}</a>
</ion-row> </ion-col>
</ion-grid> </ion-row>
</ion-item> </ion-grid>
</ion-item>
<ion-item text-wrap *ngIf="leftDuringTimed && lesson.timelimit && lesson.retake && !finishedOffline"> <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)">
{{ 'addon.mod_lesson.continue' | translate }} {{ 'addon.mod_lesson.continue' | translate }}
<ion-icon name="arrow-forward" md="ios-arrow-forward"></ion-icon> <ion-icon name="arrow-forward" md="ios-arrow-forward"></ion-icon>
</a> </a>
</ion-item> </ion-item>
<ion-item text-wrap *ngIf="leftDuringTimed && lesson.timelimit && !lesson.retake"> <ion-item text-wrap *ngIf="leftDuringTimed && lesson.timelimit && !lesson.retake">
<!-- User left during the session with time limit and retakes not allowed. This should be handled by preventMessages --> <!-- User left during the session with time limit and retakes not allowed. This should be handled by preventMessages -->
<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 && !finishedOffline"> <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 }}
<ion-icon name="arrow-forward" md="ios-arrow-forward"></ion-icon> <ion-icon name="arrow-forward" md="ios-arrow-forward"></ion-icon>
</a> </a>
<a ion-button block *ngIf="canManage" icon-end (click)="start(false)"> <a ion-button block *ngIf="canManage" icon-end (click)="start(false)">
{{ 'addon.mod_lesson.preview' | translate }} {{ 'addon.mod_lesson.preview' | translate }}
<ion-icon name="search"></ion-icon> <ion-icon name="search"></ion-icon>
</a> </a>
</ion-item> </ion-item>
<ion-item text-wrap *ngIf="finishedOffline"> <ion-item text-wrap *ngIf="finishedOffline">
<!-- There's an attempt finished in offline. Let the user continue, showing the end of lesson. --> <!-- 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)"> <a ion-button block icon-end (click)="start(true)">
{{ 'addon.mod_lesson.continue' | translate }} {{ 'addon.mod_lesson.continue' | translate }}
<ion-icon name="arrow-forward" md="ios-arrow-forward"></ion-icon> <ion-icon name="arrow-forward" md="ios-arrow-forward"></ion-icon>
</a> </a>
</ion-item> </ion-item>
</ng-container>
</ion-list> </ion-list>
</core-loading> </core-loading>
</ng-template> </ng-template>