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

Merge pull request #4247 from crazyserver/MOBILE-4708

Browse Source 
Mobile 4708
This commit is contained in:
Dani Palou 2024-11-25 10:58:54 +01:00 committed by GitHub
commit d6ac26bc3f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/addons/messageoutput/airnotifier/pages/devices/devices.html
View File

@ -34,7 +34,7 @@
</p>
</ion-label>
<core-button-with-spinner [loading]="device.updating" slot="end">
<ion-toggle [(ngModel)]="device.enable" (ngModelChange)="enableDevice(device, device.enable)"
<ion-toggle [(ngModel)]="device.enable" (ngModelChange)="enableDevice(device, !!device.enable)"
[attr.aria-labelledby]="'device-'+ device.id " />
</core-button-with-spinner>
</ion-item>

2
src/addons/mod/assign/components/submission/addon-mod-assign-submission.html
View File

@ -311,7 +311,7 @@
<!-- Outcomes. -->
<ion-item class="ion-text-wrap" *ngFor="let outcome of gradeInfo!.outcomes">
<ion-select *ngIf="canSaveGrades && outcome.itemNumber" [(ngModel)]="outcome.selectedId"
interface="action-sheet" [disabled]="gradeInfo!.disabled" [cancelText]="'core.cancel' | translate"
interface="action-sheet" [disabled]="!!gradeInfo!.disabled" [cancelText]="'core.cancel' | translate"
[interfaceOptions]="{header: outcome.name }">
<p class="item-heading" slot="label">{{ outcome.name }}</p>
<ion-select-option *ngFor="let grade of outcome.options" [value]="grade.value">

2
src/addons/mod/data/fields/date/component/addon-mod-data-field-date.html
View File

@ -5,7 +5,7 @@
<ion-modal [keepContentsMounted]="true">
<ng-template>
<ion-datetime id="datetime" [formControlName]="'f_'+field.id" [max]="maxDate" [min]="minDate"
[disabled]="searchMode && searchFields && !searchFields['f_'+field.id+'_z']" presentation="date"
[disabled]="!!searchMode && !!searchFields && !searchFields['f_'+field.id+'_z']" presentation="date"
[showDefaultButtons]="true" />
</ng-template>
</ion-modal>

2
src/addons/mod/quiz/components/index/addon-mod-quiz-index.html
View File

@ -17,7 +17,7 @@
<!-- Activity info. -->
<core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
[courseId]="courseId" [hasDataToSync]="buttonText && hasOffline" (completionChanged)="onCompletionChange()" />
[courseId]="courseId" [hasDataToSync]="!!buttonText && hasOffline" (completionChanged)="onCompletionChange()" />
<!-- Access rules description messages. -->
<ion-card *ngIf="gradeMethodReadable || accessRules.length || syncTime">

8
src/addons/mod/survey/components/index/addon-mod-survey-index.html
View File

@ -55,7 +55,7 @@
<!-- Subquestion -->
<ng-container *ngIf="question.parent !== 0">
<ion-radio-group [(ngModel)]="answers[question.name]" [required]="question.required" [name]="question.name">
<ion-radio-group [(ngModel)]="answers[question.name]" [required]="!!question.required" [name]="question.name">
<ion-row class="ion-align-items-center ion-padding-horizontal" [class.even]="isEven">
<ion-col size="7">
@ -71,7 +71,7 @@
<ion-radio [value]="value + 1" [attr.aria-label]="question.num + '. '+question.text + ': ' + option" />
</ion-col>
<ion-col class="ion-hide-md-up" size="5">
<ion-select class="ion-padding" [(ngModel)]="answers[question.name]" [required]="question.required"
<ion-select class="ion-padding" [(ngModel)]="answers[question.name]" [required]="!!question.required"
[attr.aria-labelledby]="'addon-mod_survey-'+question.name" interface="action-sheet"
[name]="question.name" [cancelText]="'core.cancel' | translate"
[interfaceOptions]="{header: question.text}">
@ -94,7 +94,7 @@
</span>
</ion-col>
<ion-col size="5">
<ion-select class="ion-padding" [(ngModel)]="answers[question.name]" [required]="question.required"
<ion-select class="ion-padding" [(ngModel)]="answers[question.name]" [required]="!!question.required"
[attr.aria-labelledby]="'addon-mod_survey-'+question.name" interface="action-sheet" [name]="question.name"
[cancelText]="'core.cancel' | translate" [interfaceOptions]="{header: question.text}">
<ion-select-option [value]="question.required ? '-1' : '0'" selected [disabled]="question.required">
@ -109,7 +109,7 @@
<ion-item *ngIf="question.type === 0" class="ion-text-wrap" [class.even]="isEven">
<ion-textarea labelPlacement="floating" [(ngModel)]="answers[question.name]" [name]="question.name"
[required]="question.required">
[required]="!!question.required">
<p slot="label" [core-mark-required]="question.required">
<strong>{{question.num}}.</strong> {{ question.text }}
</p>

2
src/core/components/iframe/core-iframe.html
View File

@ -1,5 +1,5 @@
<!-- Display a loading until the iframe page is loaded. -->
<core-loading [hideUntil]="!loading && (safeUrl || launchExternalLabel)" />
<core-loading [hideUntil]="!loading && (!!safeUrl || !!launchExternalLabel)" />
<!--The iframe needs to be outside of core-loading, otherwise the request is canceled while loading. -->
<!-- Don't add the iframe until safeUrl is set, adding an iframe with null as src causes the iframe to load the whole app. -->

2
src/core/features/h5p/components/h5p-iframe/core-h5p-iframe.html
View File

@ -1,4 +1,4 @@
<core-loading [hideUntil]="iframeSrc" [fullscreen]="false">
<core-loading [hideUntil]="!!iframeSrc" [fullscreen]="false">
<core-iframe *ngIf="iframeSrc" [src]="iframeSrc" iframeHeight="auto" [allowFullscreen]="true" (loaded)="iframeLoaded()"
[showFullscreenOnToolbar]="enableInAppFullscreen" [autoFullscreenOnRotate]="enableInAppFullscreen" />
<script *ngIf="resizeScript && iframeSrc" type="text/javascript" [src]="resizeScript"></script>

2
src/core/features/viewer/pages/iframe/iframe.html
View File

@ -9,7 +9,7 @@
</ion-toolbar>
</ion-header>
<ion-content>
<core-loading [hideUntil]="url">
<core-loading [hideUntil]="!!url">
<core-iframe *ngIf="url" [src]="url" [allowAutoLogin]="autoLogin" />
</core-loading>
</ion-content>