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

MOBILE-3149 module: Add collapsible footer buttons inside activities

main
Pau Ferrer Ocaña 2022-02-25 12:31:30 +01:00
parent 859230ddf3
commit 3a11cdbfe2
17 changed files with 153 additions and 220 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/langindex.json
View File

@ -576,7 +576,6 @@
"addon.mod_feedback.minimal": "feedback", "addon.mod_feedback.minimal": "feedback",
"addon.mod_feedback.mode": "feedback", "addon.mod_feedback.mode": "feedback",
"addon.mod_feedback.modulenameplural": "feedback", "addon.mod_feedback.modulenameplural": "feedback",
"addon.mod_feedback.next_page": "feedback",
"addon.mod_feedback.non_anonymous": "feedback", "addon.mod_feedback.non_anonymous": "feedback",
"addon.mod_feedback.non_anonymous_entries": "feedback", "addon.mod_feedback.non_anonymous_entries": "feedback",
"addon.mod_feedback.non_respondents_students": "feedback", "addon.mod_feedback.non_respondents_students": "feedback",
@ -586,7 +585,6 @@
"addon.mod_feedback.overview": "feedback", "addon.mod_feedback.overview": "feedback",
"addon.mod_feedback.page_after_submit": "feedback", "addon.mod_feedback.page_after_submit": "feedback",
"addon.mod_feedback.preview": "moodle", "addon.mod_feedback.preview": "moodle",
"addon.mod_feedback.previous_page": "feedback",
"addon.mod_feedback.questions": "feedback", "addon.mod_feedback.questions": "feedback",
"addon.mod_feedback.questionscountdescription": "local_moodlemobileapp", "addon.mod_feedback.questionscountdescription": "local_moodlemobileapp",
"addon.mod_feedback.response_nr": "feedback", "addon.mod_feedback.response_nr": "feedback",

24
src/addons/mod/data/pages/entry/entry.html
View File

@ -60,21 +60,23 @@
(onLoading)="setLoadingComments($event)" [showItem]="true"> (onLoading)="setLoadingComments($event)" [showItem]="true">
</core-comments> </core-comments>
<ion-grid *ngIf="hasPrevious || hasNext"> <div collapsible-footer *ngIf="entryLoaded && hasPrevious || hasNext" slot="fixed">
<ion-row class="ion-align-items-center"> <ion-row class="ion-justify-content-between ion-align-items-center ion-no-padding ion-wrap">
<ion-col *ngIf="hasPrevious"> <ion-col class="ion-text-start ion-no-padding core-navigation-arrow" size="auto">
<ion-button expand="block" fill="outline" (click)="gotoEntry(offset! -1)"> <ion-button [disabled]="!hasPrevious" fill="clear" color="dark" [attr.aria-label]="'core.previous' | translate"
<ion-icon name="fas-chevron-left" slot="start" aria-hidden="true"></ion-icon> (click)="gotoEntry(offset! -1)">
{{ 'core.previous' | translate }} <ion-icon name="fas-chevron-left" slot="icon-only" aria-hidden="true"></ion-icon>
</ion-button> </ion-button>
</ion-col> </ion-col>
<ion-col *ngIf="hasNext"> <ion-col class="ion-text-center">
<ion-button expand="block" (click)="gotoEntry(offset! + 1)"> </ion-col>
{{ 'core.next' | translate }} <ion-col class="ion-text-end ion-no-padding core-navigation-arrow" size="auto">
<ion-icon name="fas-chevron-right" slot="end" aria-hidden="true"></ion-icon> <ion-button [disabled]="!hasNext" fill="clear" color="dark" [attr.aria-label]=" 'core.next' | translate"
(click)="gotoEntry(offset! + 1)">
<ion-icon name="fas-chevron-right" slot="icon-only" aria-hidden="true"></ion-icon>
</ion-button> </ion-button>
</ion-col> </ion-col>
</ion-row> </ion-row>
</ion-grid> </div>
</core-loading> </core-loading>
</ion-content> </ion-content>

2
src/addons/mod/feedback/lang.json
View File

@ -18,7 +18,6 @@
"minimal": "Minimum", "minimal": "Minimum",
"mode": "Mode", "mode": "Mode",
"modulenameplural": "Feedback", "modulenameplural": "Feedback",
"next_page": "Next page",
"non_anonymous": "User's name will be logged and shown with answers", "non_anonymous": "User's name will be logged and shown with answers",
"non_anonymous_entries": "Non anonymous entries ({{$a}})", "non_anonymous_entries": "Non anonymous entries ({{$a}})",
"non_respondents_students": "Non-respondent students ({{$a}})", "non_respondents_students": "Non-respondent students ({{$a}})",
@ -28,7 +27,6 @@
"overview": "Overview", "overview": "Overview",
"page_after_submit": "Completion message", "page_after_submit": "Completion message",
"preview": "Preview", "preview": "Preview",
"previous_page": "Previous page",
"questions": "Questions", "questions": "Questions",
"questionscountdescription": "There are {{count}} questions.", "questionscountdescription": "There are {{count}} questions.",
"response_nr": "Response number", "response_nr": "Response number",

82
src/addons/mod/feedback/pages/form/form.html
View File

@ -109,32 +109,31 @@
</ng-container> </ng-container>
</ng-container> </ng-container>
</ng-container> </ng-container>
<ion-grid *ngIf="!preview">
<ion-row class="ion-align-items-center"> <ion-row class="ion-align-items-center" *ngIf="!preview">
<ion-col *ngIf="hasPrevPage"> <ion-col *ngIf="hasPrevPage">
<ion-button expand="block" fill="outline" (click)="gotoPage(true)" class="ion-text-wrap"> <ion-button expand="block" fill="outline" (click)="gotoPage(true)" class="ion-text-wrap">
<ion-icon name="fas-chevron-left" slot="start" aria-hidden="true"></ion-icon> <ion-icon name="fas-chevron-left" slot="start" aria-hidden="true"></ion-icon>
{{ 'addon.mod_feedback.previous_page' | translate }} {{ 'core.previous' | translate }}
</ion-button> </ion-button>
</ion-col> </ion-col>
<ion-col *ngIf="hasNextPage"> <ion-col *ngIf="hasNextPage">
<ion-button expand="block" (click)="gotoPage(false)" class="ion-text-wrap"> <ion-button expand="block" (click)="gotoPage(false)" class="ion-text-wrap">
{{ 'addon.mod_feedback.next_page' | translate }} {{ 'core.next' | translate }}
<ion-icon name="fas-chevron-right" slot="end" aria-hidden="true"></ion-icon> <ion-icon name="fas-chevron-right" slot="end" aria-hidden="true"></ion-icon>
</ion-button> </ion-button>
</ion-col> </ion-col>
<ion-col *ngIf="!hasNextPage"> <ion-col *ngIf="!hasNextPage">
<ion-button expand="block" (click)="gotoPage(false)" class="ion-text-wrap"> <ion-button expand="block" (click)="gotoPage(false)" class="ion-text-wrap">
{{ 'addon.mod_feedback.save_entries' | translate }} {{ 'core.submit' | translate }}
</ion-button> </ion-button>
</ion-col> </ion-col>
</ion-row> </ion-row>
</ion-grid>
</ion-list> </ion-list>
</ng-container> </ng-container>
<ion-card class="core-success-card" *ngIf="completed"> <ion-card class="core-success-card" *ngIf="completed">
<ion-item> <ion-item class="ion-text-wrap">
<ion-icon name="fas-check" slot="start" aria-hidden="true"></ion-icon> <ion-icon name="fas-check" slot="start" aria-hidden="true"></ion-icon>
<ion-label> <ion-label>
<p *ngIf="!completionPageContents && !completedOffline"> <p *ngIf="!completionPageContents && !completedOffline">
@ -143,32 +142,25 @@
<p *ngIf="!completionPageContents && completedOffline"> <p *ngIf="!completionPageContents && completedOffline">
{{ 'addon.mod_feedback.feedback_submitted_offline' | translate }} {{ 'addon.mod_feedback.feedback_submitted_offline' | translate }}
</p> </p>
<p *ngIf="completionPageContents"> <core-format-text *ngIf="completionPageContents" [component]="component" componentId="componentId"
<core-format-text [component]="component" componentId="componentId" [text]="completionPageContents" [text]="completionPageContents" contextLevel="module" [contextInstanceId]="cmId" [courseId]="courseId">
contextLevel="module" [contextInstanceId]="cmId" [courseId]="courseId"> </core-format-text>
</core-format-text>
</p>
</ion-label> </ion-label>
</ion-item> </ion-item>
</ion-card> </ion-card>
<ion-card *ngIf="completed && (access!.canviewanalysis || hasNextPage)"> <div collapsible-footer *ngIf="feedbackLoaded && completed" slot="fixed">
<ion-grid> <div class="list-item-limited-width">
<ion-row class="ion-align-items-center"> <ion-button expand="block" fill="outline" (click)="showAnalysis()" class="ion-text-wrap ion-margin"
<ion-col *ngIf="access!.canviewanalysis"> *ngIf="access!.canviewanalysis">
<ion-button expand="block" fill="outline" (click)="showAnalysis()" class="ion-text-wrap"> <ion-icon name="fas-chart-bar" slot="start" aria-hidden="true"></ion-icon>
<ion-icon name="fas-chart-bar" slot="start" aria-hidden="true"></ion-icon> {{ 'addon.mod_feedback.completed_feedbacks' | translate }}
{{ 'addon.mod_feedback.completed_feedbacks' | translate }} </ion-button>
</ion-button> <ion-button expand="block" (click)="continue()" class="ion-text-wrap ion-margin">
</ion-col> <ng-container *ngIf="!siteAfterSubmit">{{ 'core.continue' | translate }}</ng-container>
<ion-col *ngIf="hasNextPage"> <ng-container *ngIf="siteAfterSubmit">{{ 'core.course.gotonextactivity' | translate }}</ng-container>
<ion-button expand="block" (click)="continue()" class="ion-text-wrap"> </ion-button>
{{ 'core.continue' | translate }} </div>
<ion-icon name="fas-chevron-right" slot="end" aria-hidden="true"></ion-icon> </div>
</ion-button>
</ion-col>
</ion-row>
</ion-grid>
</ion-card>
</core-loading> </core-loading>
</ion-content> </ion-content>

6
src/addons/mod/feedback/pages/form/form.ts
View File

@ -16,7 +16,7 @@ import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
import { CoreSite } from '@classes/site'; import { CoreSite } from '@classes/site';
import { CoreContentLinksHelper } from '@features/contentlinks/services/contentlinks-helper'; import { CoreContentLinksHelper } from '@features/contentlinks/services/contentlinks-helper';
import { CoreCourse, CoreCourseCommonModWSOptions } from '@features/course/services/course'; import { CoreCourse, CoreCourseCommonModWSOptions } from '@features/course/services/course';
import { CoreCourseHelper, CoreCourseModuleData } from '@features/course/services/course-helper'; import { CoreCourseModuleData } from '@features/course/services/course-helper';
import { CanLeave } from '@guards/can-leave'; import { CanLeave } from '@guards/can-leave';
import { IonContent } from '@ionic/angular'; import { IonContent } from '@ionic/angular';
import { CoreApp } from '@services/app'; import { CoreApp } from '@services/app';
@ -53,7 +53,6 @@ export class AddonModFeedbackFormPage implements OnInit, OnDestroy, CanLeave {
protected module?: CoreCourseModuleData; protected module?: CoreCourseModuleData;
protected currentPage?: number; protected currentPage?: number;
protected siteAfterSubmit?: string;
protected onlineObserver: Subscription; protected onlineObserver: Subscription;
protected originalData?: Record<string, AddonModFeedbackResponseValue>; protected originalData?: Record<string, AddonModFeedbackResponseValue>;
protected currentSite: CoreSite; protected currentSite: CoreSite;
@ -75,6 +74,7 @@ export class AddonModFeedbackFormPage implements OnInit, OnDestroy, CanLeave {
hasNextPage = false; hasNextPage = false;
completed = false; completed = false;
completedOffline = false; completedOffline = false;
siteAfterSubmit?: string;
constructor() { constructor() {
this.currentSite = CoreSites.getRequiredCurrentSite(); this.currentSite = CoreSites.getRequiredCurrentSite();
@ -409,7 +409,7 @@ export class AddonModFeedbackFormPage implements OnInit, OnDestroy, CanLeave {
*/ */
async continue(): Promise<void> { async continue(): Promise<void> {
if (!this.siteAfterSubmit) { if (!this.siteAfterSubmit) {
return CoreCourseHelper.getAndOpenCourse(this.courseId, {}, this.currentSite.getId()); return CoreNavigator.back();
} }
const modal = await CoreDomUtils.showModalLoading(); const modal = await CoreDomUtils.showModalLoading();

29
src/addons/mod/lesson/pages/player/player.html
View File

@ -21,7 +21,7 @@
<core-loading [hideUntil]="loaded"> <core-loading [hideUntil]="loaded">
<!-- Info messages. Only show the first one. --> <!-- Info messages. Only show the first one. -->
<ion-card class="core-info-card" *ngIf="lesson && messages?.length"> <ion-card class="core-info-card" *ngIf="lesson && messages?.length">
<ion-item> <ion-item class="ion-text-wrap">
<ion-icon name="fas-info-circle" slot="start" aria-hidden="true"></ion-icon> <ion-icon name="fas-info-circle" slot="start" aria-hidden="true"></ion-icon>
<ion-label>{{ messages[0].message }}</ion-label> <ion-label>{{ messages[0].message }}</ion-label>
</ion-item> </ion-item>
@ -86,13 +86,12 @@
<!-- Essay. --> <!-- Essay. -->
<ng-container *ngSwitchCase="'essay'"> <ng-container *ngSwitchCase="'essay'">
<ion-item *ngIf="question.textarea"> <ion-item *ngIf="question.textarea">
<ion-label> <ion-label class="sr-only">{{ 'core.content' | translate }}</ion-label>
<core-rich-text-editor placeholder="{{ 'addon.mod_lesson.youranswer' | translate }}" <core-rich-text-editor placeholder="{{ 'addon.mod_lesson.youranswer' | translate }}"
[control]="question.control" [component]="component" [componentId]="lesson?.coursemodule" [control]="question.control" [component]="component" [componentId]="lesson?.coursemodule"
[autoSave]="true" contextLevel="module" [contextInstanceId]="lesson?.coursemodule" [autoSave]="true" contextLevel="module" [contextInstanceId]="lesson?.coursemodule"
elementId="answer_editor"> elementId="answer_editor">
</core-rich-text-editor> </core-rich-text-editor>
</ion-label>
</ion-item> </ion-item>
<ion-item class="ion-text-wrap" *ngIf="!question.textarea && question.useranswer"> <ion-item class="ion-text-wrap" *ngIf="!question.textarea && question.useranswer">
<ion-label> <ion-label>
@ -185,12 +184,12 @@
</core-progress-bar> </core-progress-bar>
</ion-label> </ion-label>
</ion-item> </ion-item>
<div class="core-info-card" *ngIf="lesson?.progressbar && canManage"> <ion-card class="core-info-card" *ngIf="lesson?.progressbar && canManage">
<ion-item> <ion-item class="ion-text-wrap">
<ion-icon name="fas-info-circle" slot="start" aria-hidden="true"></ion-icon> <ion-icon name="fas-info-circle" slot="start" aria-hidden="true"></ion-icon>
<ion-label>{{ 'addon.mod_lesson.progressbarteacherwarning2' | translate }}</ion-label> <ion-label>{{ 'addon.mod_lesson.progressbarteacherwarning2' | translate }}</ion-label>
</ion-item> </ion-item>
</div> </ion-card>
</ion-list> </ion-list>
<!-- End of lesson reached. --> <!-- End of lesson reached. -->
@ -254,8 +253,8 @@
<ion-label>{{ eolData.modattemptsnoteacher.message }}</ion-label> <ion-label>{{ eolData.modattemptsnoteacher.message }}</ion-label>
</ion-item> </ion-item>
<!-- If activity link was successfully formatted, render the button. --> <!-- If activity link was successfully formatted, render the button. -->
<ion-button *ngIf="activityLink && activityLink.formatted" expand="block" color="light" [href]="activityLink.href" core-link <ion-button *ngIf="activityLink && activityLink.formatted" expand="block" fill="outline" [href]="activityLink.href"
[capture]="true" class="ion-text-wrap ion-margin button-no-uppercase"> core-link [capture]="true" class="ion-text-wrap ion-margin button-no-uppercase">
<core-format-text [text]="activityLink.label" contextLevel="module" [contextInstanceId]="lesson?.coursemodule" <core-format-text [text]="activityLink.label" contextLevel="module" [contextInstanceId]="lesson?.coursemodule"
[courseId]="courseId"> [courseId]="courseId">
</core-format-text> </core-format-text>
@ -290,10 +289,10 @@
</ion-label> </ion-label>
</ion-item> </ion-item>
<ion-button expand="block" class="ion-text-wrap ion-margin" color="light" *ngIf="review" (click)="changePage(LESSON_EOL)"> <ion-button expand="block" class="ion-text-wrap ion-margin" *ngIf="review" (click)="changePage(LESSON_EOL)">
{{ 'addon.mod_lesson.finish' | translate }} {{ 'addon.mod_lesson.finish' | translate }}
</ion-button> </ion-button>
<ion-button expand="block" class="ion-text-wrap ion-margin" color="light" *ngFor="let button of processDataButtons" <ion-button expand="block" class="ion-text-wrap ion-margin" fill="outline" *ngFor="let button of processDataButtons"
(click)="changePage(button.pageId, true)"> (click)="changePage(button.pageId, true)">
{{ button.label | translate }} {{ button.label | translate }}
</ion-button> </ion-button>

2
src/addons/mod/lesson/services/lesson-helper.ts
View File

@ -557,7 +557,7 @@ export class AddonModLessonHelperProvider {
// Add some HTML to the answer if needed. // Add some HTML to the answer if needed.
if (textarea) { if (textarea) {
data[textarea.name] = CoreTextUtils.formatHtmlLines(<string> data[textarea.name]); data[textarea.name] = CoreTextUtils.formatHtmlLines(<string> data[textarea.name] || '');
} }
} else if (question.template == 'multichoice' && (<AddonModLessonMultichoiceQuestion> question).multi) { } else if (question.template == 'multichoice' && (<AddonModLessonMultichoiceQuestion> question).multi) {
// Only send the options with value set to true. // Only send the options with value set to true.

32
src/addons/mod/quiz/components/navigation-modal/navigation-modal.html
View File

@ -13,19 +13,6 @@
<ion-content class="addon-mod_quiz-navigation-modal"> <ion-content class="addon-mod_quiz-navigation-modal">
<nav> <nav>
<ion-list> <ion-list>
<!-- In player, show button to finish attempt. -->
<ion-item button class="ion-text-wrap" *ngIf="!isReview" (click)="loadPage(-1)" detail="true">
<ion-label>{{ 'addon.mod_quiz.finishattemptdots' | translate }}</ion-label>
</ion-item>
<!-- In review we can toggle between all questions in same page or one page at a time. -->
<ion-item button class="ion-text-wrap" *ngIf="isReview && numPages > 1" (click)="switchMode()" detail="true">
<ion-label>
<span *ngIf="!showAll">{{ 'addon.mod_quiz.showall' | translate }}</span>
<span *ngIf="showAll">{{ 'addon.mod_quiz.showeachpage' | translate }}</span>
</ion-label>
</ion-item>
<ion-item button class="ion-text-wrap {{question.stateClass}}" *ngFor="let question of navigation" <ion-item button class="ion-text-wrap {{question.stateClass}}" *ngFor="let question of navigation"
[attr.aria-current]="!summaryShown && currentPage == question.page ? 'page' : 'false'" [attr.aria-current]="!summaryShown && currentPage == question.page ? 'page' : 'false'"
(click)="loadPage(question.page, question.slot)" detail="false"> (click)="loadPage(question.page, question.slot)" detail="false">
@ -50,19 +37,12 @@
slot="end"> slot="end">
</ion-icon> </ion-icon>
</ion-item> </ion-item>
<!-- In player, show button to finish attempt. -->
<ion-item button class="ion-text-wrap" *ngIf="!isReview" (click)="loadPage(-1)" detail="true">
<ion-label>{{ 'addon.mod_quiz.finishattemptdots' | translate }}</ion-label>
</ion-item>
<!-- In review we can toggle between all questions in same page or one page at a time. -->
<ion-item button class="ion-text-wrap" *ngIf="isReview && numPages > 1" (click)="switchMode()" detail="true">
<ion-label>
<span *ngIf="!showAll">{{ 'addon.mod_quiz.showall' | translate }}</span>
<span *ngIf="showAll">{{ 'addon.mod_quiz.showeachpage' | translate }}</span>
</ion-label>
</ion-item>
</ion-list> </ion-list>
</nav> </nav>
</ion-content> </ion-content>
<ion-footer *ngIf="!isReview">
<!-- In player, show button to finish attempt. -->
<ion-button class="ion-text-wrap ion-margin" expand="block" (click)="loadPage(-1)">
{{ 'addon.mod_quiz.finishattemptdots' | translate }}
</ion-button>
</ion-footer>

16
src/addons/mod/quiz/components/navigation-modal/navigation-modal.ts
View File

@ -26,15 +26,10 @@ import { ModalController } from '@singletons';
}) })
export class AddonModQuizNavigationModalComponent { export class AddonModQuizNavigationModalComponent {
static readonly CHANGE_PAGE = 1;
static readonly SWITCH_MODE = 2;
@Input() navigation?: AddonModQuizNavigationQuestion[]; // Whether the user is reviewing the attempt. @Input() navigation?: AddonModQuizNavigationQuestion[]; // Whether the user is reviewing the attempt.
@Input() summaryShown?: boolean; // Whether summary is currently being shown. @Input() summaryShown?: boolean; // Whether summary is currently being shown.
@Input() currentPage?: number; // Current page. @Input() currentPage?: number; // Current page.
@Input() isReview?: boolean; // Whether the user is reviewing the attempt. @Input() isReview?: boolean; // Whether the user is reviewing the attempt.
@Input() numPages = 0; // Num of pages for review mode.
@Input() showAll?: boolean; // Whether to show all questions in same page or not for review mode.
/** /**
* Close modal. * Close modal.
@ -51,21 +46,11 @@ export class AddonModQuizNavigationModalComponent {
*/ */
loadPage(page: number, slot?: number): void { loadPage(page: number, slot?: number): void {
ModalController.dismiss(<AddonModQuizNavigationModalReturn>{ ModalController.dismiss(<AddonModQuizNavigationModalReturn>{
action: AddonModQuizNavigationModalComponent.CHANGE_PAGE,
page, page,
slot, slot,
}); });
} }
/**
* Switch mode in review.
*/
switchMode(): void {
ModalController.dismiss(<AddonModQuizNavigationModalReturn>{
action: AddonModQuizNavigationModalComponent.SWITCH_MODE,
});
}
} }
/** /**
@ -76,7 +61,6 @@ export type AddonModQuizNavigationQuestion = CoreQuestionQuestionParsed & {
}; };
export type AddonModQuizNavigationModalReturn = { export type AddonModQuizNavigationModalReturn = {
action: number;
page?: number; page?: number;
slot?: number; slot?: number;
}; };

14
src/addons/mod/quiz/pages/attempt/attempt.html
View File

@ -53,15 +53,21 @@
</p> </p>
</ion-label> </ion-label>
</ion-item> </ion-item>
<ion-button *ngIf="showReviewColumn && attempt.finished" class="ion-margin" expand="block" (click)="reviewAttempt()">
<ion-icon name="fas-search" slot="start" aria-hidden="true"></ion-icon>
{{ 'addon.mod_quiz.review' | translate }}
</ion-button>
<ion-item class="ion-text-wrap core-danger-item" *ngIf="!showReviewColumn"> <ion-item class="ion-text-wrap core-danger-item" *ngIf="!showReviewColumn">
<ion-label> <ion-label>
<p>{{ 'addon.mod_quiz.noreviewattempt' | translate }}</p> <p>{{ 'addon.mod_quiz.noreviewattempt' | translate }}</p>
</ion-label> </ion-label>
</ion-item> </ion-item>
</ion-list> </ion-list>
<div collapsible-footer *ngIf="loaded && attempt && showReviewColumn && attempt.finished" slot="fixed">
<div class="list-item-limited-width">
<ion-button class="ion-margin ion-text-wrap" expand="block" (click)="reviewAttempt()">
<ion-icon name="fas-search" slot="start" aria-hidden="true"></ion-icon>
{{ 'addon.mod_quiz.review' | translate }}
</ion-button>
</div>
</div>
</core-loading> </core-loading>
</ion-content> </ion-content>

90
src/addons/mod/quiz/pages/player/player.html
View File

@ -28,32 +28,10 @@
<core-timer [endTime]="endTime" (finished)="timeUp()" [timerText]="'addon.mod_quiz.timeleft' | translate" [align]="'center'"> <core-timer [endTime]="endTime" (finished)="timeUp()" [timerText]="'addon.mod_quiz.timeleft' | translate" [align]="'center'">
</core-timer> </core-timer>
</ion-title> </ion-title>
<ion-buttons slot="end">
<ion-button fill="clear" *ngIf="previousPage >= 0" (click)="changePage(previousPage)"
[attr.aria-label]="'core.previous' | translate">
<ion-icon name="fas-chevron-left" slot="icon-only" aria-hidden="true"></ion-icon>
</ion-button>
<ion-button *ngIf="nextPage >= -1" (click)="changePage(nextPage)" [attr.aria-label]="'core.next' | translate">
<ion-icon name="fas-chevron-right" slot="icon-only" aria-hidden="true"></ion-icon>
</ion-button>
</ion-buttons>
</ion-toolbar> </ion-toolbar>
</ion-header> </ion-header>
<ion-content> <ion-content>
<core-loading [hideUntil]="loaded"> <core-loading [hideUntil]="loaded">
<!-- Navigation arrows if there's no timer. -->
<ion-toolbar *ngIf="!endTime && questions.length && !quizAborted && !showSummary" color="light">
<ion-buttons slot="end">
<ion-button fill="clear" *ngIf="previousPage >= 0" (click)="changePage(previousPage)"
[attr.aria-label]="'core.previous' | translate">
<ion-icon name="fas-chevron-left" slot="icon-only" aria-hidden="true"></ion-icon>
</ion-button>
<ion-button *ngIf="nextPage >= -1" (click)="changePage(nextPage)" [attr.aria-label]="'core.next' | translate">
<ion-icon name="fas-chevron-right" slot="icon-only" aria-hidden="true"></ion-icon>
</ion-button>
</ion-buttons>
</ion-toolbar>
<!-- Button to start attempting. --> <!-- Button to start attempting. -->
<ion-button *ngIf="!attempt" expand="block" class="ion-margin" (click)="start()"> <ion-button *ngIf="!attempt" expand="block" class="ion-margin" (click)="start()">
{{ 'addon.mod_quiz.startattempt' | translate }} {{ 'addon.mod_quiz.startattempt' | translate }}
@ -89,22 +67,23 @@
</form> </form>
<!-- Go to next or previous page. --> <!-- Go to next or previous page. -->
<ion-grid class="ion-text-wrap" *ngIf="questions.length && !quizAborted && !showSummary"> <ion-row *ngIf="questions.length && !quizAborted && !showSummary">
<ion-row> <ion-col *ngIf="previousPage >= 0">
<ion-col *ngIf="previousPage >= 0"> <ion-button expand="block" fill="outline" (click)="changePage(previousPage)" class="ion-text-wrap">
<ion-button expand="block" color="light" (click)="changePage(previousPage)"> <ion-icon name="fas-chevron-left" slot="start" aria-hidden="true"></ion-icon>
<ion-icon name="fas-chevron-left" slot="start" aria-hidden="true"></ion-icon> {{ 'core.previous' | translate }}
{{ 'core.previous' | translate }} </ion-button>
</ion-button> </ion-col>
</ion-col> <ion-col *ngIf="nextPage >= -1">
<ion-col *ngIf="nextPage >= -1"> <ion-button expand="block" (click)="changePage(nextPage)" class="ion-text-wrap" *ngIf="nextPage > 0">
<ion-button expand="block" (click)="changePage(nextPage)"> {{ 'core.next' | translate }}
{{ 'core.next' | translate }} <ion-icon name="fas-chevron-right" slot="end" aria-hidden="true"></ion-icon>
<ion-icon name="fas-chevron-right" slot="end" aria-hidden="true"></ion-icon> </ion-button>
</ion-button> <ion-button expand="block" (click)="changePage(nextPage)" class="ion-text-wrap" *ngIf="nextPage == -1">
</ion-col> {{ 'core.submit' | translate }}
</ion-row> </ion-button>
</ion-grid> </ion-col>
</ion-row>
<!-- Summary --> <!-- Summary -->
<ion-card *ngIf="!quizAborted && showSummary && summaryQuestions.length" class="addon-mod_quiz-table"> <ion-card *ngIf="!quizAborted && showSummary && summaryQuestions.length" class="addon-mod_quiz-table">
@ -141,11 +120,6 @@
</ion-item> </ion-item>
</ng-container> </ng-container>
<!-- Button to return to last page seen. -->
<ion-button *ngIf="canReturn" expand="block" class="ion-margin" (click)="changePage(attempt!.currentpage!)">
{{ 'addon.mod_quiz.returnattempt' | translate }}
</ion-button>
<!-- Due date warning. --> <!-- Due date warning. -->
<ion-item class="ion-text-wrap" *ngIf="dueDateWarning"> <ion-item class="ion-text-wrap" *ngIf="dueDateWarning">
<ion-label>{{ dueDateWarning }}</ion-label> <ion-label>{{ dueDateWarning }}</ion-label>
@ -162,17 +136,6 @@
<p *ngFor="let message of preventSubmitMessages">{{message}}</p> <p *ngFor="let message of preventSubmitMessages">{{message}}</p>
</ion-label> </ion-label>
</ion-item> </ion-item>
<ion-button *ngIf="preventSubmitMessages.length" expand="block" [href]="moduleUrl" core-link [showBrowserWarning]="false">
{{ 'core.openinbrowser' | translate }}
<ion-icon name="fas-external-link-alt" slot="end" aria-hidden="true"></ion-icon>
</ion-button>
<!-- Button to submit the quiz. -->
<ion-button *ngIf="!attempt!.finishedOffline && !preventSubmitMessages.length" expand="block" class="ion-margin"
(click)="finishAttempt(true)">
{{ 'addon.mod_quiz.submitallandfinish' | translate }}
</ion-button>
</ion-card> </ion-card>
<!-- Quiz aborted --> <!-- Quiz aborted -->
@ -180,10 +143,25 @@
<ion-item class="ion-text-wrap"> <ion-item class="ion-text-wrap">
<ion-label>{{ 'addon.mod_quiz.errorparsequestions' | translate }}</ion-label> <ion-label>{{ 'addon.mod_quiz.errorparsequestions' | translate }}</ion-label>
</ion-item> </ion-item>
<ion-button expand="block" class="ion-margin" [href]="moduleUrl" core-link [showBrowserWarning]="false"> <ion-button *ngIf="canReturn" expand="block" class="ion-margin ion-text-wrap" fill="outline"
(click)="changePage(attempt!.currentpage!)">
{{ 'addon.mod_quiz.returnattempt' | translate }}
</ion-button>
</ion-card>
<div collapsible-footer *ngIf="!quizAborted && showSummary && summaryQuestions.length && loaded" slot="fixed"
class="list-item-limited-width">
<ion-button *ngIf="preventSubmitMessages.length" expand="block" class="ion-margin ion-text-wrap" [href]="moduleUrl" core-link
[showBrowserWarning]="false">
{{ 'core.openinbrowser' | translate }} {{ 'core.openinbrowser' | translate }}
<ion-icon name="fas-external-link-alt" slot="end" aria-hidden="true"></ion-icon> <ion-icon name="fas-external-link-alt" slot="end" aria-hidden="true"></ion-icon>
</ion-button> </ion-button>
</ion-card>
<!-- Button to submit the quiz. -->
<ion-button *ngIf="!attempt!.finishedOffline && !preventSubmitMessages.length" expand="block" class="ion-margin ion-text-wrap"
(click)="finishAttempt(true)">
{{ 'addon.mod_quiz.submitallandfinish' | translate }}
</ion-button>
</div>
</core-loading> </core-loading>
</ion-content> </ion-content>

6
src/addons/mod/quiz/pages/player/player.page.ts
View File

@ -602,9 +602,11 @@ export class AddonModQuizPlayerPage implements OnInit, OnDestroy, CanLeave {
}, },
}); });
if (modalData && modalData.action == AddonModQuizNavigationModalComponent.CHANGE_PAGE) { if (!modalData) {
this.changePage(modalData.page!, true, modalData.slot); return;
} }
this.changePage(modalData.page!, true, modalData.slot);
} }
/** /**

46
src/addons/mod/quiz/pages/review/review.html
View File

@ -87,8 +87,6 @@
<!-- Questions --> <!-- Questions -->
<div *ngIf="attempt && questions.length"> <div *ngIf="attempt && questions.length">
<!-- Arrows to go to next/previous. -->
<ng-container *ngTemplateOutlet="navArrows"></ng-container>
<!-- Questions. --> <!-- Questions. -->
<div *ngFor="let question of questions"> <div *ngFor="let question of questions">
@ -113,28 +111,30 @@
</core-question> </core-question>
</ion-card> </ion-card>
</div> </div>
</div>
<!-- Arrows to go to next/previous. --> <div collapsible-footer *ngIf="loaded && numPages > 1" slot="fixed">
<ng-container *ngTemplateOutlet="navArrows"></ng-container> <ion-row class="ion-justify-content-between ion-align-items-center ion-no-padding ion-wrap">
<ion-col class="ion-text-start ion-no-padding core-navigation-arrow" size="auto" *ngIf="!showAll">
<ion-button [disabled]="previousPage < 0" fill="clear" color="dark" [attr.aria-label]="'core.previous' | translate"
(click)="changePage(previousPage)">
<ion-icon name="fas-chevron-left" slot="icon-only" aria-hidden="true"></ion-icon>
</ion-button>
</ion-col>
<ion-col class="ion-text-center">
<!-- In review we can toggle between all questions in same page or one page at a time. -->
<ion-button class="ion-text-wrap" *ngIf="numPages > 1" (click)="switchMode()" fill="outline">
<span *ngIf="!showAll">{{ 'addon.mod_quiz.showall' | translate }}</span>
<span *ngIf="showAll">{{ 'addon.mod_quiz.showeachpage' | translate }}</span>
</ion-button>
</ion-col>
<ion-col class="ion-text-end ion-no-padding core-navigation-arrow" size="auto" *ngIf="!showAll">
<ion-button [disabled]="nextPage >= numPages" fill="clear" color="dark" [attr.aria-label]="'core.next' | translate"
(click)="changePage(nextPage)">
<ion-icon name="fas-chevron-right" slot="icon-only" aria-hidden="true"></ion-icon>
</ion-button>
</ion-col>
</ion-row>
</div> </div>
</core-loading> </core-loading>
</ion-content> </ion-content>
<!-- Arrows to go to next/previous. -->
<ng-template #navArrows>
<ion-grid>
<ion-row class="ion-align-items-center">
<ion-col class="ion-text-start">
<ion-button fill="outline" *ngIf="previousPage >= 0" (click)="changePage(previousPage)"
[title]="'core.previous' | translate">
<ion-icon name="fas-chevron-left" slot="icon-only" aria-hidden="true"></ion-icon>
</ion-button>
</ion-col>
<ion-col class="ion-text-end">
<ion-button *ngIf="nextPage >= -1" (click)="changePage(nextPage)" [attr.aria-label]="'core.next' | translate">
<ion-icon name="fas-chevron-right" slot="icon-only" aria-hidden="true"></ion-icon>
</ion-button>
</ion-col>
</ion-row>
</ion-grid>
</ng-template>

15
src/addons/mod/quiz/pages/review/review.page.ts
View File

@ -53,7 +53,7 @@ export class AddonModQuizReviewPage implements OnInit {
attempt?: AddonModQuizAttemptWSData; // The attempt being reviewed. attempt?: AddonModQuizAttemptWSData; // The attempt being reviewed.
component = AddonModQuizProvider.COMPONENT; // Component to link the files to. component = AddonModQuizProvider.COMPONENT; // Component to link the files to.
showAll = false; // Whether to view all questions in the same page. showAll = false; // Whether to view all questions in the same page.
numPages?: number; // Number of pages. numPages = 1; // Number of pages.
showCompleted = false; // Whether to show completed time. showCompleted = false; // Whether to show completed time.
additionalData?: AddonModQuizWSAdditionalData[]; // Additional data to display for the attempt. additionalData?: AddonModQuizWSAdditionalData[]; // Additional data to display for the attempt.
loaded = false; // Whether data has been loaded. loaded = false; // Whether data has been loaded.
@ -112,10 +112,9 @@ export class AddonModQuizReviewPage implements OnInit {
* Change the current page. If slot is supplied, try to scroll to that question. * Change the current page. If slot is supplied, try to scroll to that question.
* *
* @param page Page to load. -1 means all questions in same page. * @param page Page to load. -1 means all questions in same page.
* @param fromModal Whether the page was selected using the navigation modal.
* @param slot Slot of the question to scroll to. * @param slot Slot of the question to scroll to.
*/ */
async changePage(page: number, fromModal?: boolean, slot?: number): Promise<void> { async changePage(page: number, slot?: number): Promise<void> {
if (slot !== undefined && (this.attempt!.currentpage == -1 || page == this.currentPage)) { if (slot !== undefined && (this.attempt!.currentpage == -1 || page == this.currentPage)) {
// Scrol to a certain question in the current page. // Scrol to a certain question in the current page.
this.scrollToQuestion(slot); this.scrollToQuestion(slot);
@ -183,7 +182,7 @@ export class AddonModQuizReviewPage implements OnInit {
this.setSummaryCalculatedData(data); this.setSummaryCalculatedData(data);
this.questions = data.questions; this.questions = data.questions;
this.nextPage = page == -1 ? -2 : page + 1; this.nextPage = page + 1;
this.previousPage = page - 1; this.previousPage = page - 1;
this.questions.forEach((question) => { this.questions.forEach((question) => {
@ -341,8 +340,6 @@ export class AddonModQuizReviewPage implements OnInit {
summaryShown: false, summaryShown: false,
currentPage: this.attempt?.currentpage, currentPage: this.attempt?.currentpage,
isReview: true, isReview: true,
numPages: this.numPages,
showAll: this.showAll,
}, },
}); });
@ -350,11 +347,7 @@ export class AddonModQuizReviewPage implements OnInit {
return; return;
} }
if (modalData.action == AddonModQuizNavigationModalComponent.CHANGE_PAGE) { this.changePage(modalData.page!, modalData.slot);
this.changePage(modalData.page!, true, modalData.slot);
} else if (modalData.action == AddonModQuizNavigationModalComponent.SWITCH_MODE) {
this.switchMode();
}
} }
} }

2
src/addons/qtype/essay/services/handlers/essay.ts
View File

@ -516,7 +516,7 @@ export class AddonQtypeEssayHandlerService implements CoreQuestionHandler {
if (!isPlainText) { if (!isPlainText) {
// Add some HTML to the text if needed. // Add some HTML to the text if needed.
answers[textarea.name] = CoreTextUtils.formatHtmlLines(<string> answers[textarea.name]); answers[textarea.name] = CoreTextUtils.formatHtmlLines(<string> answers[textarea.name] || '');
} }
} }

1
src/core/components/timer/timer.scss
View File

@ -6,6 +6,7 @@ $core-timer-iterations: 15 !default;
:host { :host {
.core-timer { .core-timer {
--background: transparent !important; --background: transparent !important;
border-radius: var(--big-radius);
.core-timer-time-left, .core-timesup { .core-timer-time-left, .core-timesup {
font-weight: bold; font-weight: bold;

4
src/core/features/course/lang.json
View File

@ -35,9 +35,9 @@
"errordownloadingsection": "Error downloading section.", "errordownloadingsection": "Error downloading section.",
"errorgetmodule": "Error getting activity data.", "errorgetmodule": "Error getting activity data.",
"failed": "Failed", "failed": "Failed",
"gotonextactivity": "Continue to next activity", "gotonextactivity": "Go to next activity",
"gotonextactivitynotfound": "Next activity not found. It's possible that it has been hidden or deleted.", "gotonextactivitynotfound": "Next activity not found. It's possible that it has been hidden or deleted.",
"gotopreviousactivity": "Continue to previous activity", "gotopreviousactivity": "Go to previous activity",
"gotopreviousactivitynotfound": "Previous activity not found. It's possible that it has been hidden or deleted.", "gotopreviousactivitynotfound": "Previous activity not found. It's possible that it has been hidden or deleted.",
"hiddenfromstudents": "Hidden from students", "hiddenfromstudents": "Hidden from students",
"hiddenoncoursepage": "Available but not shown on course page", "hiddenoncoursepage": "Available but not shown on course page",