From 66aee35fd60522b4bf3509698b70f63f24be750a Mon Sep 17 00:00:00 2001 From: Myriam Delaruelle <Myriam Delaruelle@bdn-un-mdelarue.ad.univ-lorraine.fr> Date: Tue, 1 Mar 2022 15:22:47 +0100 Subject: [PATCH] =?UTF-8?q?ajout=20d'un=20lien=20de=20navigation=20pour=20?= =?UTF-8?q?revenir=20au=20bon=20dashboard=20depuis=20comp=C3=A9tence/?= =?UTF-8?q?=C3=A9tudiant?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- competency_iena_competencies_2.php | 2 +- competency_iena_competency_students_2.php | 2 +- course_competency.php | 9 ++++++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/competency_iena_competencies_2.php b/competency_iena_competencies_2.php index 33558b1..1695256 100644 --- a/competency_iena_competencies_2.php +++ b/competency_iena_competencies_2.php @@ -167,7 +167,7 @@ foreach ($user_course_competencies as $user_course_competency) { $user_course_competency->proficient_class = $user_course_competency->get('proficiency') == 1 ? " list-group-item-success" : ""; $user_course_competency->proficient_str = $user_course_competency->get('proficiency') == 1 ? "Oui" : "Non"; $user_course_competency->shortname=$cpt->get('shortname'); - $user_course_competency->link=$CFG->wwwroot."/blocks/competency_iena/course_competency.php?courseid=".$COURSE->id."&studentid=".$student->studentid."&competencyid=".$cpt->get('id'); + $user_course_competency->link=$CFG->wwwroot."/blocks/competency_iena/course_competency.php?courseid=".$COURSE->id."&studentid=".$student->studentid."&competencyid=".$cpt->get('id')."&from=students"; foreach ($reviews_data as $review) { if ( $review->competencyid == $cpt->get('id') ) { $user_course_competency->review_asked=true; diff --git a/competency_iena_competency_students_2.php b/competency_iena_competency_students_2.php index 2e1e2a2..3536d7f 100644 --- a/competency_iena_competency_students_2.php +++ b/competency_iena_competency_students_2.php @@ -335,7 +335,7 @@ if (count($course_cpts) > 0) { $cpt_stud->grade_d = $cpt_stud->grade == NULL ? "-" : $current_cpt->scale[$cpt_stud->grade - 1]; $cpt_stud->proficiency_d = $cpt_stud->proficiency == 1 ? get_string("yes") : get_string("no"); - $cpt_stud->link_cpt=$CFG->wwwroot."/blocks/competency_iena/course_competency.php?courseid=".$courseid."&studentid=".$cpt_stud->id."&competencyid=".$current_cpt->id; + $cpt_stud->link_cpt=$CFG->wwwroot."/blocks/competency_iena/course_competency.php?courseid=".$courseid."&studentid=".$cpt_stud->id."&competencyid=".$current_cpt->id.'&from=competency'; $cpt_stud->link_assess=$CFG->wwwroot."/blocks/competency_iena/competency_iena_competency_students_2.php?courseid=".$courseid."&studentid=".$cpt_stud->id."&competencyid=".$current_cpt->id; if(isset($cpt_stud->grade)){ $cpt_stud->link_assess.="&grade=".$cpt_stud->grade; diff --git a/course_competency.php b/course_competency.php index 7f70dfb..a1b4fde 100644 --- a/course_competency.php +++ b/course_competency.php @@ -7,6 +7,7 @@ global $USER, $COURSE; $courseid = required_param('courseid', PARAM_INT); $studentid = required_param('studentid', PARAM_INT); $competencyid = required_param('competencyid', PARAM_INT); +$from = optional_param('from', '', PARAM_TEXT); $url = new moodle_url('/blocks/competency_iena/course_competency.php', array('courseid' => $courseid, 'studentid' => $studentid, 'competencyid' => $competencyid)); @@ -24,7 +25,13 @@ $PAGE->requires->js("/blocks/competency_iena/js/cpt-stud-course.js"); $context = context_course::instance($courseid); $coursenode = $PAGE->navigation->find($courseid, navigation_node::TYPE_COURSE); -$thingnode = $coursenode->add(get_string('details_competency', 'block_competency_iena')); +if($from=="students"){ + $thingnode = $coursenode->add(get_string('dashboard_students', 'block_competency_iena'), new moodle_url('/blocks/competency_iena/competency_iena_competencies_2.php', array('courseid' => $courseid, 'studentid' => $studentid))); +} +elseif($from=="competency"){ + $thingnode = $coursenode->add(get_string('dashboard_competencies', 'block_competency_iena'), new moodle_url('/blocks/competency_iena/competency_iena_competency_students_2.php', array('courseid' => $courseid, 'competencyid' => $competencyid))); +} +$thingnode = $thingnode->add(get_string('details_competency', 'block_competency_iena')); $thingnode->make_active(); /* Check if studentid is a course participant */ $is_enrolled = is_enrolled($context, $studentid, '', true); -- GitLab