diff --git a/amd/src/block_mytreestudyplan.js b/amd/src/block_mytreestudyplan.js index 1070f19..75a37d7 100644 --- a/amd/src/block_mytreestudyplan.js +++ b/amd/src/block_mytreestudyplan.js @@ -42,7 +42,7 @@ let strings = load_strings({ * @param {string} type Type of page to show * @param {Object} arg Arguments passed */ - export function init(type="myreport",arg) { + export function init(type="own",arg) { // Save time by only starting up the Vue app if the required block element is present const blockelement = document.getElementById('block_mytreestudyplan'); if(blockelement){ @@ -50,52 +50,7 @@ let strings = load_strings({ el: '#block_mytreestudyplan', data: { "studyplans": [], - }, - mounted() { - let call_method; - let call_args; - if(type == "teacher"){ - call_method = 'local_treestudyplan_get_teacher_studyplan'; - call_args = {}; - } - else if(type == "teaching"){ - call_method = 'local_treestudyplan_get_teaching_studyplans'; - call_args = {}; - } - else{ - call_method = 'local_treestudyplan_get_own_studyplan'; - call_args = {}; - } - call([{ - methodname: call_method, - args: call_args - }])[0].done(function(response){ - debug.info("Studyplans:",response); - const timingval = { future: 0, present: 1, past: 2, }; - response.sort((a,b) => { - const timinga = TSComponents.studyplanTiming(a); - const timingb = TSComponents.studyplanTiming(b); - - let t = timingval[timinga] - timingval[timingb]; - if(t == 0){ - // sort by start date if timing is equal - t = new Date(b.startdate).getTime() - new Date(a.startdate).getTime(); - - if (t == 0) { - // sort by name if timing is equal - t = a.name.localeCompare(b.name); - } - } - return t; - }); - app.studyplans = ProcessStudyplans(response); - }).fail(notification.exception); - - }, - created() { - - }, - updated() { + "type" : type, }, methods: { diff --git a/lang/en/block_mytreestudyplan.php b/lang/en/block_mytreestudyplan.php index c69828a..aae78fe 100644 --- a/lang/en/block_mytreestudyplan.php +++ b/lang/en/block_mytreestudyplan.php @@ -20,8 +20,8 @@ * @license https://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -$string['pluginname'] = 'My Treestudyplan'; -$string['mytreestudyplan'] = 'MyTreestudyplan'; +$string['pluginname'] = 'My studyplan'; +$string['mytreestudyplan'] = 'My studyplan'; $string['title'] = 'My Studyplan'; $string['mytreestudyplan:addinstance'] = 'Add my studyplan block'; diff --git a/lang/nl/block_mytreestudyplan.php b/lang/nl/block_mytreestudyplan.php index 4328e7c..c6031ef 100644 --- a/lang/nl/block_mytreestudyplan.php +++ b/lang/nl/block_mytreestudyplan.php @@ -20,8 +20,8 @@ * @license https://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -$string['pluginname'] = 'Mijn Treestudyplan'; -$string['mytreestudyplan'] = 'MyTreestudyplan'; -$string['title'] = 'Mijn Studieplan'; +$string['pluginname'] = 'Mijn studieplan'; +$string['mytreestudyplan'] = 'My studieplan'; +$string['title'] = 'Mijn studieplan'; $string['mytreestudyplan:addinstance'] = 'Voeg mijn studieplan block toe'; diff --git a/templates/block.mustache b/templates/block.mustache index 7bcc047..712833a 100644 --- a/templates/block.mustache +++ b/templates/block.mustache @@ -41,10 +41,10 @@