From 8f97198fc9cf0c5a732415a7ab8ae08812257b9e 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:55:48 +0100
Subject: [PATCH] =?UTF-8?q?fix=20demande=20d'=C3=A9valuation=20pour=20les?=
=?UTF-8?q?=20=C3=A9tudiants=20+=20css=20bouton?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
course_competency.php | 18 ++++++++++++------
.../dashboard_competency_student.mustache | 6 +++++-
2 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/course_competency.php b/course_competency.php
index a1b4fde..c393b76 100644
--- a/course_competency.php
+++ b/course_competency.php
@@ -9,7 +9,6 @@ $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));
$PAGE->set_url($url);
@@ -25,13 +24,19 @@ $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);
+
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)));
+ $thingnode = $thingnode->add(get_string('details_competency', 'block_competency_iena'));
}
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 = $thingnode->add(get_string('details_competency', 'block_competency_iena'));
+else{
+ $thingnode = $coursenode->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);
@@ -54,8 +59,8 @@ echo $OUTPUT->header();
/* <<< REVIEW DATA >>> */
-$sql_rev = "SELECT * FROM {competency_usercompcourse}
-WHERE userid = ? AND competencyid = ? AND courseid = ?";
+$sql_rev = "SELECT * FROM {competency_usercompcourse} ucc JOIN {competency_usercomp} uc ON uc.competencyid = ucc.competencyid
+WHERE ucc.userid = ? AND ucc.competencyid = ? AND ucc.courseid = ? AND uc.status=1 AND uc.userid = ucc.userid";
$reviews_data = $DB->get_records_sql($sql_rev, [$studentid, $competencyid, $courseid]);
$review_asked = count($reviews_data) > 0 ? true : false;
@@ -85,7 +90,7 @@ if ( isset($_POST['review']) ) {
\core_competency\api::user_competency_cancel_review_request($studentid, $competencyid);
}
/* Refresh review data */
- $reviews_data = $DB->get_records_sql($sql_rev, [$studentid, $competencyid, 1]);
+ $reviews_data = $DB->get_records_sql($sql_rev, [$studentid, $competencyid, $courseid]);
$review_asked = count($reviews_data) > 0 ? true : false;
}
@@ -349,6 +354,7 @@ if ( count($cm_ids) !== 0 ) {
}
$data=array();
+$data['review_asked']=$review_asked;
$data['is_enrolled']=$is_enrolled;
$data['link_switch']=$CFG->wwwroot."/blocks/competency_iena/course_competency.php";
$data['courseid']=$courseid;
@@ -380,7 +386,7 @@ if(isset($modules)){
$data['proficiency']=$proficiency;
$data['proficiency_class']=$proficiency_class;
$data['eval']=$eval;
-$data['review_asked']=$review_asked;
+
$renderer = $PAGE->get_renderer('block_competency_iena');
diff --git a/templates/dashboard_competency_student.mustache b/templates/dashboard_competency_student.mustache
index f36ba6e..74f24ae 100644
--- a/templates/dashboard_competency_student.mustache
+++ b/templates/dashboard_competency_student.mustache
@@ -66,23 +66,27 @@
{{#review_asked}}
<div class="iena-asked"><small class='review-badge'>Évaluation demandée</small></div>
{{^is_teacher}}
+ <div class="button-assess">
<form method='post' action='{{link_review}}' style='display: inline; margin-right: 1rem;'>
<input hidden style='display: none;' type='text' name='review' value='cancel'>
<button type='submit' class='btn btn-secondary'>Annuler la demande</button>
</form>
+ </div>
{{/is_teacher}}
{{/review_asked}}
{{^review_asked}}
{{^is_teacher}}
+ <div class="button-assess">
<form method='post' action='{{link_review}}' style='display: inline; margin-right: 1rem;'>
<input hidden style='display: none;' type='text' name='review' value='request'>
<button type='submit' class='btn btn-primary'>Demande d'évaluation</button>
</form>
+ </div>
{{/is_teacher}}
{{/review_asked}}
{{#is_teacher}}
<div class="button-assess">
- <button data-toggle='modal' data-target='#modal-assess' class='btn btn-primary'>Évaluer</button>
+ <button data-toggle='modal' data-target='#modal-assess' class='btn btn-primary'>Évaluer</button>
</div>
<div class='modal fade' id="modal-assess" tabindex='-1' role='dialog' aria-labelledby='exampleModalScrollableTitle' aria-hidden='true'>
<div class='modal-dialog modal-dialog-scrollable modal-dialog-centered' role='document'>
--
GitLab