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

condition fixed

parent 396ff2e4
No related branches found
No related tags found
No related merge requests found
......@@ -28,7 +28,7 @@
*/
defined('MOODLE_INTERNAL') || die();
$plugin->version = 2018102201;
$plugin->version = 2019021903;
$plugin->requires = 2014051200;
$plugin->component = 'block_competency_iena';
$plugin->release = 'v1.0';
......
......@@ -520,15 +520,13 @@ class view_competency_iena_user
$val_asked = $DB->get_record_sql('select * FROM {competency_usercomp} WHERE competencyid = ? AND userid = ?', array($competencyid, $tmpiduser));
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) ) {
if ( $val_asked->status == "1" ) {
echo "<div class='alert alert-info'>Validation / Evaluation demandée par l'étudiant</div>";
}
// var_dump($scale);
echo "<button type=\"button\"
class=\"btn btn-primary\" id='eval-show'>".get_string('evalute_iena', 'block_competency_iena')."</button>
<div id='eval-hide'>
......@@ -740,7 +738,7 @@ class view_competency_iena_user
<?php
foreach ($dataSum->evidence as $value) {
// echo "<div class=\"well well-small evidence\" id=\"proof_iena_id_$value->id\">
/*echo "<div class=\"well well-small evidence\" id=\"proof_iena_id_$value->id\">*/
echo "<div class=\"card card-block\" id=\"proof_iena_id_$value->id\">
<div class=\"card-body\">
<div class=\"pull-xs-right iena-cpt-abs-right\">
......@@ -779,19 +777,19 @@ class view_competency_iena_user
<h2 class="title_blue"><?php echo get_string('history_comp', 'block_competency_iena') . " (" . $history_size . ")"; ?></h2>
<?php if ( $usercomp_id != NULL ): ?>
<a target="_blank" href="http://localhost:8888/moodle35/admin/tool/lp/user_competency.php?id=<?php echo $usercomp_id; ?>" class="btn btn-block btn-default m-y-1">Consulter les informations pour tous les cours</a>
<? endif; ?>
<a target="_blank" href="<?php echo $CFG->wwwroot ?>/admin/tool/lp/user_competency.php?id=<?php echo $usercomp_id; ?>" class="btn btn-block btn-default m-y-1">Consulter les informations pour tous les cours</a>
<?php endif; ?>
<?php if ($history_size != 0) { ?>
<?php if ($history_size != 0): ?>
<!-- height: < ? p h p echo $taille_proof ?>rem; -->
<div class="block_compet_param commentaire" id="proof_iena"
style="max-height: 29rem; overflow: scroll; border: 1px solid #ccc; border-radius: 0.15rem; padding: 1rem; margin-bottom: 1rem;">
<div class="entete">
<?php
foreach ($data->usercompetencysummary->evidence as $value) {
// echo "<div class=\"well well-small evidence\" id=\"proof_iena_id_$value->id\">
/*echo "<div class=\"well well-small evidence\" id=\"proof_iena_id_$value->id\">*/
echo "<div class=\"card card-block\" id=\"proof_iena_id_$value->id\">
<div class=\"card-body\">
<div class=\"pull-xs-right iena-cpt-abs-right\">
......@@ -826,60 +824,48 @@ class view_competency_iena_user
</div>
</div>
<?php /*if ($taille_proof == 25) { ?>
<!--<div class="align_center" id="extand_iena_proof" style="cursor: pointer;">
<span class="down_caret">
<i class="fa fa-chevron-down"></i>
</span>
</div> -->
<?php }*/ ?>
<?php } else {
/*try {
// echo "<p style='padding:1rem; '>". get_string('empty', 'block_competency_iena')."</p>";
} catch (coding_exception $e) {
}*/
} ?>
</section>
</div>
</div>
</div>
<script>
function delete_comment(obj) {
var url = window.location.href;
var t = obj.parentNode.parentNode.parentNode.parentNode;
var info = [];
info[0] = "delete";
info[1] = obj.id;
$.ajax({
type: "POST",
data: {info: info},
url: url,
timeout: 10000,
contentType: 'application/x-www-form-urlencoded',
success: function (data, status) {
if (status == "success") {
console.log(status);
console.log(data);
location.reload();
}
},
error: function (xhr, status, error) {
alert(status);
<?php endif; ?>
</section>
</div>
</div>
</div>
<script>
function delete_comment(obj) {
var url = window.location.href;
var t = obj.parentNode.parentNode.parentNode.parentNode;
var info = [];
info[0] = "delete";
info[1] = obj.id;
$.ajax({
type: "POST",
data: {info: info},
url: url,
timeout: 10000,
contentType: 'application/x-www-form-urlencoded',
success: function (data, status) {
if (status == "success") {
console.log(status);
console.log(data);
location.reload();
}
});
},
error: function (xhr, status, error) {
alert(status);
}
});
}
}
function toggle_comments() {
if (document.getElementById("comment-list-plancommentarea2").style.display === 'none') {
document.getElementById("comment-list-plancommentarea2").style.display = 'block';
function toggle_comments() {
if (document.getElementById("comment-list-plancommentarea2").style.display === 'none') {
document.getElementById("comment-list-plancommentarea2").style.display = 'block';
// console.log(document.getElementById("comment-list-plancommentarea2").style.display);
} else {
document.getElementById("comment-list-plancommentarea2").style.display = 'none';
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment