Fixed bugs caused by code style optimising

revert Replaced wol link with ajax retrieval. Fixed local settings

amd/src/block_mytreestudyplan.js

@@ -1,8 +1,8 @@
-/*eslint no-var: "error" */
-/*eslint no-unused-vars: "off" */
-/*eslint linebreak-style: "off" */
-/*eslint no-trailing-spaces: "off" */
-/*eslint-env es6*/
+/* eslint no-var: "error" */
+/* eslint no-unused-vars: "off" */
+/* eslint linebreak-style: "off" */
+/* eslint no-trailing-spaces: "off" */
+/* eslint-env es6*/
 // Put this file in path/to/plugin/amd/src
 // You can call it anything you like
 
@@ -14,7 +14,7 @@ import RVComponents from 'local_treestudyplan/report-viewer-components';
 import TSComponents from 'local_treestudyplan/treestudyplan-components';
 import Debugger from 'local_treestudyplan/util/debugger';
 
-import {load_strings} from 'local_treestudyplan/util/string-helper';
+import {loadStrings} from 'local_treestudyplan/util/string-helper';
 import {ProcessStudyplans} from 'local_treestudyplan/studyplan-processor';
 
 import PortalVue from 'local_treestudyplan/portal-vue/portal-vue.esm';
@@ -28,9 +28,9 @@ Vue.use(BootstrapVue);
 let debug = new Debugger("mytreestudyplan");
 debug.enable();
 
-let strings = load_strings({
+let strings = loadStrings({
     studyplan: {
-        
+
     },
 });
 
@@ -42,66 +42,19 @@ 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){
+    if (blockelement) {
         const app = new Vue({
             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: {
-            
+
             },
         });
-    } 
+    }
 }
-
-

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';
 

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';
 

templates/block.mustache

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

version.php

@@ -22,7 +22,7 @@
 defined('MOODLE_INTERNAL') || die();
 
 $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 = 2024062800;  // YYYYMMDDHH (year, month, day, iteration).
 $plugin->requires = 2021051700; // YYYYMMDDHH (This is the release version for Moodle 3.11).
 
 $plugin->release = "1.0.0";
@@ -31,5 +31,5 @@ $plugin->maturity = MATURITY_RC;
 $plugin->supported = [ 311, 401 ];
 
 $plugin->dependencies = [
-    'local_treestudyplan' => 2023090700,
+    'local_treestudyplan' => 2024062800,
 ];