moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-58518 block_myoverview: use user's midnight for sort by courses

Browse source
This commit is contained in:
Ryan Wyllie 2017-05-02 02:52:36 +00:00
parent 405f8491e5
commit f31240ebdf
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
blocks/myoverview/amd/build/event_list_by_course.min.js vendored
View file

@ -1 +1 @@
define(["jquery","block_myoverview/event_list","block_myoverview/calendar_events_repository"],function(a,b,c){var d=86400,e={EVENTS_BY_COURSE_CONTAINER:'[data-region="course-events-container"]'},f=function(f){var g=f.find(e.EVENTS_BY_COURSE_CONTAINER);if(g.length){var h=f.attr("data-midnight"),i=h-14*d,j=g.attr("data-limit"),k=g.map(function(){return a(this).attr("data-course-id")}).get(),l=c.queryByCourses({courseids:k,starttime:i,limit:j});g.each(function(c,d){d=a(d);var e=d.attr("data-course-id"),f=d.find(b.rootSelector),g=a.Deferred();l.done(function(a){var b=[],c=a.groupedbycourse.filter(function(a){return a.courseid==e});c.length&&(b=c[0].events),g.resolve({events:b})}).fail(function(a){g.reject(a)}),b.load(f,g)})}};return{init:function(b){b=a(b),f(b)}}}); define(["jquery","block_myoverview/event_list","block_myoverview/calendar_events_repository"],function(a,b,c){var d=86400,e={EVENTS_BY_COURSE_CONTAINER:'[data-region="course-events-container"]',EVENT_LIST_CONTAINER:'[data-region="event-list-container"]'},f=function(f){var g=f.find(e.EVENTS_BY_COURSE_CONTAINER);if(g.length){var h=g.find(e.EVENT_LIST_CONTAINER).first(),i=h.attr("data-midnight"),j=i-14*d,k=h.attr("data-limit"),l=g.map(function(){return a(this).attr("data-course-id")}).get(),m=c.queryByCourses({courseids:l,starttime:j,limit:k});g.each(function(c,d){d=a(d);var e=d.attr("data-course-id"),f=d.find(b.rootSelector),g=a.Deferred();m.done(function(a){var b=[],c=a.groupedbycourse.filter(function(a){return a.courseid==e});c.length&&(b=c[0].events),g.resolve({events:b})}).fail(function(a){g.reject(a)}),b.load(f,g)})}};return{init:function(b){b=a(b),f(b)}}});

6
blocks/myoverview/amd/src/event_list_by_course.js
View file

@ -33,6 +33,7 @@ function($, EventList, EventsRepository) {
var SELECTORS = { var SELECTORS = {
EVENTS_BY_COURSE_CONTAINER: '[data-region="course-events-container"]', EVENTS_BY_COURSE_CONTAINER: '[data-region="course-events-container"]',
EVENT_LIST_CONTAINER: '[data-region="event-list-container"]',
}; };
/** /**
@ -48,9 +49,10 @@ function($, EventList, EventsRepository) {
return; return;
} }
var midnight = root.attr('data-midnight'); var eventList = courseBlocks.find(SELECTORS.EVENT_LIST_CONTAINER).first();
var midnight = eventList.attr('data-midnight');
var startTime = midnight - (14 * SECONDS_IN_DAY); var startTime = midnight - (14 * SECONDS_IN_DAY);
var limit = courseBlocks.attr('data-limit'); var limit = eventList.attr('data-limit');
var courseIds = courseBlocks.map(function() { var courseIds = courseBlocks.map(function() {
return $(this).attr('data-course-id'); return $(this).attr('data-course-id');
}).get(); }).get();