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

MOBILE-2795 dashboard: Filter all courses

main
Pau Ferrer Ocaña 2018-12-19 11:19:45 +01:00
parent 138221e136
commit f6732dbf22
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/addon/block/myoverview/components/myoverview/addon-block-myoverview.html
View File

@ -1,7 +1,7 @@
<ion-item-divider color="light">
<h2>{{ 'addon.block_myoverview.pluginname' | translate }}</h2>
<!-- Download all courses. -->
<div *ngIf="downloadAllCoursesEnabled && courses[selectedFilter] && courses[selectedFilter].length > 1" class="core-button-spinner" item-end>
<div *ngIf="downloadAllCoursesEnabled && courses[selectedFilter] && courses[selectedFilter].length > 1 && !showFilter" class="core-button-spinner" item-end>
<button *ngIf="prefetchCoursesData[selectedFilter].icon && prefetchCoursesData[selectedFilter].icon != 'spinner'" ion-button icon-only clear color="dark" (click)="prefetchCourses()">
<core-icon [name]="prefetchCoursesData[selectedFilter].icon"></core-icon>
</button>

16
src/addon/block/myoverview/components/myoverview/myoverview.ts
View File

@ -177,17 +177,17 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
*/
filterChanged(event: any): void {
const newValue = event.target.value && event.target.value.trim().toLowerCase();
if (!newValue || !this.courses[this.selectedFilter]) {
this.filteredCourses = this.courses[this.selectedFilter];
if (!newValue || !this.courses['all']) {
this.filteredCourses = this.courses['all'];
} else {
// Use displayname if avalaible, or fullname if not.
if (this.courses[this.selectedFilter].length > 0 &&
typeof this.courses[this.selectedFilter][0].displayname != 'undefined') {
this.filteredCourses = this.courses[this.selectedFilter].filter((course) => {
if (this.courses['all'].length > 0 &&
typeof this.courses['all'][0].displayname != 'undefined') {
this.filteredCourses = this.courses['all'].filter((course) => {
return course.displayname.toLowerCase().indexOf(newValue) > -1;
});
} else {
this.filteredCourses = this.courses[this.selectedFilter].filter((course) => {
this.filteredCourses = this.courses['all'].filter((course) => {
return course.fullname.toLowerCase().indexOf(newValue) > -1;
});
}
@ -311,7 +311,7 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
switchFilter(): void {
this.showFilter = !this.showFilter;
this.courses.filter = '';
this.filteredCourses = this.courses[this.selectedFilter];
this.filteredCourses = this.courses[this.showFilter ? 'all' : this.selectedFilter];
if (this.showFilter) {
setTimeout(() => {
this.searchbar.setFocus();
@ -325,7 +325,7 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
* @return {boolean} If switch button that enables the filter input is shown or not.
*/
showFilterSwitchButton(): boolean {
return this.loaded && this.courses[this.selectedFilter] && this.courses[this.selectedFilter].length > 5;
return this.loaded && this.courses['all'] && this.courses['all'].length > 5;
}
/**

6
src/app/app.ios.scss
View File

@ -1,6 +1,10 @@
ion-app.app-root.ios {
.button-ios {
min-height: $button-ios-height
min-height: $button-ios-height;
}
ion-searchbar.searchbar-ios .button-ios {
min-height: auto;
}
// Light buttons color.