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

Merge pull request #3640 from NoelDeMartin/MOBILE-4284 

MOBILE-4284 quiz: Omit number for descriptions
main
Dani Palou 2023-04-25 10:37:08 +02:00 committed by GitHub
parent d13640dc1f 004daa4204
commit d6e84b96e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,11 +18,16 @@
(click)="loadPage(question.page, question.slot)" detail="false"> (click)="loadPage(question.page, question.slot)" detail="false">
<ion-label> <ion-label>
<span *ngIf="question.questionnumber">{{ 'core.question.questionno' | translate:{$a: question.questionnumber} }}</span> <span *ngIf="question.type !== 'description' && question.questionnumber">
<span *ngIf="!question.questionnumber">{{ 'core.question.information' | translate }}</span> {{ 'core.question.questionno' | translate:{$a: question.questionnumber} }}
</span>
<span *ngIf="question.type === 'description' || !question.questionnumber">
{{ 'core.question.information' | translate }}
</span>
</ion-label> </ion-label>
<ion-icon *ngIf="!question.questionnumber" name="fas-circle-info" slot="end" aria-hidden="true"></ion-icon> <ion-icon *ngIf="question.type === 'description' || !question.questionnumber" name="fas-circle-info" slot="end"
aria-hidden="true"></ion-icon>
<ion-icon *ngIf="question.stateClass == 'core-question-requiresgrading'" name="fas-circle-question" <ion-icon *ngIf="question.stateClass == 'core-question-requiresgrading'" name="fas-circle-question"
[attr.aria-label]="question.status" slot="end"> [attr.aria-label]="question.status" slot="end">
</ion-icon> </ion-icon>

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

@ -44,10 +44,12 @@
<!-- "Header" of the question. --> <!-- "Header" of the question. -->
<ion-item-divider> <ion-item-divider>
<ion-label> <ion-label>
<h2 *ngIf="question.questionnumber" class="inline"> <h2 *ngIf="question.type !== 'description' && question.questionnumber" class="inline">
{{ 'core.question.questionno' | translate:{$a: question.questionnumber} }} {{ 'core.question.questionno' | translate:{$a: question.questionnumber} }}
</h2> </h2>
<h2 *ngIf="!question.questionnumber" class="inline">{{ 'core.question.information' | translate }}</h2> <h2 *ngIf="question.type === 'description' || !question.questionnumber" class="inline">
{{ 'core.question.information' | translate }}
</h2>
</ion-label> </ion-label>
<div *ngIf="question.status || question.readableMark" slot="end" <div *ngIf="question.status || question.readableMark" slot="end"
class="ion-text-wrap ion-margin-horizontal addon-mod_quiz-question-note"> class="ion-text-wrap ion-margin-horizontal addon-mod_quiz-question-note">
@ -108,7 +110,8 @@
<!-- List of questions of the summary table. --> <!-- List of questions of the summary table. -->
<ng-container *ngFor="let question of summaryQuestions"> <ng-container *ngFor="let question of summaryQuestions">
<ion-item *ngIf="question.questionnumber" (click)="changePage(question.page, false, question.slot)" <ion-item *ngIf="question.type !== 'description' && question.questionnumber"
(click)="changePage(question.page, false, question.slot)"
[attr.aria-label]="'core.question.questionno' | translate:{$a: question.questionnumber}" [attr.aria-label]="'core.question.questionno' | translate:{$a: question.questionnumber}"
[detail]="!isSequential && canReturn" [button]="!isSequential && canReturn"> [detail]="!isSequential && canReturn" [button]="!isSequential && canReturn">
<ion-label> <ion-label>

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

@ -86,9 +86,12 @@
<!-- "Header" of the question. --> <!-- "Header" of the question. -->
<ion-item-divider> <ion-item-divider>
<ion-label> <ion-label>
<h2 *ngIf="question.questionnumber">{{ 'core.question.questionno' | translate:{$a: question.questionnumber} }} <h2 *ngIf="question.type !== 'description' && question.questionnumber">
{{ 'core.question.questionno' | translate:{$a: question.questionnumber} }}
</h2>
<h2 *ngIf="question.type === 'description' || !question.questionnumber">
{{ 'core.question.information' | translate }}
</h2> </h2>
<h2 *ngIf="!question.questionnumber">{{ 'core.question.information' | translate }}</h2>
</ion-label> </ion-label>
<div class="ion-text-wrap ion-margin-horizontal addon-mod_quiz-question-note" slot="end" <div class="ion-text-wrap ion-margin-horizontal addon-mod_quiz-question-note" slot="end"
*ngIf="question.status || question.readableMark"> *ngIf="question.status || question.readableMark">