Skip to content
Snippets Groups Projects
Commit 0b9f4b14 authored by Thomas Fradet's avatar Thomas Fradet
Browse files

bugs divers

parent cc8530fe
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 109 additions and 68 deletions
CHANGELOG.md
+ 51
− 0
View file @ 0b9f4b14
...@@ -18,10 +18,61 @@ Dans l'accordéon qui permet de visualiser les niveaux supérieur dans le réfé ...@@ -18,10 +18,61 @@ Dans l'accordéon qui permet de visualiser les niveaux supérieur dans le réfé
## Bugs ## Bugs
### Block
#### 1
Variable non instanciée `$this->content->text = "";`.
[x] Solved
__#### 4__
La progression ne fonctionne plus. L'appel à la méthode suivante cause une suite d'erreur :
``` php
$apiComp = new \tool_lp\output\user_competency_summary_in_course($userID, $competenceId, $courseID);
try {
$data = $apiComp->export_for_template(new renderer_base(new moodle_page(), 'autre'));
}
```
__[ ] TODO__
### Page informations sur l'APC
#### 2
Notice: Trying to get property 'id' of non-object in /Applications/MAMP/htdocs/moodle37/blocks/competency_iena/view/view_competency_iena_competency_mgmt.php on line 83
Suppression de l'id du bouton qui fait appel à une propriété pas forcément présente (id du référentiel dont on provient si on arrive sur cette page depuis l'interface d'import d'une compétence dans le cours).
[x] Solved
### Page de gestion des compétences liées au cours
#### 3
Notice: Undefined variable: context in /Applications/MAMP/htdocs/moodle37/blocks/competency_iena/view/view_competency_iena_competencies_mgmt.php on line 422
Notice: Trying to get property 'id' of non-object in /Applications/MAMP/htdocs/moodle37/blocks/competency_iena/view/view_competency_iena_competencies_mgmt.php on line 422
Context manquant.
[x] Solved
## Améliorations ## Améliorations
### JS
Suppressions de `console.log()` multiples.
### Nom du plugin ### Nom du plugin
Changement du nom du plugin (fichiers de langue). Changement du nom du plugin (fichiers de langue).
### Page de gestion des compétences liées au cours
[ ] Ajout d'un bouton pour ajouter les compétences en haut du tableau.
[ ] Si aucune compétence n'est liée au cours, au lieu d'afficher le tableau, afficher uniquement le bouton d'ajout d'une compétence (un seul sur les deux).
block_competency_iena.php
+ 27
− 39
View file @ 0b9f4b14
...@@ -51,6 +51,7 @@ class block_competency_iena extends block_base ...@@ -51,6 +51,7 @@ class block_competency_iena extends block_base
} }
$this->content = new stdClass; $this->content = new stdClass;
$this->content->text = "";
if (has_capability('moodle/course:update', $context = context_course::instance($COURSE->id), $USER->id)) { if (has_capability('moodle/course:update', $context = context_course::instance($COURSE->id), $USER->id)) {
$this->content->text .= '<a href="' . $CFG->wwwroot . '/blocks/competency_iena/competency_iena_competencies.php?courseid=' . $COURSE->id . '" class="btn btn-primary w-100 mb-3" style="white-space: normal;">Acquisition des compétences</a>'; $this->content->text .= '<a href="' . $CFG->wwwroot . '/blocks/competency_iena/competency_iena_competencies.php?courseid=' . $COURSE->id . '" class="btn btn-primary w-100 mb-3" style="white-space: normal;">Acquisition des compétences</a>';
$this->content->text .= '<a href="' . $CFG->wwwroot . '/blocks/competency_iena/competency_iena_competencies_mgmt.php?courseid=' . $COURSE->id . '" type="button " class="btn btn-success w-100 mb-3" style="white-space: normal;">Gérer les compétences</a>'; $this->content->text .= '<a href="' . $CFG->wwwroot . '/blocks/competency_iena/competency_iena_competencies_mgmt.php?courseid=' . $COURSE->id . '" type="button " class="btn btn-success w-100 mb-3" style="white-space: normal;">Gérer les compétences</a>';
...@@ -58,45 +59,32 @@ class block_competency_iena extends block_base ...@@ -58,45 +59,32 @@ class block_competency_iena extends block_base
} else { } else {
$this->content->text .= '<a href="' . $CFG->wwwroot . '/blocks/competency_iena/competency_iena_competencies.php?courseid=' . $COURSE->id . '" class="btn btn-primary w-100 mb-3">Mes Compétences</a>'; $this->content->text .= '<a href="' . $CFG->wwwroot . '/blocks/competency_iena/competency_iena_competencies.php?courseid=' . $COURSE->id . '" class="btn btn-primary w-100 mb-3">Mes Compétences</a>';
} }
$competenceI = new block_competency_iena_competency();
$competences = $competenceI->get_competencies_by_userID($USER->id); // $competenceI = new block_competency_iena_competency();
$nb_ok = 0; // $competences = $competenceI->get_competencies_by_userID($USER->id);
$nb_total = count($competences); // $nb_ok = 0;
// var_dump($competences); // $nb_total = count($competences);
foreach ($competences as $comp) { // foreach ($competences as $comp) {
if ($comp->proficiency == 1) { // if ($comp->proficiency == 1) {
$nb_ok++; // $nb_ok++;
} // }
} // }
// $this->content->text .= "<p></p>"; // // $this->content->text .= "<p></p>";
if ($nb_total > 0) { // if ($nb_total > 0) {
$progress_percentage = ceil($nb_ok*100/$nb_total); // $progress_percentage = ceil($nb_ok*100/$nb_total);
$this->content->text .= "
<div class=\"progress\">
<div class=\"progress-bar\" role=\"progressbar\" style=\"width: $progress_percentage%;\" aria-valuenow=\"$nb_ok\" aria-valuemin=\"0\" aria-valuemax=\"$nb_total\">$nb_ok/$nb_total</div>
</div>
";
} else {
$progress_percentage = 0;
$this->content->text .= "
<div class=\"progress\">
<div class=\"progress-bar\" role=\"progressbar\" style=\"width: $progress_percentage%;\" aria-valuenow=\"$nb_ok\" aria-valuemin=\"0\" aria-valuemax=\"$nb_total\"></div>
</div>
";
}
// $this->content->text .= " // $this->content->text .= "
// <div class=\"thermo\"> // <div class=\"progress\">
// <div class=\"round_thermo\"> // <div class=\"progress-bar\" role=\"progressbar\" style=\"width: $progress_percentage%;\" aria-valuenow=\"$nb_ok\" aria-valuemin=\"0\" aria-valuemax=\"$nb_total\">$nb_ok/$nb_total</div>
// <span class=\"text_round_thermo\">
// $nb_ok/$nb_total
// </span>
// </div>
// <div class=\"thermo_bar\">
// <progress class=\"progress\" max=\"$nb_total\" value=\"$nb_ok\"></progress>
// </div> // </div>
// ";
// } else {
// $progress_percentage = 0;
// $this->content->text .= "
// <div class=\"progress\">
// <div class=\"progress-bar\" role=\"progressbar\" style=\"width: $progress_percentage%;\" aria-valuenow=\"$nb_ok\" aria-valuemin=\"0\" aria-valuemax=\"$nb_total\"></div>
// </div> // </div>
// "; // ";
// }
return $this->content; return $this->content;
} }
......
competency_iena_competencies.php
+ 1
− 1
View file @ 0b9f4b14
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
echo $OUTPUT->header(); echo $OUTPUT->header();
} catch (coding_exception $e) { } catch (coding_exception $e) {
} }
echo "<link rel=\"stylesheet\" type=\"text/css\" href=\"styles.css\">"; // echo "<link rel=\"stylesheet\" type=\"text/css\" href=\"styles.css\">";
/*$cron_test = new block_competency_iena_cron_roles(); /*$cron_test = new block_competency_iena_cron_roles();
$cron_test->attribute_roles_iena_complete();*/ $cron_test->attribute_roles_iena_complete();*/
......
js/coursecompetencies.js
+ 1
− 1
View file @ 0b9f4b14
define(['core/ajax'], define(['core/ajax'],
function(ajax) { function(ajax) {
console.log('hello you') // console.log('hello you')
requests = ajax.call([ requests = ajax.call([
{methodname: 'core_competency_remove_competency_from_course', {methodname: 'core_competency_remove_competency_from_course',
......
js/file.js
+ 3
− 3
View file @ 0b9f4b14
...@@ -13,7 +13,7 @@ function filter() { ...@@ -13,7 +13,7 @@ function filter() {
function updateTextComp(value, idcourse,wwwroot){ function updateTextComp(value, idcourse,wwwroot){
console.log(value); // console.log(value);
$.ajax({ $.ajax({
url: wwwroot+'/blocks/competency_iena/competency_iena_competencies_api.php?courseid='+idcourse, url: wwwroot+'/blocks/competency_iena/competency_iena_competencies_api.php?courseid='+idcourse,
type: 'POST', type: 'POST',
...@@ -32,7 +32,7 @@ function updateTextComp(value, idcourse,wwwroot){ ...@@ -32,7 +32,7 @@ function updateTextComp(value, idcourse,wwwroot){
} }
function updateTextRef(value, idcourse,wwwroot) { function updateTextRef(value, idcourse,wwwroot) {
console.log(value); // console.log(value);
$.ajax({ $.ajax({
url: wwwroot + '/blocks/competency_iena/competency_iena_competencies_api.php?courseid=' + idcourse, url: wwwroot + '/blocks/competency_iena/competency_iena_competencies_api.php?courseid=' + idcourse,
type: 'POST', type: 'POST',
...@@ -41,7 +41,7 @@ function updateTextRef(value, idcourse,wwwroot) { ...@@ -41,7 +41,7 @@ function updateTextRef(value, idcourse,wwwroot) {
data: {idref: value}, data: {idref: value},
success: function (result) { success: function (result) {
var json_res = JSON.parse(result); var json_res = JSON.parse(result);
console.log(json_res.id); // console.log(json_res.id);
$('#btn-comp-iena').attr('disabled', 'disabled'); $('#btn-comp-iena').attr('disabled', 'disabled');
$('#name_ref_iena').html(json_res.shortname); $('#name_ref_iena').html(json_res.shortname);
$('#desc_ref_iena').html(json_res.description); $('#desc_ref_iena').html(json_res.description);
......
view/view_competency_iena_competencies.php
+ 6
− 0
View file @ 0b9f4b14
...@@ -38,8 +38,14 @@ class view_competency_iena_competencies ...@@ -38,8 +38,14 @@ class view_competency_iena_competencies
// liste des compétences avec toutes les infos // liste des compétences avec toutes les infos
// TODO : traduire l'évaluation numérique en échelle // TODO : traduire l'évaluation numérique en échelle
$competencies = new block_competency_iena_competency(); $competencies = new block_competency_iena_competency();
$cpts = $competencies->get_competencies_by_userID($studentid); $cpts = $competencies->get_competencies_by_userID($studentid);
// var_dump($cpts); // var_dump($cpts);
// entête de la table // entête de la table
......
view/view_competency_iena_competencies_mgmt.php
+ 1
− 3
View file @ 0b9f4b14
...@@ -183,7 +183,6 @@ function supprimer_lien_cpt(cpt_id) { ...@@ -183,7 +183,6 @@ function supprimer_lien_cpt(cpt_id) {
info[0] = \"delete_cpt\" ; info[0] = \"delete_cpt\" ;
info[1] = $COURSE->id ; info[1] = $COURSE->id ;
info[2] = cpt_id ; info[2] = cpt_id ;
console.log(cpt_id)
$.ajax({ $.ajax({
type: \"POST\", type: \"POST\",
data: {info:info}, data: {info:info},
...@@ -270,7 +269,6 @@ alert(status); ...@@ -270,7 +269,6 @@ alert(status);
function changeColor(obj) function changeColor(obj)
{ {
console.log(obj)
// if (obj.getAttibute('class').indexOf('text-success') > -1) { // if (obj.getAttibute('class').indexOf('text-success') > -1) {
// obj.setAttibute('class', 'text-success'); // obj.setAttibute('class', 'text-success');
// } else { // } else {
...@@ -404,7 +402,7 @@ $content .= " ...@@ -404,7 +402,7 @@ $content .= "
"; ";
// var_dump($COURSE->id); // var_dump($COURSE->id);
// $context = context_module::instance($COURSE->id); $context = context_module::instance($COURSE->id);
// var_dump($context); // var_dump($context);
// var_dump($context->_id); // var_dump($context->_id);
// var_dump($context->id); // var_dump($context->id);
......
view/view_competency_iena_competency_mgmt.php
+ 1
− 1
View file @ 0b9f4b14
...@@ -80,7 +80,7 @@ class view_competency_iena_competency_mgmt extends moodleform ...@@ -80,7 +80,7 @@ class view_competency_iena_competency_mgmt extends moodleform
$content .= " $content .= "
<div class='mt-3'> <div class='mt-3'>
<a onclick=\"window.history.go(-1); return false;\" class='btn btn-secondary' >".get_string('cancel', 'block_competency_iena')."</a> <a onclick=\"window.history.go(-1); return false;\" class='btn btn-secondary' >".get_string('cancel', 'block_competency_iena')."</a>
<button type='submit' id='" . $ref[1]->id . "' class='btn btn-primary'>".get_string('send_demande', 'block_competency_iena')."</button> <button type='submit' class='btn btn-primary'>".get_string('send_demande', 'block_competency_iena')."</button>
</div> </div>
</form>"; </form>";
......
view/view_competency_iena_competency_students.php
+ 3
− 3
View file @ 0b9f4b14
...@@ -176,7 +176,7 @@ class view_competency_iena_competency_students ...@@ -176,7 +176,7 @@ class view_competency_iena_competency_students
} ); } );
$( '#filter-evaluation' ).on( 'change', function () { $( '#filter-evaluation' ).on( 'change', function () {
console.log($(this).val()); // console.log($(this).val());
if ($(this).val()){ if ($(this).val()){
table.column(3).search('^'+$(this).val()+'$',true,false).draw(); table.column(3).search('^'+$(this).val()+'$',true,false).draw();
} else { } else {
...@@ -194,9 +194,9 @@ $( '#filter-module' ).on('change', function() { ...@@ -194,9 +194,9 @@ $( '#filter-module' ).on('change', function() {
if($('#browsers option').filter(function(){ if($('#browsers option').filter(function(){
return this.value === val; return this.value === val;
}).length) { }).length) {
console.log(this.value); // console.log(this.value);
var value2send = document.querySelector(\"#browsers option[value='\"+this.value+\"']\").dataset.value; var value2send = document.querySelector(\"#browsers option[value='\"+this.value+\"']\").dataset.value;
console.log(value2send); // console.log(value2send);
window.location.replace(value2send); window.location.replace(value2send);
} }
}); });
......
view/view_competency_iena_user.php
+ 15
− 17
View file @ 0b9f4b14
...@@ -243,17 +243,15 @@ class view_competency_iena_user ...@@ -243,17 +243,15 @@ class view_competency_iena_user
<script> <script>
$(document).ready(function () { $(document).ready(function () {
$('#btn-eval-<?php echo $key_cpt; ?>').click(function () { $('#btn-eval-<?php echo $key_cpt; ?>').click(function () {
console.log(this); // console.log(this);
console.log( // console.log($("#courseid_iena_<?php echo $key_cpt; ?>").val());
$("#courseid_iena_<?php echo $key_cpt; ?>").val()
);
var data = { var data = {
eval_comp: $("#slc-eval_<?php echo $key_cpt; ?>").val(), eval_comp: $("#slc-eval_<?php echo $key_cpt; ?>").val(),
userid : $("#iduser_iena_<?php echo $key_cpt; ?>").val(), userid : $("#iduser_iena_<?php echo $key_cpt; ?>").val(),
compid : $("#compid_iena_<?php echo $key_cpt; ?>").val(), compid : $("#compid_iena_<?php echo $key_cpt; ?>").val(),
eval_comp_note: "Evaluation données dans le cours « <?php echo $COURSE->fullname ?> » par <?php echo( $USER->firstname . " " . $USER->lastname ) ?>. " + $("#slc-eval-note_<?php echo $key_cpt; ?>").val() eval_comp_note: "Evaluation données dans le cours « <?php echo $COURSE->fullname ?> » par <?php echo( $USER->firstname . " " . $USER->lastname ) ?>. " + $("#slc-eval-note_<?php echo $key_cpt; ?>").val()
} }
console.log( data ); // console.log( data );
$.ajax({ $.ajax({
url: $("#wwwroot_iena").val() + '/blocks/competency_iena/' + url: $("#wwwroot_iena").val() + '/blocks/competency_iena/' +
'competency_iena_competencies_api.php?courseid=' + $("#courseid_iena_<?php echo $key_cpt; ?>").val(), 'competency_iena_competencies_api.php?courseid=' + $("#courseid_iena_<?php echo $key_cpt; ?>").val(),
...@@ -850,8 +848,8 @@ class view_competency_iena_user ...@@ -850,8 +848,8 @@ class view_competency_iena_user
contentType: 'application/x-www-form-urlencoded', contentType: 'application/x-www-form-urlencoded',
success: function (data, status) { success: function (data, status) {
if (status == "success") { if (status == "success") {
console.log(status); // console.log(status);
console.log(data); // console.log(data);
location.reload(); location.reload();
} }
}, },
...@@ -889,25 +887,25 @@ class view_competency_iena_user ...@@ -889,25 +887,25 @@ class view_competency_iena_user
function write_comment(obj) { function write_comment(obj) {
var url = window.location.href; var url = window.location.href;
console.log(url); // console.log(url);
var input_message_id = obj.id; var input_message_id = obj.id;
console.log(input_message_id); // console.log(input_message_id);
var idsender = input_message_id.split('-')[0]; var idsender = input_message_id.split('-')[0];
idsender = idsender.replace(/[^\d.]/g, ''); idsender = idsender.replace(/[^\d.]/g, '');
console.log(idsender); // console.log(idsender);
var idstudent = input_message_id.split('-')[1]; var idstudent = input_message_id.split('-')[1];
idstudent = idstudent.replace(/[^\d.]/g, ''); idstudent = idstudent.replace(/[^\d.]/g, '');
console.log(idstudent); // console.log(idstudent);
var idcourse = input_message_id.split('-')[2]; var idcourse = input_message_id.split('-')[2];
idcourse = idcourse.replace(/[^\d.]/g, ''); idcourse = idcourse.replace(/[^\d.]/g, '');
console.log(idcourse); // console.log(idcourse);
var idcompetency = input_message_id.split('-')[3]; var idcompetency = input_message_id.split('-')[3];
idcompetency = idcompetency.replace(/[^\d.]/g, ''); idcompetency = idcompetency.replace(/[^\d.]/g, '');
console.log(idcompetency); // console.log(idcompetency);
var message = document.getElementById("input_message").value; var message = document.getElementById("input_message").value;
console.log(message); // console.log(message);
var date = new Date().getTime() / 1000; var date = new Date().getTime() / 1000;
console.log(date); // console.log(date);
var info = []; var info = [];
info[0] = "insert"; info[0] = "insert";
...@@ -926,8 +924,8 @@ class view_competency_iena_user ...@@ -926,8 +924,8 @@ class view_competency_iena_user
contentType: 'application/x-www-form-urlencoded', contentType: 'application/x-www-form-urlencoded',
success: function (data, status) { success: function (data, status) {
if (status == "success") { if (status == "success") {
console.log(status); // console.log(status);
console.log(data); // console.log(data);
location.reload(); location.reload();
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment