MOBILE-2613 overview: Always show past and future options
parent
550c2a943c
commit
2b2971a87b
|
@ -10,9 +10,9 @@
|
||||||
<div padding class="clearfix" [hidden]="showFilter" ion-row justify-content-end>
|
<div padding class="clearfix" [hidden]="showFilter" ion-row justify-content-end>
|
||||||
<ion-select [hidden]="!showSelectorFilter" [title]="'core.show' | translate" [(ngModel)]="selectedFilter" ion-col (ngModelChange)="selectedChanged()" interface="popover" class="core-button-select">
|
<ion-select [hidden]="!showSelectorFilter" [title]="'core.show' | translate" [(ngModel)]="selectedFilter" ion-col (ngModelChange)="selectedChanged()" interface="popover" class="core-button-select">
|
||||||
<ion-option value="all">{{ 'addon.block_myoverview.all' | translate }}</ion-option>∫
|
<ion-option value="all">{{ 'addon.block_myoverview.all' | translate }}</ion-option>∫
|
||||||
<ion-option value="inprogress" *ngIf="courses.inprogress.length > 0">{{ 'addon.block_myoverview.inprogress' | translate }}</ion-option>
|
<ion-option value="inprogress">{{ 'addon.block_myoverview.inprogress' | translate }}</ion-option>
|
||||||
<ion-option value="future" *ngIf="courses.future.length > 0">{{ 'addon.block_myoverview.future' | translate }}</ion-option>
|
<ion-option value="future">{{ 'addon.block_myoverview.future' | translate }}</ion-option>
|
||||||
<ion-option value="past" *ngIf="courses.past.length > 0">{{ 'addon.block_myoverview.past' | translate }}</ion-option>
|
<ion-option value="past">{{ 'addon.block_myoverview.past' | translate }}</ion-option>
|
||||||
</ion-select>
|
</ion-select>
|
||||||
<!-- Download all courses. -->
|
<!-- Download all courses. -->
|
||||||
<div *ngIf="downloadAllCoursesEnabled && courses[selectedFilter] && courses[selectedFilter].length > 1" class="core-button-spinner" ion-col text-end col-1>
|
<div *ngIf="downloadAllCoursesEnabled && courses[selectedFilter] && courses[selectedFilter].length > 1" class="core-button-spinner" ion-col text-end col-1>
|
||||||
|
|
|
@ -48,7 +48,7 @@
|
||||||
<ion-avatar item-start core-user-link [userId]="discussion.userid" [courseId]="courseId">
|
<ion-avatar item-start core-user-link [userId]="discussion.userid" [courseId]="courseId">
|
||||||
<img [src]="discussion.userpictureurl" onError="this.src='assets/img/user-avatar.png'" core-external-content [alt]="'core.pictureof' | translate:{$a: discussion.userfullname}" role="presentation">
|
<img [src]="discussion.userpictureurl" onError="this.src='assets/img/user-avatar.png'" core-external-content [alt]="'core.pictureof' | translate:{$a: discussion.userfullname}" role="presentation">
|
||||||
</ion-avatar>
|
</ion-avatar>
|
||||||
<h2><ion-icon name="pin" *ngIf="discussion.pinned"></ion-icon> <core-format-text [text]="discussion.subject"></core-format-text></h2>
|
<h2><core-icon name="fa-map-pin" *ngIf="discussion.pinned"></core-icon> <core-format-text [text]="discussion.subject"></core-format-text></h2>
|
||||||
<p>
|
<p>
|
||||||
<ion-note float-end padding-left text-end>
|
<ion-note float-end padding-left text-end>
|
||||||
{{discussion.created | coreDateDayOrTime}}
|
{{discussion.created | coreDateDayOrTime}}
|
||||||
|
|
Loading…
Reference in New Issue