diff --git a/scripts/langindex.json b/scripts/langindex.json index 3674394ea..64c84def3 100644 --- a/scripts/langindex.json +++ b/scripts/langindex.json @@ -17,11 +17,14 @@ "addon.block_myoverview.nocoursesinprogress": "block_myoverview", "addon.block_myoverview.nocoursespast": "block_myoverview", "addon.block_myoverview.past": "block_myoverview", + "addon.block_timeline.duedate": "block_timeline", "addon.block_timeline.next30days": "block_timeline", + "addon.block_timeline.next3months": "block_timeline", + "addon.block_timeline.next6months": "block_timeline", "addon.block_timeline.next7days": "block_timeline", "addon.block_timeline.nocoursesinprogress": "block_timeline", "addon.block_timeline.noevents": "block_timeline", - "addon.block_timeline.recentlyoverdue": "local_moodlemobileapp", + "addon.block_timeline.overdue": "block_timeline", "addon.block_timeline.sortbycourses": "block_timeline", "addon.block_timeline.sortbydates": "block_timeline", "addon.calendar.calendar": "calendar", @@ -1058,6 +1061,7 @@ "core.accounts": "admin", "core.add": "moodle", "core.agelocationverification": "moodle", + "core.all": "moodle", "core.allparticipants": "moodle", "core.android": "local_moodlemobileapp", "core.answer": "moodle", diff --git a/src/addon/block/timeline/components/events/addon-block-timeline-events.html b/src/addon/block/timeline/components/events/addon-block-timeline-events.html index 40f8e945c..8e25b1f51 100644 --- a/src/addon/block/timeline/components/events/addon-block-timeline-events.html +++ b/src/addon/block/timeline/components/events/addon-block-timeline-events.html @@ -1,49 +1,25 @@ - - - -

-

{{event.timesort * 1000 | coreFormatDate:"dfmediumdate" }}

- - {{event.action.itemcount}} - - - - - {{ 'addon.block_timeline.recentlyoverdue' | translate }} - - - - - - - {{ 'addon.block_timeline.next7days' | translate }} - - - - - - - {{ 'addon.block_timeline.next30days' | translate }} - - - - - - - {{ 'addon.block_myoverview.future' | translate }} - - + + +

{{ dayEvents.dayTimestamp * 1000 | coreFormatDate:"LL" }}

+ + + + +

+

+ +

+ {{event.timesort * 1000 | coreFormatDate:"LT" }} +
- +
- - + diff --git a/src/addon/block/timeline/components/events/events.ts b/src/addon/block/timeline/components/events/events.ts index fdfdd9da1..c4d1f413d 100644 --- a/src/addon/block/timeline/components/events/events.ts +++ b/src/addon/block/timeline/components/events/events.ts @@ -17,6 +17,7 @@ import { NavController } from 'ionic-angular'; import { CoreSitesProvider } from '@providers/sites'; import { CoreDomUtilsProvider } from '@providers/utils/dom'; import { CoreTextUtilsProvider } from '@providers/utils/text'; +import { CoreTimeUtilsProvider } from '@providers/utils/time'; import { CoreUtilsProvider } from '@providers/utils/utils'; import { CoreCourseProvider } from '@core/course/providers/course'; import { CoreContentLinksHelperProvider } from '@core/contentlinks/providers/helper'; @@ -30,23 +31,21 @@ import * as moment from 'moment'; templateUrl: 'addon-block-timeline-events.html' }) export class AddonBlockTimelineEventsComponent implements OnChanges { - @Input() events: any[]; // The events to render. + @Input() events = []; // The events to render. @Input() showCourse?: boolean | string; // Whether to show the course name. + @Input() from: number; // Number of days from today to offset the events. + @Input() to?: number; // Number of days from today to limit the events to. If not defined, no limit. @Input() canLoadMore?: boolean; // Whether more events can be loaded. @Output() loadMore: EventEmitter; // Notify that more events should be loaded. empty: boolean; loadingMore: boolean; - recentlyOverdue: any[] = []; - today: any[] = []; - next7Days: any[] = []; - next30Days: any[] = []; - future: any[] = []; + filteredEvents = []; constructor(@Optional() private navCtrl: NavController, private utils: CoreUtilsProvider, private textUtils: CoreTextUtilsProvider, private domUtils: CoreDomUtilsProvider, private sitesProvider: CoreSitesProvider, private courseProvider: CoreCourseProvider, - private contentLinksHelper: CoreContentLinksHelperProvider) { + private contentLinksHelper: CoreContentLinksHelperProvider, private timeUtils: CoreTimeUtilsProvider) { this.loadMore = new EventEmitter(); } @@ -56,8 +55,34 @@ export class AddonBlockTimelineEventsComponent implements OnChanges { ngOnChanges(changes: {[name: string]: SimpleChange}): void { this.showCourse = this.utils.isTrueOrOne(this.showCourse); - if (changes.events) { - this.updateEvents(); + if (changes.events || changes.from || changes.to) { + if (this.events && this.events.length > 0) { + const filteredEvents = this.filterEventsByTime(this.from, this.to); + this.empty = !filteredEvents || filteredEvents.length <= 0; + + const eventsByDay = {}; + filteredEvents.forEach((event) => { + const dayTimestamp = this.timeUtils.getMidnightForTimestamp(event.timesort); + if (eventsByDay[dayTimestamp]) { + eventsByDay[dayTimestamp].push(event); + } else { + eventsByDay[dayTimestamp] = [event]; + } + }); + + const todaysMidnight = this.timeUtils.getMidnightForTimestamp(); + this.filteredEvents = []; + Object.keys(eventsByDay).forEach((key) => { + const dayTimestamp = parseInt(key); + this.filteredEvents.push({ + color: dayTimestamp < todaysMidnight ? 'danger' : 'light', + dayTimestamp: dayTimestamp, + events: eventsByDay[dayTimestamp] + }); + }); + } else { + this.empty = true; + } } } @@ -69,8 +94,8 @@ export class AddonBlockTimelineEventsComponent implements OnChanges { * @return {any[]} Filtered events. */ protected filterEventsByTime(start: number, end?: number): any[] { - start = moment().add(start, 'days').unix(); - end = typeof end != 'undefined' ? moment().add(end, 'days').unix() : end; + start = moment().add(start, 'days').startOf('day').unix(); + end = typeof end != 'undefined' ? moment().add(end, 'days').startOf('day').unix() : end; return this.events.filter((event) => { if (end) { @@ -85,20 +110,6 @@ export class AddonBlockTimelineEventsComponent implements OnChanges { }); } - /** - * Update the events displayed. - */ - protected updateEvents(): void { - this.empty = !this.events || this.events.length <= 0; - if (!this.empty) { - this.recentlyOverdue = this.filterEventsByTime(-14, 0); - this.today = this.filterEventsByTime(0, 1); - this.next7Days = this.filterEventsByTime(1, 7); - this.next30Days = this.filterEventsByTime(7, 30); - this.future = this.filterEventsByTime(30); - } - } - /** * Load more events clicked. */ @@ -110,15 +121,20 @@ export class AddonBlockTimelineEventsComponent implements OnChanges { /** * Action clicked. * - * @param {Event} e Click event. - * @param {string} url Url of the action. + * @param {Event} e Click event. + * @param {any} event Calendar event info. */ - action(e: Event, url: string): void { + action(e: Event, event: any): void { e.preventDefault(); e.stopPropagation(); + let url; - // Fix URL format. - url = this.textUtils.decodeHTMLEntities(url); + if (event.action.actionable) { + // Fix URL format. + url = this.textUtils.decodeHTMLEntities(event.action.url); + } else { + url = this.textUtils.decodeHTMLEntities(event.url); + } const modal = this.domUtils.showModalLoading(); this.contentLinksHelper.handleLink(url, undefined, this.navCtrl).then((treated) => { diff --git a/src/addon/block/timeline/components/timeline/addon-block-timeline.html b/src/addon/block/timeline/components/timeline/addon-block-timeline.html index fa5b9fc0c..037e8b7a3 100644 --- a/src/addon/block/timeline/components/timeline/addon-block-timeline.html +++ b/src/addon/block/timeline/components/timeline/addon-block-timeline.html @@ -1,18 +1,31 @@ -
- - {{ 'addon.block_timeline.sortbydates' | translate }} - {{ 'addon.block_timeline.sortbycourses' | translate }} - +
+ + + {{ 'core.all' | translate }} + {{ 'addon.block_timeline.overdue' | translate }} + {{ 'addon.block_timeline.duedate' | translate }} + {{ 'addon.block_timeline.next7days' | translate }} + {{ 'addon.block_timeline.next30days' | translate }} + {{ 'addon.block_timeline.next3months' | translate }} + {{ 'addon.block_timeline.next6months' | translate }} + + + + + {{ 'addon.block_timeline.sortbydates' | translate }} + {{ 'addon.block_timeline.sortbycourses' | translate }} + +
- + - + diff --git a/src/addon/block/timeline/components/timeline/timeline.ts b/src/addon/block/timeline/components/timeline/timeline.ts index 1d7b839b9..180aec2ef 100644 --- a/src/addon/block/timeline/components/timeline/timeline.ts +++ b/src/addon/block/timeline/components/timeline/timeline.ts @@ -30,6 +30,7 @@ import { AddonBlockTimelineProvider } from '../../providers/timeline'; }) export class AddonBlockTimelineComponent extends AddonBlockComponent implements OnInit { sort = 'sortbydates'; + filter = 'next30days'; timeline = { events: [], loaded: false, @@ -40,6 +41,8 @@ export class AddonBlockTimelineComponent extends AddonBlockComponent implements loaded: false, canLoadMore: false }; + dataFrom: number; + dataTo: number; protected courseIds = []; protected fetchContentDefaultError = 'Error getting timeline data.'; @@ -55,6 +58,7 @@ export class AddonBlockTimelineComponent extends AddonBlockComponent implements * Component being initialized. */ ngOnInit(): void { + this.switchFilter(); super.ngOnInit(); } @@ -159,6 +163,39 @@ export class AddonBlockTimelineComponent extends AddonBlockComponent implements }); } + /** + * Change timeline filter being viewed. + */ + switchFilter(): void { + switch (this.filter) { + case 'overdue': + this.dataFrom = -14; + this.dataTo = 0; + break; + case 'next7days': + this.dataFrom = 0; + this.dataTo = 7; + break; + case 'next30days': + this.dataFrom = 0; + this.dataTo = 30; + break; + case 'next3months': + this.dataFrom = 0; + this.dataTo = 90; + break; + case 'next6months': + this.dataFrom = 0; + this.dataTo = 180; + break; + default: + case 'all': + this.dataFrom = -14; + this.dataTo = undefined; + break; + } + } + /** * Change timeline sort being viewed. */ diff --git a/src/addon/block/timeline/lang/en.json b/src/addon/block/timeline/lang/en.json index 86041e79f..390595490 100644 --- a/src/addon/block/timeline/lang/en.json +++ b/src/addon/block/timeline/lang/en.json @@ -1,9 +1,12 @@ { - "next30days": "Next 30 days", - "next7days": "Next 7 days", + "duedate": "Due date", "nocoursesinprogress": "No in progress courses", "noevents": "No upcoming activities due", - "recentlyoverdue": "Recently overdue", + "next30days": "Next 30 days", + "next7days": "Next 7 days", + "next3months": "Next 3 months", + "next6months": "Next 6 months", + "overdue": "Overdue", "sortbycourses": "Sort by courses", "sortbydates": "Sort by dates" } \ No newline at end of file diff --git a/src/app/app.scss b/src/app/app.scss index d465feaf8..82c111abd 100644 --- a/src/app/app.scss +++ b/src/app/app.scss @@ -417,12 +417,7 @@ ion-app.app-root { margin: 0; } - // Ionic fix. Button can occupy all page if not. - ion-select { - position: relative; - } - - ion-col ion-select { + ion-col ion-select:not([text-start]) { @include float(end); max-width: none; width: 100%; @@ -432,7 +427,12 @@ ion-app.app-root { } } + .item-radio-disabled ion-radio[ng-reflect-value="disabled"]{ + display: none; + } + ion-select { + position: relative; // Ionic fix. Button can occupy all page if not. color: $core-select-placeholder-color; align-self: start; diff --git a/src/assets/lang/en.json b/src/assets/lang/en.json index 5dc417e25..3b9112a85 100644 --- a/src/assets/lang/en.json +++ b/src/assets/lang/en.json @@ -17,11 +17,14 @@ "addon.block_myoverview.nocoursesinprogress": "No in progress courses", "addon.block_myoverview.nocoursespast": "No past courses", "addon.block_myoverview.past": "Past", + "addon.block_timeline.duedate": "Due date", "addon.block_timeline.next30days": "Next 30 days", + "addon.block_timeline.next3months": "Next 3 months", + "addon.block_timeline.next6months": "Next 6 months", "addon.block_timeline.next7days": "Next 7 days", "addon.block_timeline.nocoursesinprogress": "No in progress courses", "addon.block_timeline.noevents": "No upcoming activities due", - "addon.block_timeline.recentlyoverdue": "Recently overdue", + "addon.block_timeline.overdue": "Overdue", "addon.block_timeline.sortbycourses": "Sort by courses", "addon.block_timeline.sortbydates": "Sort by dates", "addon.calendar.calendar": "Calendar", @@ -1058,6 +1061,7 @@ "core.accounts": "Accounts", "core.add": "Add", "core.agelocationverification": "Age and location verification", + "core.all": "All", "core.allparticipants": "All participants", "core.android": "Android", "core.answer": "Answer", diff --git a/src/components/empty-box/core-empty-box.html b/src/components/empty-box/core-empty-box.html index 6c23d5e9b..f131769f5 100644 --- a/src/components/empty-box/core-empty-box.html +++ b/src/components/empty-box/core-empty-box.html @@ -1,4 +1,4 @@ -
+
diff --git a/src/components/empty-box/empty-box.scss b/src/components/empty-box/empty-box.scss index 2dbb4f072..14b4e1b93 100644 --- a/src/components/empty-box/empty-box.scss +++ b/src/components/empty-box/empty-box.scss @@ -33,6 +33,7 @@ ion-app.app-root core-empty-box { img { height: 125px; width: 145px; + margin: 0 auto; } p { font-size: 120%; diff --git a/src/components/empty-box/empty-box.ts b/src/components/empty-box/empty-box.ts index a1b95fcc5..0d9fdd7ec 100644 --- a/src/components/empty-box/empty-box.ts +++ b/src/components/empty-box/empty-box.ts @@ -28,6 +28,8 @@ export class CoreEmptyBoxComponent { @Input() message: string; // Message to display. @Input() icon?: string; // Name of the icon to use. @Input() image?: string; // Image source. If an icon is provided, image won't be used. + @Input() inline?: boolean; // If this has to be shown inline instead of occupying whole page. + // If image or icon is not supplied, it's true by default. constructor() { // Nothing to do. diff --git a/src/core/courses/components/course-progress/course-progress.scss b/src/core/courses/components/course-progress/course-progress.scss index 3546320be..241553bd5 100644 --- a/src/core/courses/components/course-progress/course-progress.scss +++ b/src/core/courses/components/course-progress/course-progress.scss @@ -48,6 +48,15 @@ ion-app.app-root core-courses-course-progress { .label { @include margin(0, 0, 0, null); } + ion-item-divider .label-md { + @extend .label-md; + } + ion-item-divider .label-wp { + @extend .label-wp; + } + ion-item-divider .label-ios { + @extend .label-ios; + } } button { diff --git a/src/lang/en.json b/src/lang/en.json index 4e165a8b6..0217f3484 100644 --- a/src/lang/en.json +++ b/src/lang/en.json @@ -1,6 +1,7 @@ { "accounts": "Accounts", "add": "Add", + "all": "All", "agelocationverification": "Age and location verification", "allparticipants": "All participants", "android": "Android", diff --git a/src/providers/utils/time.ts b/src/providers/utils/time.ts index 8ab41f1f9..e1fb8aca1 100644 --- a/src/providers/utils/time.ts +++ b/src/providers/utils/time.ts @@ -163,4 +163,21 @@ export class CoreTimeUtilsProvider { getLocalizedDateFormat(localizedFormat: any): string { return moment.localeData().longDateFormat(localizedFormat); } + + /** + * For a given timestamp get the midnight value in the user's timezone. + * + * The calculation is performed relative to the user's midnight timestamp + * for today to ensure that timezones are preserved. + * + * @param {number} [timestamp] The timestamp to calculate from. If not defined, return today's midnight. + * @return {number} The midnight value of the user's timestamp. + */ + getMidnightForTimestamp(timestamp?: number): number { + if (timestamp) { + return moment(timestamp * 1000).startOf('day').unix(); + } else { + return moment().startOf('day').unix(); + } + } }