diff --git a/course_competency.php b/course_competency.php index 59f3f79303553f670412e3962399c32063cfcdad..4f527d996c53e30b7eeb95b9c021a87a9e763226 100644 --- a/course_competency.php +++ b/course_competency.php @@ -57,7 +57,7 @@ $review_asked = count($reviews_data) > 0 ? true : false; /* POST EVALUATION */ if ( isset($_POST['grade']) ) { - $note = "Évaluation donnée pour le cours {$COURSE->fullname} par {$USER->firstname} {$USER->lastname}. " . $_POST['note']; + $note = $_POST['note']; \core_competency\api::grade_competency_in_course($courseid, $studentid, $competencyid, $_POST['grade'], $note); if ( $review_asked ) { \core_competency\api::user_competency_start_review($studentid, $competencyid); @@ -261,7 +261,7 @@ echo ""; /* END review and grade ASK and ACTION - col */ echo ""; /* END review and grade ASK and ACTION - alert */ echo ""; /* END evaluation info and actions row */ -/* GRADES HISTORY CHART */ +/* GRADES AND EVIDENCES HISTORY CHART AND LIST */ // quelle différence // read_user_evidence($id) @@ -283,30 +283,176 @@ echo ""; /* END evaluation info and actions row */ // OKOK + + +/* Utilisation des renderer du /admin/tool/lp/class/output pour obtenir toutes les données d'historique construites et organisées */ +/* Dabord dans le cours, puis dans l'absolu pour les différencier / filtrer */ + +$tool_lp_renderer = $PAGE->get_renderer('tool_lp'); + +$user_cpt_course_data = new \tool_lp\output\user_competency_summary_in_course($studentid, $competencyid, $courseid); +$user_cpt_course_data = $user_cpt_course_data->export_for_template($tool_lp_renderer); +$course_evidences = $user_cpt_course_data->usercompetencysummary->evidence; +$course_evidences_ids = array(); +foreach ($course_evidences as $course_evidence) { + $course_evidences_ids[] = $course_evidence->id; +} + +$user_competency = \core_competency\api::get_user_competency($studentid, $competencyid); +$user_cpt_all_data = new \tool_lp\output\user_competency_summary($user_competency); +$user_cpt_all_data = $user_cpt_all_data->export_for_template($tool_lp_renderer); +$all_evidences = $user_cpt_all_data->evidence; + +echo "
"; +echo "
"; +echo "

Historique

"; +echo ""; +echo "
"; +echo ";"; +echo "
"; + +echo "
";
+var_dump($course_evidences_ids);
+print_r($all_evidences);
+echo "
"; + +/* + +TODO : + +Remonter ces données en haut et commenter les données préalablement récupérées d'une autre manière devenues superflues avec celles-ci. Ca réduira l'impact du chargement de la page. Et ça sera plus propre et plus concis. Quand-même garder les éléments en commentaire au cas où les exporteurs sautent dans les prochaines versions de MOODLE. + +*/ + + +// echo $output_lp->render($cpt_base_page); + + + + + + +/* Data */ $course_evidencies = \core_competency\api::list_evidence_in_course($studentid, $courseid, $competencyid, $sort = 'timecreated', $order = 'DESC', $skip = 0, $limit = 0); $all_evidencies = \core_competency\api::list_evidence($studentid, $competencyid, $planid = 0, $sort = 'timecreated', $order = 'DESC', $skip = 0, $limit = 0); +$evidences = array(); +foreach ($course_evidencies as $course_ev) { + $ev = new stdClass(); + // echo "
";
+	// var_dump($course_ev);
+	// echo "
"; + $ev->id = $course_ev->get('id'); + $ev->usercompetencyid = $course_ev->get('usercompetencyid'); + $ev->contextid = $course_ev->get('contextid'); + $ev->actionuserid = $course_ev->get('actionuserid'); + $ev->descidentifier = $course_ev->get('descidentifier'); /* nature de l'événement */ + // $course_ev->get('actionuserid') + $ev->out = $course_ev->get_description()->out(); + $evidences[] = $ev; +} + +foreach ($evidences as $ev) { + // echo "

{$ev->out}

"; +} + +// $user_competency_summary_in_course = new \tool_lp\output\user_competency_summary_in_course($studentid, $competencyid, $courseid); +// $dataSumCourse = $user_competency_summary_in_course->export_for_template(new renderer_base(new moodle_page(), 'autre')); +// var_dump($dataSumCourse); + + $labels = array(); $series_data = array(); $series_data_all = array(); foreach ($all_evidencies as $evidence) { - echo ""; } -echo "
";
+// echo "
";
 // var_dump($context->__get('id'));
 // var_dump($all_evidencies);
 // var_dump($series_data);
 // var_dump($series_data_all);
 // var_dump($labels);
-echo "
";
+// echo "
"; // OK OK END @@ -345,15 +491,24 @@ echo ""; echo "
"; _html('h2', "Historique d'évaluation", "h3"); -$chart = new core\chart_bar(); -// $chart->get_yaxis(0, true)->set_label("I'm the label for Y"); -$chart->get_yaxis(0, true)->set_labels(["Non évaluant", "Non compétent", "Compétent"]); -$series = new core\chart_series('Donnée dans ce cours', array_reverse($series_data)); -$series_all = new core\chart_series("Donnée dans d'autres cours", array_reverse($series_data_all)); -$chart->add_series($series); -$chart->add_series($series_all); -$chart->set_labels(array_reverse($labels)); -echo $OUTPUT->render($chart); +// $chart = new core\chart_line(); +// $chart->get_yaxis(0, true)->set_labels(["Non évaluant", "Non compétent", "Compétent"]); +// $series = new core\chart_series('Donnée dans ce cours', array_reverse($series_data)); +// $series_all = new core\chart_series("Donnée dans d'autres cours", array_reverse($series_data_all)); +// $chart->add_series($series); +// $chart->add_series($series_all); +// $chart->set_labels(array_reverse($labels)); +// echo $OUTPUT->render($chart); +// echo "
"; + +// $chart = new core\chart_bar(); +// $chart->get_yaxis(0, true)->set_labels(["Non évaluant", "Non compétent", "Compétent"]); +// $series = new core\chart_series('Donnée dans ce cours', array_reverse($series_data)); +// $series_all = new core\chart_series("Donnée dans d'autres cours", array_reverse($series_data_all)); +// $chart->add_series($series); +// $chart->add_series($series_all); +// $chart->set_labels(array_reverse($labels)); +// echo $OUTPUT->render($chart); echo "
"; /* LINKED MODULES */