diff --git a/notemyprogress/ajax.php b/notemyprogress/ajax.php
index 1420ef680bb5972cc2d74c506a21bf162638e539..26fa2e3f4d8411bc337c05824c111576dca38917 100644
--- a/notemyprogress/ajax.php
+++ b/notemyprogress/ajax.php
@@ -105,6 +105,7 @@ if($action == 'saveconfigweek') {//Exemple: if the action passed is saveconfigwe
array_push($params, $newinstance);
if($weeks && $courseid && $userid){
+
$func = "local_notemyprogress_save_weeks_config"; //this function must be contained in localib.php
}
} elseif ($action == 'changegroup') {
@@ -408,7 +409,6 @@ function local_sr_update_lastweek($courseid, $userid, $lastweekid, $classroom_ho
local_notemyprogress_ajax_response(array('response_update_last_week' => $lastweekresponse));
}
-
function local_notemyprogress_logsNMP($beginDate, $lastDate, $courseid, $userid, $currentUrl) {
$logs = new \local_notemyprogress\logs($courseid, $userid);
$logs->addLogsNMP("downloaded", "logfile", "LOGFILES", "nmp", $currentUrl, "File that contains all the activities performed on the moodle course in a time interval");
diff --git a/notemyprogress/amd/build/metareflexion.js b/notemyprogress/amd/build/metareflexion.js
index f98a13c7217b65a0b441cc650af31dbdb4eb20ca..e8ec57e045d1fe230f2eba27e2764bcd62306b62 100644
--- a/notemyprogress/amd/build/metareflexion.js
+++ b/notemyprogress/amd/build/metareflexion.js
@@ -251,10 +251,6 @@ define([
this.paginator_week = page;
}
});
- setTimeout(function () {
- vue.setGraphicsEventListeners();
- }, 500);
- vue.setGraphicsEventListeners();
// if (typeof this.past_week.id != "undefined") {
// this.disabled_form = true;
// }
@@ -886,7 +882,6 @@ define([
courseid: this.courseid,
weekcode: course_module.weekcode,
userid: this.userid,
- url: this.url,
};
//console.log("data = ");
//console.log(data);
@@ -924,7 +919,6 @@ define([
userid: this.userid,
courseid: this.courseid,
weekcode: course_module.weekcode,
- url: this.url,
hours:
this.current_week[0].weekly_schedules_hours.horas_planificadas,
@@ -1219,62 +1213,6 @@ define([
// //console.log(this.past_week);
},
},
- setGraphicsEventListeners() {
- let graphics = document.querySelectorAll(".highcharts-container");
- if (graphics.length < 1) {
- setTimeout(vue.setGraphicsEventListeners, 500);
- } else {
- graphics[0].id = "EfficiencyChart";
- graphics.forEach((graph) => {
- graph.addEventListener("mouseenter", vue.addLogsViewGraphic);
- });
- }
- },
- addLogsViewGraphic(e) {
- event.stopPropagation();
- var action = "";
- var objectName = "";
- var objectType = "";
- var objectDescription = "";
- switch (e.target.id) {
- case "EfficiencyChart":
- action = "viewed";
- objectName = "refection_chart";
- objectType = "chart";
- objectDescription = "Bar chart";
- break;
- default:
- action = "viewed";
- objectName = "";
- objectType = "chart";
- objectDescription = "A chart";
- break;
- }
- vue.addLogsIntoDB(action, objectName, objectType, objectDescription);
- },
- addLogsIntoDB(action, objectName, objectType, objectDescription) {
- let data = {
- courseid: content.courseid,
- userid: content.userid,
- action: "addLogs",
- sectionname: "META_REFLECTION",
- actiontype: action,
- objectType: objectType,
- objectName: objectName,
- currentUrl: document.location.href,
- objectDescription: objectDescription,
- };
- Axios({
- method: "get",
- url: M.cfg.wwwroot + "/local/notemyprogress/ajax.php",
- params: data,
- })
- .then((response) => {
- if (response.status == 200 && response.data.ok) {
- }
- })
- .catch((e) => {});
- },
});
}
diff --git a/notemyprogress/amd/build/setweeks.js b/notemyprogress/amd/build/setweeks.js
index dff0006c7ec3f59ec48cfc312b17d982ee9078de..97747ff54aaaec5c2f70c023b3278d342eb12f20 100644
--- a/notemyprogress/amd/build/setweeks.js
+++ b/notemyprogress/amd/build/setweeks.js
@@ -211,9 +211,9 @@ define([
newinstance: this.new_group,
weeks: this.minify_query(weeks), // Stringify is a hack to clone object :D
};
- //console.log(data.newinstance);
+
Axios({
- method: "post",
+ method: "get",
url: M.cfg.wwwroot + "/local/notemyprogress/ajax.php",
params: data,
})
diff --git a/notemyprogress/classes/lib_trait.php b/notemyprogress/classes/lib_trait.php
index 6cf0537022a54ce834b8e0a3ee1ee08ec7e3f7d7..ec343fcdbc778058cba2704c72334645fc6e0cd0 100644
--- a/notemyprogress/classes/lib_trait.php
+++ b/notemyprogress/classes/lib_trait.php
@@ -257,17 +257,14 @@ trait lib_trait
{
global $DB;
$sql = "select sequence from {course_sections} where id = ?";
- $sequence = $DB->get_record_sql($sql, array($sectionid));
- //debug_text::print("sequence", $sequence);
+ $sequence = $DB->get_record_sql($sql, array($sectionid));
$course_modules = self::get_course_module_section($sequence->sequence);
- //debug_text::print("course_modules", $course_modules);
+
return $course_modules;
}
public function get_course_module_section($sequence)
{
- // //file_put_contents('D:\Alexis\Stage_IRIT\NMP\debug\log.txt', print_r("sequence = \r\n", TRUE), FILE_APPEND);
- // //file_put_contents('D:\Alexis\Stage_IRIT\NMP\debug\log.txt', print_r($sequence, TRUE), FILE_APPEND);
$sequence = explode(',', $sequence);
$course_modules = array();
foreach ($sequence as $key => $course_module_id) {
diff --git a/notemyprogress/classes/metareflexion.php b/notemyprogress/classes/metareflexion.php
index f66991f3037309dd1969c2fee89d01e6368b0463..1ca592a8a404985831529ba9c5de54b2c1bcace3 100644
--- a/notemyprogress/classes/metareflexion.php
+++ b/notemyprogress/classes/metareflexion.php
@@ -166,18 +166,22 @@ class metareflexion
//debug_text::print("sectionid", $section->sectionid);
$course_modules = self::get_sequence_section($section->sectionid);
//debug_text::print("course_modules", $course_modules);
- foreach ($course_modules as $key => $cm) {
- //debug_text::print("cm", $cm);
- //if ($cm->modname == "resource") {
- //debug_text::print("resource");
- $cm->modname = self::get_resource_type($cm->id);
- // if ($current_wk_schedule) {
- // //debug_text::print("current_wk_schedule exists");
- // $days_committed_for_module = $this->get_days_committed($cm->id);
- // foreach ($days_committed_for_module as $key => $day) {
- // array_push($days_committed[$day->description], $cm->id);
- // }
- // }
+ if ($course_modules["0"] === false){
+ }
+ else{
+ foreach ($course_modules as $key => $cm) {
+ //debug_text::print("cm", $cm);
+ //if ($cm->modname == "resource") {
+ //debug_text::print("resource");
+ $cm->modname = self::get_resource_type($cm->id);
+ // if ($current_wk_schedule) {
+ // //debug_text::print("current_wk_schedule exists");
+ // $days_committed_for_module = $this->get_days_committed($cm->id);
+ // foreach ($days_committed_for_module as $key => $day) {
+ // array_push($days_committed[$day->description], $cm->id);
+ // }
+ // }
+ }
}
}
@@ -211,7 +215,7 @@ class metareflexion
$weekly_schedules_days->dias_trabajados = $dias_trabajados;
$current_week->weekly_schedules_days = $weekly_schedules_days;
- $current_week->weekly_schedules_hours = 1;
+ $current_week->weekly_schedules_hours = 0;
$current_week->weekly_cm = $course_modules;
$goals_cat = $this->get_goals_cat();
diff --git a/notemyprogress/db/install.php b/notemyprogress/db/install.php
index db2fce7688a7083b86b2e4a3e959484e1a08c8b8..f882841f9cfe0e75e5d38600b0e4a8b731ad7789 100644
--- a/notemyprogress/db/install.php
+++ b/notemyprogress/db/install.php
@@ -35,9 +35,9 @@ function xmldb_local_notemyprogress_install()
$goal1 = new stdClass();
$goal2 = new stdClass();
$goal3 = new stdClass();
- $goal1->description = "objectif 1";
- $goal2->description = "objectif 2";
- $goal3->description = "objectif 3";
+ $goal1->description = "goal1";
+ $goal2->description = "goal2";
+ $goal3->description = "goal3";
$DB->insert_record("notemyprogress_goals_ct", $goal1, true);
$DB->insert_record("notemyprogress_goals_ct", $goal2, true);
$DB->insert_record("notemyprogress_goals_ct", $goal3, true);
diff --git a/notemyprogress/lang/en/local_notemyprogress.php b/notemyprogress/lang/en/local_notemyprogress.php
index 60904628e29f932dd42edcd2e5f116c97d28616c..7ee94972c612d68ea43e990da507695dc6ab7319 100644
--- a/notemyprogress/lang/en/local_notemyprogress.php
+++ b/notemyprogress/lang/en/local_notemyprogress.php
@@ -866,6 +866,11 @@ $string['set_weeks_title'] = "Setting up the course weeks";
$string['set_weeks'] = "Configuration of the course weeks";
/*Metareflexion*/
+$string['metareflexion_goal1'] = "Learning something new";
+$string['metareflexion_goal2'] = "Reviewing what I’ve learned";
+$string['metareflexion_goal3'] = "Plan my learning";
+
+$string['metareflexion_no_modules_in_section'] = "This week has no modules";
$string['compare_with_course'] = "Compare my results with those of my colleagues";
$string['sr_menu_metareflexion'] = "Metareflexion";
$string['metareflexion_last_week_created'] = "Last week's reflections have been saved";
diff --git a/notemyprogress/lang/es/local_notemyprogress.php b/notemyprogress/lang/es/local_notemyprogress.php
index 12a9bf4224b3bff1a83d07a36a4bdc32b98970e0..736ea37bc8e04bed6c0edfc86ac479fe14a329ae 100644
--- a/notemyprogress/lang/es/local_notemyprogress.php
+++ b/notemyprogress/lang/es/local_notemyprogress.php
@@ -868,7 +868,11 @@ $string['notes_message_not_updated'] = 'No se ha podido actualizar la nota.';
/*Metareflexion*/
+$string['metareflexion_goal1'] = "Aprender cosas nuevas";
+$string['metareflexion_goal2'] = "Repasando lo que he visto";
+$string['metareflexion_goal3'] = "Planificar mi aprendizaje";
+$string['metareflexion_no_modules_in_section'] = "Esta semana no hay módulos";
$string['compare_with_course'] = "Comparar mis resultados con los de mis compañeros";
$string['sr_menu_metareflexion'] = "Metareflexión";
$string['metareflexion_last_week_created'] = 'Reflexiones de la semana pasada guardadas';
diff --git a/notemyprogress/lang/fr/local_notemyprogress.php b/notemyprogress/lang/fr/local_notemyprogress.php
index d52adb7ae7a52cbc53f405eae058194d56b29db0..b83d9764f1d71b51327da6faefa19d4e33af95d2 100644
--- a/notemyprogress/lang/fr/local_notemyprogress.php
+++ b/notemyprogress/lang/fr/local_notemyprogress.php
@@ -869,6 +869,12 @@ $string['notes_message_updated'] = "La note a été mise à jour";
$string['notes_message_not_updated'] = "Note n'a pas pu être mise à jour'";
/*Metareflexion*/
+
+$string['metareflexion_goal1'] = "Apprendre de nouvelles choses";
+$string['metareflexion_goal2'] = "Revoir ce que j'ai vu";
+$string['metareflexion_goal3'] = "Planifier mon apprentissage";
+
+$string['metareflexion_no_modules_in_section'] = "Cette semaine n'as pas de modules";
$string['compare_with_course'] = "Comparer mes résultats avec ceux de mes collègues";
$string['sr_menu_metareflexion'] = "Méta-réflexion";
$string['metareflexion_last_week_created'] = "Les réflexions de la semaine dernière ont été sauvegardées";
diff --git a/notemyprogress/metareflexion.php b/notemyprogress/metareflexion.php
index dd942332fd9571046628a01e9b42e95da8cb492d..9fae9410d31735c9b4ca2f6c97d97e0f5ad5f785 100644
--- a/notemyprogress/metareflexion.php
+++ b/notemyprogress/metareflexion.php
@@ -179,6 +179,9 @@ $content = [
"goals_reflexion_title" => get_string("metareflexion_goals_reflexion_title", "local_notemyprogress"),
"title_hours_plan" => get_string("metareflexion_title_hours_plan", "local_notemyprogress"),
"title_retrospective" => get_string("metareflexion_title_retrospective", "local_notemyprogress"),
+ "goal1" => get_string("metareflexion_goal1", "local_notemyprogress"),
+ "goal2" => get_string("metareflexion_goal2", "local_notemyprogress"),
+ "goal3" => get_string("metareflexion_goal3", "local_notemyprogress"),
),
//'indicators' => $reports->get_general_indicators(),
diff --git a/notemyprogress/templates/metareflexion.mustache b/notemyprogress/templates/metareflexion.mustache
index 1e2a0e6fae126945a9525f0f0abbc42688ff9bea..9720e6f78d1404258fc69582cebc749fe55f4651 100644
--- a/notemyprogress/templates/metareflexion.mustache
+++ b/notemyprogress/templates/metareflexion.mustache
@@ -35,7 +35,7 @@
<v-row v-for="(goal,index,key) in current_week[0].goals_categories" :key="key">
<v-col sm="8" offset-sm="2" class="pa-0">
<v-layout column>
- <v-checkbox :input-value="get_goal(goal.id)" :label="goal.description" @change="update_goal(goal.id,$event)"></v-checkbox>
+ <v-checkbox :input-value="get_goal(goal.id)" :label="strings[goal.description]" @change="update_goal(goal.id,$event)"></v-checkbox>
</v-layout>
</v-col>
</v-row>
@@ -48,7 +48,7 @@
<span class="ml-2 d-flex" v-text="strings.currentweek_dialog_daysdedicate"></span>
<v-row cols="12" md="6">
<v-layout>
- <template>
+ <template v-if="current_week[0].weekly_cm[0]">
<v-simple-table class="resource_list_week">
<template v-slot:default>
<thead>
@@ -78,6 +78,11 @@
</template>
</v-simple-table>
</template>
+ <template v-else>
+ <v-row cols="12" class="justify-center">
+ <span class="justify-center" v-text="strings.no_modules_in_section"></span>
+ </v-row>
+ </template>
</v-row>
</v-card-text>
@@ -102,13 +107,13 @@
<pagination :pages="pages" :name="strings.pagination_name" :nameseparator="strings.pagination_separator" @changepage="get_interaction_group" :title="strings.pagination_title"></pagination>
<v-card elevation="2">
<v-card-title class="justify-center"><h5 v-text="subtitle_reports_hours_label()"></h5></v-card-title>
- <v-card id="EfficiencyChart">
+ <v-card-text>
<chart
- :container="'invested_time'"
+ :container="'inverted_time'"
:chart="build_inverted_time_chart()"
:lang="strings.chart"
></chart>
- </v-card>
+ </v-card-text>
</v-card>
<v-divider></v-divider>