Updated block to new myreport view

This commit is contained in:
PMKuipers 2023-11-27 20:54:14 +01:00
parent 919ec571c8
commit 00b5753b72
5 changed files with 11 additions and 56 deletions

View File

@ -42,7 +42,7 @@ let strings = load_strings({
* @param {string} type Type of page to show * @param {string} type Type of page to show
* @param {Object} arg Arguments passed * @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 // Save time by only starting up the Vue app if the required block element is present
const blockelement = document.getElementById('block_mytreestudyplan'); const blockelement = document.getElementById('block_mytreestudyplan');
if(blockelement){ if(blockelement){
@ -50,52 +50,7 @@ let strings = load_strings({
el: '#block_mytreestudyplan', el: '#block_mytreestudyplan',
data: { data: {
"studyplans": [], "studyplans": [],
}, "type" : type,
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() {
}, },
methods: { methods: {

View File

@ -20,8 +20,8 @@
* @license https://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @license https://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/ */
$string['pluginname'] = 'My Treestudyplan'; $string['pluginname'] = 'My studyplan';
$string['mytreestudyplan'] = 'MyTreestudyplan'; $string['mytreestudyplan'] = 'My studyplan';
$string['title'] = 'My Studyplan'; $string['title'] = 'My Studyplan';
$string['mytreestudyplan:addinstance'] = 'Add my studyplan block'; $string['mytreestudyplan:addinstance'] = 'Add my studyplan block';

View File

@ -20,8 +20,8 @@
* @license https://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @license https://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/ */
$string['pluginname'] = 'Mijn Treestudyplan'; $string['pluginname'] = 'Mijn studieplan';
$string['mytreestudyplan'] = 'MyTreestudyplan'; $string['mytreestudyplan'] = 'My studieplan';
$string['title'] = 'Mijn Studieplan'; $string['title'] = 'Mijn studieplan';
$string['mytreestudyplan:addinstance'] = 'Voeg mijn studieplan block toe'; $string['mytreestudyplan:addinstance'] = 'Voeg mijn studieplan block toe';

View File

@ -41,10 +41,10 @@
</div> </div>
<div v-cloak> <div v-cloak>
{{^teachermode}} {{^teachermode}}
<r-report v-model='studyplans'></r-report> <r-report type="own"></r-report>
{{/teachermode}} {{/teachermode}}
{{#teachermode}} {{#teachermode}}
<r-report v-model='studyplans' teachermode></r-report> <r-report type='teaching' teachermode></r-report>
{{/teachermode}} {{/teachermode}}
</div> </div>

View File

@ -22,7 +22,7 @@
defined('MOODLE_INTERNAL') || die(); defined('MOODLE_INTERNAL') || die();
$plugin->component = 'block_mytreestudyplan'; // Recommended since 2.0.2 (MDL-26035). Required since 3.0 (MDL-48494). $plugin->component = 'block_mytreestudyplan'; // Recommended since 2.0.2 (MDL-26035). Required since 3.0 (MDL-48494).
$plugin->version = 2023090800; // YYYYMMDDHH (year, month, day, iteration). $plugin->version = 2023112700; // YYYYMMDDHH (year, month, day, iteration).
$plugin->requires = 2021051700; // YYYYMMDDHH (This is the release version for Moodle 3.11). $plugin->requires = 2021051700; // YYYYMMDDHH (This is the release version for Moodle 3.11).
$plugin->release = "1.0.0"; $plugin->release = "1.0.0";
@ -31,5 +31,5 @@ $plugin->maturity = MATURITY_RC;
$plugin->supported = [ 311, 401 ]; $plugin->supported = [ 311, 401 ];
$plugin->dependencies = [ $plugin->dependencies = [
'local_treestudyplan' => 2023090700, 'local_treestudyplan' => 2023112400,
]; ];