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

Merge pull request #3017 from crazyserver/MOBILE-3900 

MOBILE-3900 myoverview: Honour course graces periods
main
Dani Palou 2021-12-09 08:12:12 +01:00 committed by GitHub
parent 9ac9a5f5c2 53ce905a9c
commit 0ebff55ae3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/addons/block/myoverview/components/myoverview/myoverview.ts
View File

@ -29,6 +29,7 @@ import { CoreTextUtils } from '@services/utils/text';
import { AddonCourseCompletion } from '@/addons/coursecompletion/services/coursecompletion'; import { AddonCourseCompletion } from '@/addons/coursecompletion/services/coursecompletion';
import { AddonBlockMyOverviewFilterOptionsComponent } from '../filteroptions/filteroptions'; import { AddonBlockMyOverviewFilterOptionsComponent } from '../filteroptions/filteroptions';
import { IonSearchbar } from '@ionic/angular'; import { IonSearchbar } from '@ionic/angular';
import moment from 'moment';
const FILTER_PRIORITY: AddonBlockMyOverviewTimeFilters[] = ['all', 'inprogress', 'future', 'past']; const FILTER_PRIORITY: AddonBlockMyOverviewTimeFilters[] = ['all', 'inprogress', 'future', 'past'];
@ -98,6 +99,8 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
protected coursesObserver?: CoreEventObserver; protected coursesObserver?: CoreEventObserver;
protected updateSiteObserver?: CoreEventObserver; protected updateSiteObserver?: CoreEventObserver;
protected fetchContentDefaultError = 'Error getting my overview data.'; protected fetchContentDefaultError = 'Error getting my overview data.';
protected gradePeriodAfter = 0;
protected gradePeriodBefore = 0;
constructor() { constructor() {
super('AddonBlockMyOverviewComponent'); super('AddonBlockMyOverviewComponent');
@ -261,6 +264,9 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
this.hasCourses = this.allCourses.length > 0; this.hasCourses = this.allCourses.length > 0;
this.gradePeriodAfter = parseInt(await this.currentSite.getConfig('coursegraceperiodafter', refresh), 10) || 0;
this.gradePeriodBefore = parseInt(await this.currentSite.getConfig('coursegraceperiodbefore', refresh), 10) || 0;
this.loadSort(); this.loadSort();
this.loadLayouts(config?.layouts?.value.split(',')); this.loadLayouts(config?.layouts?.value.split(','));
this.loadFilters(config); this.loadFilters(config);
@ -507,14 +513,15 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
// Time filter, favourite and hidden. // Time filter, favourite and hidden.
const today = CoreTimeUtils.timestamp(); const today = CoreTimeUtils.timestamp();
this.filteredCourses = this.filteredCourses.filter((course) => { this.filteredCourses = this.filteredCourses.filter((course) => {
let include = timeFilter == 'all'; let include = timeFilter == 'all';
if (!include) { if (!include) {
if ((course.enddate && course.enddate < today) || course.completed) { if ((course.enddate && this.courseClassifyEndDate(course.enddate) < today) || course.completed) {
// Courses that have already ended. // Courses that have already ended.
include = timeFilter == 'past'; include = timeFilter == 'past';
} else if (course.startdate && course.startdate > today) { } else if (course.startdate && this.courseClassifyStartDate(course.startdate) > today) {
// Courses that have not started yet. // Courses that have not started yet.
include = timeFilter == 'future'; include = timeFilter == 'future';
} else { } else {
@ -554,6 +561,26 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
this.initPrefetchCoursesIcons(); this.initPrefetchCoursesIcons();
} }
/**
* This function calculates the end date to use for display classification purposes, incorporating the grace period, if any.
*
* @param endDate Course end date.
* @return The new enddate.
*/
protected courseClassifyEndDate(endDate: number): number {
return moment(endDate).add(this.gradePeriodAfter, 'days').valueOf();
}
/**
* This function calculates the start date to use for display classification purposes, incorporating the grace period, if any.
*
* @param startDate Course start date.
* @return The new startdate.
*/
protected courseClassifyStartDate(startDate: number): number {
return moment(startDate).subtract(this.gradePeriodBefore, 'days').valueOf();
}
/** /**
* Sort courses * Sort courses
* *