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

Merge pull request #2847 from dpalou/MOBILE-3320 

Mobile 3320
main
Noel De Martin 2021-06-22 16:55:43 +02:00 committed by GitHub
parent 51c1a7ebbf 9dde9de784
commit d0c4d986ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 32 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/addons/mod/quiz/components/index/index.ts
View File

@ -647,7 +647,9 @@ export class AddonModQuizIndexComponent extends CoreCourseModuleMainActivityComp
if (data) { if (data) {
this.gradebookData = { this.gradebookData = {
grade: 'graderaw' in data ? data.graderaw : Number(data.grade), grade: 'graderaw' in data && data.graderaw !== undefined && data.graderaw !== null ?
data.graderaw :
(data.grade !== undefined && data.grade !== null ? Number(data.grade) : undefined),
feedback: data.feedback, feedback: data.feedback,
}; };
} }

12
src/addons/qtype/ddimageortext/component/addon-qtype-ddimageortext.html
View File

@ -17,11 +17,9 @@
</core-format-text> </core-format-text>
</ion-label> </ion-label>
</ion-item> </ion-item>
<ion-item class="ion-text-wrap" [hidden]="!ddQuestion.loaded"> <div class="fake-ion-item ion-text-wrap" [hidden]="!ddQuestion.loaded">
<ion-label> <core-format-text *ngIf="ddQuestion.ddArea" [adaptImg]="false" [component]="component" [componentId]="componentId"
<core-format-text *ngIf="ddQuestion.ddArea" [adaptImg]="false" [component]="component" [componentId]="componentId" [text]="ddQuestion.ddArea" [filter]="false" (afterRender)="ddAreaRendered()">
[text]="ddQuestion.ddArea" [filter]="false" (afterRender)="ddAreaRendered()"> </core-format-text>
</core-format-text> </div>
</ion-label>
</ion-item>
</div> </div>

12
src/addons/qtype/ddmarker/component/addon-qtype-ddmarker.html
View File

@ -16,11 +16,9 @@
</core-format-text> </core-format-text>
</ion-label> </ion-label>
</ion-item> </ion-item>
<ion-item class="ion-text-wrap" [hidden]="!ddQuestion.loaded"> <div class="fake-ion-item ion-text-wrap" [hidden]="!ddQuestion.loaded">
<ion-label> <core-format-text *ngIf="ddQuestion.ddArea" [adaptImg]="false" [component]="component" [componentId]="componentId"
<core-format-text *ngIf="ddQuestion.ddArea" [adaptImg]="false" [component]="component" [componentId]="componentId" [text]="ddQuestion.ddArea" [filter]="false" (afterRender)="ddAreaRendered()">
[text]="ddQuestion.ddArea" [filter]="false" (afterRender)="ddAreaRendered()"> </core-format-text>
</core-format-text> </div>
</ion-label>
</ion-item>
</div> </div>

38
src/addons/qtype/ddwtos/component/addon-qtype-ddwtos.html
View File

@ -2,26 +2,24 @@
<!-- Content is outside the core-loading to let the script calculate drag items position --> <!-- Content is outside the core-loading to let the script calculate drag items position -->
<core-loading [hideUntil]="ddQuestion.loaded"></core-loading> <core-loading [hideUntil]="ddQuestion.loaded"></core-loading>
<ion-item class="ion-text-wrap" [hidden]="!ddQuestion.loaded"> <div class="fake-ion-item ion-text-wrap" [hidden]="!ddQuestion.loaded">
<ion-label> <ion-card *ngIf="!ddQuestion.readOnly" class="core-info-card">
<ion-card *ngIf="!ddQuestion.readOnly" class="core-info-card"> <ion-item>
<ion-item> <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>{{ 'core.question.howtodraganddrop' | translate }}</ion-label>
<ion-label>{{ 'core.question.howtodraganddrop' | translate }}</ion-label> </ion-item>
</ion-item> </ion-card>
</ion-card> <div class="addon-qtype-ddwtos-container">
<div class="addon-qtype-ddwtos-container"> <core-format-text [component]="component" [componentId]="componentId" [text]="ddQuestion.text"
<core-format-text [component]="component" [componentId]="componentId" [text]="ddQuestion.text" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [courseId]="courseId" #questiontext
[contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [courseId]="courseId" #questiontext (afterRender)="textRendered()">
(afterRender)="textRendered()"> </core-format-text>
</core-format-text>
<core-format-text *ngIf="ddQuestion.answers" [component]="component" [componentId]="componentId" <core-format-text *ngIf="ddQuestion.answers" [component]="component" [componentId]="componentId"
[text]="ddQuestion.answers" [filter]="false" (afterRender)="answersRendered()"> [text]="ddQuestion.answers" [filter]="false" (afterRender)="answersRendered()">
</core-format-text> </core-format-text>
<div class="drags"></div> <div class="drags"></div>
</div> </div>
</ion-label> </div>
</ion-item>
</div> </div>

4
src/theme/components/format-text.scss
View File

@ -209,9 +209,7 @@ core-format-text {
core-format-text { core-format-text {
ul { ul {
padding-left: 1rem; padding-left: 1rem;
} -webkit-margin-start: .2rem;
ul, ol {
-webkit-padding-start: 15px;
} }
.atto_image_button_text-top, .atto_image_button_text-top,