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

MOBILE-3833 swipe: Use swipe navigation directive

main
Pau Ferrer Ocaña 2022-01-10 11:58:20 +01:00
parent 9d645fe254
commit dc0b1d9587
8 changed files with 604 additions and 623 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/addons/badges/pages/issued-badge/issued-badge.html
View File

@ -9,8 +9,7 @@
</ion-title> </ion-title>
</ion-toolbar> </ion-toolbar>
</ion-header> </ion-header>
<ion-content> <ion-content [core-swipe-navigation]="badges">
<core-swipe-navigation [manager]="badges">
<ion-refresher slot="fixed" [disabled]="!badgeLoaded" (ionRefresh)="refreshBadges($event.target)"> <ion-refresher slot="fixed" [disabled]="!badgeLoaded" (ionRefresh)="refreshBadges($event.target)">
<ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content> <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
</ion-refresher> </ion-refresher>
@ -246,5 +245,4 @@
</ion-item-group> </ion-item-group>
</ng-container> </ng-container>
</core-loading> </core-loading>
</core-swipe-navigation>
</ion-content> </ion-content>

7
src/addons/mod/assign/pages/submission-review/submission-review.html
View File

@ -19,15 +19,12 @@
</ion-button> </ion-button>
</core-navbar-buttons> </core-navbar-buttons>
</ion-header> </ion-header>
<ion-content> <ion-content [core-swipe-navigation]="submissions">
<core-swipe-navigation [manager]="submissions">
<ion-refresher slot="fixed" [disabled]="!loaded" (ionRefresh)="refreshSubmission($event.target)"> <ion-refresher slot="fixed" [disabled]="!loaded" (ionRefresh)="refreshSubmission($event.target)">
<ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content> <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
</ion-refresher> </ion-refresher>
<core-loading [hideUntil]="loaded"> <core-loading [hideUntil]="loaded">
<addon-mod-assign-submission *ngIf="loaded" <addon-mod-assign-submission *ngIf="loaded" [courseId]="courseId" [moduleId]="moduleId" [submitId]="submitId" [blindId]="blindId">
[courseId]="courseId" [moduleId]="moduleId" [submitId]="submitId" [blindId]="blindId">
</addon-mod-assign-submission> </addon-mod-assign-submission>
</core-loading> </core-loading>
</core-swipe-navigation>
</ion-content> </ion-content>

4
src/addons/mod/feedback/pages/attempt/attempt.html
View File

@ -9,8 +9,7 @@
</ion-title> </ion-title>
</ion-toolbar> </ion-toolbar>
</ion-header> </ion-header>
<ion-content> <ion-content [core-swipe-navigation]="attempts">
<core-swipe-navigation [manager]="attempts">
<core-loading [hideUntil]="loaded"> <core-loading [hideUntil]="loaded">
<ion-list class="ion-no-margin" *ngIf="attempt || anonAttempt"> <ion-list class="ion-no-margin" *ngIf="attempt || anonAttempt">
<ion-item *ngIf="attempt" class="ion-text-wrap" core-user-link [userId]="attempt.userid" <ion-item *ngIf="attempt" class="ion-text-wrap" core-user-link [userId]="attempt.userid"
@ -51,5 +50,4 @@
</ng-container> </ng-container>
</ion-list> </ion-list>
</core-loading> </core-loading>
</core-swipe-navigation>
</ion-content> </ion-content>

20
src/addons/mod/forum/pages/discussion/discussion.html
View File

@ -55,8 +55,7 @@
</core-context-menu-item> </core-context-menu-item>
</core-context-menu> </core-context-menu>
</core-navbar-buttons> </core-navbar-buttons>
<ion-content> <ion-content [core-swipe-navigation]="discussions">
<core-swipe-navigation [manager]="discussions">
<ion-refresher slot="fixed" [disabled]="!discussionLoaded" (ionRefresh)="doRefresh($event.target)"> <ion-refresher slot="fixed" [disabled]="!discussionLoaded" (ionRefresh)="doRefresh($event.target)">
<ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content> <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
</ion-refresher> </ion-refresher>
@ -88,8 +87,8 @@
<div *ngIf="startingPost" class="ion-margin-bottom"> <div *ngIf="startingPost" class="ion-margin-bottom">
<addon-mod-forum-post [post]="startingPost" [discussion]="discussion" [courseId]="courseId" [highlight]="true" <addon-mod-forum-post [post]="startingPost" [discussion]="discussion" [courseId]="courseId" [highlight]="true"
[discussionId]="discussionId" [component]="component" [componentId]="cmId" [formData]="formData" [discussionId]="discussionId" [component]="component" [componentId]="cmId" [formData]="formData"
[originalData]="originalData" [forum]="forum" [accessInfo]="accessInfo" [trackPosts]="trackPosts" [originalData]="originalData" [forum]="forum" [accessInfo]="accessInfo" [trackPosts]="trackPosts" [ratingInfo]="ratingInfo"
[ratingInfo]="ratingInfo" [leavingPage]="leavingPage" (onPostChange)="postListChanged()"> [leavingPage]="leavingPage" (onPostChange)="postListChanged()">
</addon-mod-forum-post> </addon-mod-forum-post>
</div> </div>
@ -97,9 +96,9 @@
<ng-container *ngFor="let post of posts; first as first"> <ng-container *ngFor="let post of posts; first as first">
<core-spacer *ngIf="!first"></core-spacer> <core-spacer *ngIf="!first"></core-spacer>
<addon-mod-forum-post [post]="post" [courseId]="courseId" [discussionId]="discussionId" [component]="component" <addon-mod-forum-post [post]="post" [courseId]="courseId" [discussionId]="discussionId" [component]="component"
[componentId]="cmId" [formData]="formData" [originalData]="originalData" [componentId]="cmId" [formData]="formData" [originalData]="originalData" [parentSubject]="postSubjects[post.parentid]"
[parentSubject]="postSubjects[post.parentid]" [forum]="forum" [accessInfo]="accessInfo" [trackPosts]="trackPosts" [forum]="forum" [accessInfo]="accessInfo" [trackPosts]="trackPosts" [ratingInfo]="ratingInfo"
[ratingInfo]="ratingInfo" [leavingPage]="leavingPage" (onPostChange)="postListChanged()"> [leavingPage]="leavingPage" (onPostChange)="postListChanged()">
</addon-mod-forum-post> </addon-mod-forum-post>
</ng-container> </ng-container>
</ion-card> </ion-card>
@ -113,9 +112,9 @@
<ng-template #nestedPosts let-post="post"> <ng-template #nestedPosts let-post="post">
<ion-card> <ion-card>
<addon-mod-forum-post [post]="post" [courseId]="courseId" [discussionId]="discussionId" [component]="component" <addon-mod-forum-post [post]="post" [courseId]="courseId" [discussionId]="discussionId" [component]="component"
[componentId]="cmId" [formData]="formData" [originalData]="originalData" [componentId]="cmId" [formData]="formData" [originalData]="originalData" [parentSubject]="postSubjects[post.parentid]"
[parentSubject]="postSubjects[post.parentid]" [forum]="forum" [accessInfo]="accessInfo" [trackPosts]="trackPosts" [forum]="forum" [accessInfo]="accessInfo" [trackPosts]="trackPosts" [ratingInfo]="ratingInfo"
[ratingInfo]="ratingInfo" [leavingPage]="leavingPage" (onPostChange)="postListChanged()"> [leavingPage]="leavingPage" (onPostChange)="postListChanged()">
</addon-mod-forum-post> </addon-mod-forum-post>
</ion-card> </ion-card>
<div class="ion-padding-start" *ngIf="post.children && post.children.length && post.children[0].subject"> <div class="ion-padding-start" *ngIf="post.children && post.children.length && post.children[0].subject">
@ -125,5 +124,4 @@
</div> </div>
</ng-template> </ng-template>
</core-loading> </core-loading>
</core-swipe-navigation>
</ion-content> </ion-content>

8
src/addons/mod/forum/pages/new-discussion/new-discussion.html
View File

@ -11,8 +11,7 @@
</ion-buttons> </ion-buttons>
</ion-toolbar> </ion-toolbar>
</ion-header> </ion-header>
<ion-content> <ion-content [core-swipe-navigation]="discussions">
<core-swipe-navigation [manager]="discussions">
<ion-refresher slot="fixed" [disabled]="!groupsLoaded" (ionRefresh)="refreshGroups($event.target)"> <ion-refresher slot="fixed" [disabled]="!groupsLoaded" (ionRefresh)="refreshGroups($event.target)">
<ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content> <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
</ion-refresher> </ion-refresher>
@ -63,8 +62,8 @@
<ion-toggle [(ngModel)]="newDiscussion.pin" name="pin"></ion-toggle> <ion-toggle [(ngModel)]="newDiscussion.pin" name="pin"></ion-toggle>
</ion-item> </ion-item>
<core-attachments *ngIf="canCreateAttachments && forum && forum.maxattachments > 0" [files]="newDiscussion.files" <core-attachments *ngIf="canCreateAttachments && forum && forum.maxattachments > 0" [files]="newDiscussion.files"
[maxSize]="forum.maxbytes" [maxSubmissions]="forum.maxattachments" [component]="component" [maxSize]="forum.maxbytes" [maxSubmissions]="forum.maxattachments" [component]="component" [componentId]="forum.cmid"
[componentId]="forum.cmid" [allowOffline]="true" [courseId]="courseId"> [allowOffline]="true" [courseId]="courseId">
</core-attachments> </core-attachments>
</div> </div>
<ion-item> <ion-item>
@ -84,5 +83,4 @@
</ion-item> </ion-item>
</form> </form>
</core-loading> </core-loading>
</core-swipe-navigation>
</ion-content> </ion-content>

11
src/addons/mod/glossary/pages/edit/edit.html
View File

@ -11,22 +11,20 @@
</ion-title> </ion-title>
</ion-toolbar> </ion-toolbar>
</ion-header> </ion-header>
<ion-content> <ion-content [core-swipe-navigation]="entries">
<core-swipe-navigation [manager]="entries">
<core-loading [hideUntil]="loaded"> <core-loading [hideUntil]="loaded">
<form #editFormEl *ngIf="glossary"> <form #editFormEl *ngIf="glossary">
<ion-item> <ion-item>
<ion-label position="stacked">{{ 'addon.mod_glossary.concept' | translate }}</ion-label> <ion-label position="stacked">{{ 'addon.mod_glossary.concept' | translate }}</ion-label>
<ion-input type="text" [placeholder]="'addon.mod_glossary.concept' | translate" [(ngModel)]="entry.concept" <ion-input type="text" [placeholder]="'addon.mod_glossary.concept' | translate" [(ngModel)]="entry.concept" name="concept">
name="concept">
</ion-input> </ion-input>
</ion-item> </ion-item>
<ion-item> <ion-item>
<ion-label position="stacked">{{ 'addon.mod_glossary.definition' | translate }}</ion-label> <ion-label position="stacked">{{ 'addon.mod_glossary.definition' | translate }}</ion-label>
<core-rich-text-editor [control]="definitionControl" (contentChanged)="onDefinitionChange($event)" <core-rich-text-editor [control]="definitionControl" (contentChanged)="onDefinitionChange($event)"
[placeholder]="'addon.mod_glossary.definition' | translate" name="addon_mod_glossary_edit" [component]="component" [placeholder]="'addon.mod_glossary.definition' | translate" name="addon_mod_glossary_edit" [component]="component"
[componentId]="cmId" [autoSave]="true" contextLevel="module" [contextInstanceId]="cmId" [componentId]="cmId" [autoSave]="true" contextLevel="module" [contextInstanceId]="cmId" elementId="definition_editor"
elementId="definition_editor" [draftExtraParams]="editorExtraParams"> [draftExtraParams]="editorExtraParams">
</core-rich-text-editor> </core-rich-text-editor>
</ion-item> </ion-item>
<ion-item *ngIf="categories.length > 0"> <ion-item *ngIf="categories.length > 0">
@ -82,5 +80,4 @@
</ion-button> </ion-button>
</form> </form>
</core-loading> </core-loading>
</core-swipe-navigation>
</ion-content> </ion-content>

12
src/addons/mod/glossary/pages/entry/entry.html
View File

@ -11,8 +11,7 @@
</ion-title> </ion-title>
</ion-toolbar> </ion-toolbar>
</ion-header> </ion-header>
<ion-content> <ion-content [core-swipe-navigation]="entries">
<core-swipe-navigation [manager]="entries">
<ion-refresher slot="fixed" [disabled]="!loaded" (ionRefresh)="doRefresh($event.target)"> <ion-refresher slot="fixed" [disabled]="!loaded" (ionRefresh)="doRefresh($event.target)">
<ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content> <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
</ion-refresher> </ion-refresher>
@ -42,8 +41,8 @@
</ion-item> </ion-item>
<ion-item class="ion-text-wrap"> <ion-item class="ion-text-wrap">
<ion-label> <ion-label>
<core-format-text [component]="component" [componentId]="componentId" [text]="entry.definition" <core-format-text [component]="component" [componentId]="componentId" [text]="entry.definition" contextLevel="module"
contextLevel="module" [contextInstanceId]="componentId" [courseId]="courseId"> [contextInstanceId]="componentId" [courseId]="courseId">
</core-format-text> </core-format-text>
</ion-label> </ion-label>
</ion-item> </ion-item>
@ -71,8 +70,8 @@
[aggregateMethod]="glossary.assessed" [scaleId]="glossary.scale" [userId]="entry.userid" (onUpdate)="ratingUpdated()"> [aggregateMethod]="glossary.assessed" [scaleId]="glossary.scale" [userId]="entry.userid" (onUpdate)="ratingUpdated()">
</core-rating-rate> </core-rating-rate>
<core-rating-aggregate *ngIf="glossary && ratingInfo" [ratingInfo]="ratingInfo" contextLevel="module" <core-rating-aggregate *ngIf="glossary && ratingInfo" [ratingInfo]="ratingInfo" contextLevel="module"
[instanceId]="glossary.coursemodule" [itemId]="entry.id" [courseId]="glossary.course" [instanceId]="glossary.coursemodule" [itemId]="entry.id" [courseId]="glossary.course" [aggregateMethod]="glossary.assessed"
[aggregateMethod]="glossary.assessed" [scaleId]="glossary.scale"> [scaleId]="glossary.scale">
</core-rating-aggregate> </core-rating-aggregate>
</ng-container> </ng-container>
@ -82,5 +81,4 @@
</ion-item> </ion-item>
</ion-card> </ion-card>
</core-loading> </core-loading>
</core-swipe-navigation>
</ion-content> </ion-content>

7
src/core/features/user/pages/profile/profile.html
View File

@ -8,8 +8,7 @@
</ion-title> </ion-title>
</ion-toolbar> </ion-toolbar>
</ion-header> </ion-header>
<ion-content> <ion-content [core-swipe-navigation]="users">
<core-swipe-navigation [manager]="users">
<ion-refresher slot="fixed" [disabled]="!userLoaded" (ionRefresh)="refreshUser($event.target)"> <ion-refresher slot="fixed" [disabled]="!userLoaded" (ionRefresh)="refreshUser($event.target)">
<ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content> <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
</ion-refresher> </ion-refresher>
@ -86,11 +85,9 @@
</ion-label> </ion-label>
</ion-item> </ion-item>
</ion-list> </ion-list>
<core-empty-box *ngIf="!user && !isDeleted && isEnrolled" icon="far-user" <core-empty-box *ngIf="!user && !isDeleted && isEnrolled" icon="far-user" [message]=" 'core.user.detailsnotavailable' | translate">
[message]=" 'core.user.detailsnotavailable' | translate">
</core-empty-box> </core-empty-box>
<core-empty-box *ngIf="isDeleted" icon="far-user" [message]="'core.userdeleted' | translate"></core-empty-box> <core-empty-box *ngIf="isDeleted" icon="far-user" [message]="'core.userdeleted' | translate"></core-empty-box>
<core-empty-box *ngIf="!isEnrolled" icon="far-user" [message]="'core.notenrolledprofile' | translate"></core-empty-box> <core-empty-box *ngIf="!isEnrolled" icon="far-user" [message]="'core.notenrolledprofile' | translate"></core-empty-box>
</core-loading> </core-loading>
</core-swipe-navigation>
</ion-content> </ion-content>