diff --git a/competency_iena_competency_students_2.php b/competency_iena_competency_students_2.php index 66d5a4cbff16b55aa88e39df6161768e7ff420a1..2e1e2a2abfd958b56dcc88332389b40766c1a80d 100644 --- a/competency_iena_competency_students_2.php +++ b/competency_iena_competency_students_2.php @@ -266,7 +266,7 @@ if (count($course_cpts) > 0) { $cpt_stud->lastname = $student->lastname; $cpt_stud->proficiency = NULL; $cpt_stud->grade = NULL; - $cpt_stud->review = NULL; + $cpt_stud->review_asked = NULL; foreach ($course_cpts_all as $course_cpt) { if ( $course_cpt->userid == $student->id ) { $cpt_stud->proficiency = $course_cpt->proficiency; @@ -284,7 +284,7 @@ if (count($course_cpts) > 0) { foreach ($reviews_data as $review) { if ( $review->userid == $student->id ) { - $cpt_stud->review = $review->status; + $cpt_stud->review_asked = $review->status; break; } } @@ -299,11 +299,11 @@ if (count($course_cpts) > 0) { if ( isset($_GET['review']) && $_GET['review'] == 'yes' ) { $cpt_studs = array_filter($cpt_studs, function ($stud) { - return $stud->review == 1; + return $stud->review_asked == 1; }); } elseif ( isset($_GET['review']) && $_GET['review'] == 'no' ) { $cpt_studs = array_filter($cpt_studs, function ($stud) { - return $stud->review != 1; + return $stud->review_asked != 1; }); } @@ -329,6 +329,7 @@ if (count($course_cpts) > 0) { if ( count($cpt_studs) > 0 ) { + foreach ($cpt_studs as $cpt_stud) { $cpt_stud->proficient_class = $cpt_stud->proficiency == 1 ? " list-group-item-success" : ""; $cpt_stud->grade_d = $cpt_stud->grade == NULL ? "-" : $current_cpt->scale[$cpt_stud->grade - 1]; @@ -336,19 +337,19 @@ if (count($course_cpts) > 0) { $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_assess=$CFG->wwwroot."/blocks/competency_iena/competency_iena_competency_students_2.php?courseid=".$courseid."&studentid=".$cpt_stud->id."&competencyid=".$current_cpt->id; - if(isset($grade)){ - $cpt_stud->link_assess.="&grade=".$grade; + if(isset($cpt_stud->grade)){ + $cpt_stud->link_assess.="&grade=".$cpt_stud->grade; } - if(isset($proficiency)){ - $cpt_stud->link_assess.="&grade=".$proficiency; + if(isset($cpt_stud->proficiency)){ + $cpt_stud->link_assess.="&grade=".$cpt_stud->proficiency; } - if(isset($review)){ - $cpt_stud->link_assess.="&grade=".$review; + if(isset($cpt_stud->review_asked)){ + $cpt_stud->link_assess.="&grade=".$cpt_stud->review_asked; } - //Rajouter les paramètres pour l'url pour retourner; - //L'évaluation ne marche pas + } + $data["cpt_studs"]=array_values($cpt_studs); //var_dump($cpt_studs); } diff --git a/course_competency.php b/course_competency.php index 9a456ac63a844ca4a1958c65099b2ea5bb8c3021..9215c72eab6e2d18012e08c5159c96bc2489b438 100644 --- a/course_competency.php +++ b/course_competency.php @@ -112,7 +112,7 @@ $eval = "-"; /* current eval string */ if ( $u_c_cpt->get('grade') != null ) { $eval = $cpt_scale[$u_c_cpt->get('grade') - 1]; } -$proficiency = $u_c_cpt->get('proficiency') == 1 ? "Oui" : "Non"; +$proficiency = $u_c_cpt->get('proficiency') == 1 ? "La compétence est validée" : "La compétence n'est pas encore validée"; $proficiency_class = $u_c_cpt->get('proficiency') == 1 ? "success" : "secondary"; /* All course competencies */ @@ -227,6 +227,7 @@ if ( count($all_evidences) != 0 ) { $series_data_other[] = $ev->grade; } } + //fin partie chart /* mark difference between this course evidences in html for JS filter with tabs */ if ( in_array($ev->id, $course_evidences_ids) ) { @@ -251,6 +252,7 @@ if ( count($all_evidences) != 0 ) { $ev->date = date("d/m/y – H:i", $ev->timemodified); } + var_dump($all_evidences); /* $chart = new core\chart_line(); */ $chart = new core\chart_bar(); @@ -260,12 +262,13 @@ if ( count($all_evidences) != 0 ) { $series_all = new core\chart_series("Complet", array_reverse($series_data_all)); $series_course = new core\chart_series('Dans ce cours', array_reverse($series_data_course)); $series_other = new core\chart_series('Hors de ce cours', array_reverse($series_data_other)); + // $chart->add_series($series_all); $chart->add_series($series_course); $chart->add_series($series_other); $chart->set_labels(array_reverse($labels)); - + /* LIST COMPLETE HISTORY (evaluation and other evidences) */ @@ -308,7 +311,6 @@ if ( count($cm_ids) !== 0 ) { } - $data=array(); $data['is_enrolled']=$is_enrolled; $data['link_switch']=$CFG->wwwroot."/blocks/competency_iena/course_competency.php"; diff --git a/js/cpt-stud-course.js b/js/cpt-stud-course.js index 040164ebe8e15944a71df692b506cb77cf9b19cd..9fe0396381e8fa4210d1df8d4ba5de7069eddbde 100644 --- a/js/cpt-stud-course.js +++ b/js/cpt-stud-course.js @@ -1,6 +1,5 @@ (function() { function active_tabs(active_tab) { - console.log(active_tab); var tabs = document.querySelectorAll('#hist-tabs .nav-link'); for ( var i=0; i < tabs.length; i++ ) { tabs[i].setAttribute('class', 'nav-link'); diff --git a/lang/en/block_competency_iena.php b/lang/en/block_competency_iena.php index 845cdbe05499d73ef0e2e9064b77ba8b5e6b8934..1ac87a5506d920ad1fe8bc44e0e21ee41ac56fbf 100644 --- a/lang/en/block_competency_iena.php +++ b/lang/en/block_competency_iena.php @@ -91,6 +91,8 @@ $string['dashboard_competencies']="Competencies dashboard"; $string['not_assessed']="Not assessed"; $string['validated_competencies']="Students who validated the competency"; - $string['assessments']="Assessments"; + $string['assessments']="Assessment history"; $string['details_competency']="Details competency/student"; + $string['linked_activities']="Activities and resources related to this competency"; + ?> \ No newline at end of file diff --git a/lang/fr/block_competency_iena.php b/lang/fr/block_competency_iena.php index 35e730ddedba76385c8e3afa55054913d099da32..dbc4348526ab4c5bd311d6854845d902c71b55ac 100644 --- a/lang/fr/block_competency_iena.php +++ b/lang/fr/block_competency_iena.php @@ -90,8 +90,9 @@ $string['dashboard_competencies']="Tableau de bord compétences"; $string['not_assessed']="Non évalués"; $string['validated_competencies']="Étudiants ayant validé la compétence"; - $string['assessments']="Évaluations"; + $string['assessments']="Évolution des évaluations"; $string['details_competency']="Détails compétence/étudiant"; + $string['linked_activities']="Activités et ressources liées à cette compétence"; diff --git a/styles.css b/styles.css index ce9930257d76cebf7e1a14cbd6283151c1a0b9b3..a526f29e712fc240a7203f9d721b31e9f73508f8 100644 --- a/styles.css +++ b/styles.css @@ -73,6 +73,10 @@ /* Page compétences d'un utilisateurs */ +.list-group{ + padding-bottom: 1px; +} + .list-group-item-action:hover .iena-cpt-action-title { text-decoration: none!important; } @@ -292,6 +296,10 @@ table.dataTable{ max-width: 40%; } +.iena-chart-unique.big .chart-image{ + max-width: 61%!important; +} + .taxo-lvl1 small{ background-color: #223D4F; } @@ -322,3 +330,64 @@ table.dataTable{ .iena-history{ margin-bottom: 30px; } + +.iena-asked{ + position: absolute; + top: 0.75rem; + right: 0.75rem; +} + +.alert-success p::after{ + content: "\f058"; + font-family: FontAwesome; + margin-left: 5px; + display: inline-block;text-align: center; + color: green; + font-size: large; +} + +.iena-grid{ + display: grid; + grid-template-columns: 25% 75%; + grid-template-rows: 50% 50%; + grid-auto-flow: column; + height: 25rem; + +} + +.dashboard-chart{ + grid-column: 2; + grid-row: 1 / 2; +} + +.dashboard-chart .iena-chart{ + height: 200%; +} + +.dashboard-panel > div{ + height: 100% +} + +.dashboard-panel{ + padding-right: 20px; + text-align: center; + +} + +.dashboard-panel:first-of-type{ + padding-bottom: 20px; + + +} + +.dashboard-panel .alert{ + padding-top: 13%; +} + +.iena-grid{ + margin-bottom: 30px; +} + +.button-assess{ + margin-top: 15px; +} \ No newline at end of file diff --git a/templates/dashboard_competencies.mustache b/templates/dashboard_competencies.mustache index 0c9b614b75bd51c22d0b3f62581dfd114fbad857..8e2124c9b00b578e94e1edc6cea06861b76524cf 100644 --- a/templates/dashboard_competencies.mustache +++ b/templates/dashboard_competencies.mustache @@ -1,6 +1,6 @@ <h2>{{# str }} dashboard_competencies, block_competency_iena{{/ str }}</h2> {{#count_course_cpts}} - <div class='container-fluid'> + <div class='container-fluid' style="margin-top:30px"> <div class='alert row' style='padding: 0; background-color: inherit; color: inherit;'> <div class='col-12' style='padding-left: 0;'> <form action='{{link_switch_cpt}}' id='change_cpt_form' class='form-inline' autocomplete='off' style='display: block;height: 1.5rem;'> @@ -75,9 +75,11 @@ <h3 class='mb-1 iena-cpt-action-title h5'>{{firstname}} {{lastname}}</h3> <div class="iena-right-competency"> - {{#cpt_studs.review}} + + + {{#review_asked}} <div><small class='review-badge'>Évaluation demandée</small></div> - {{/cpt_studs.review}} + {{/review_asked}} <div class="user-competency-actions"> <a href="#" data-toggle='modal' data-target='#modal-assess-{{id}}' class="action-icon" title="Evaluer" aria-label="Evaluation"><i class="icon fa fa-file-text-o fa-fw " aria-hidden="true"></i></a> diff --git a/templates/dashboard_competency_student.mustache b/templates/dashboard_competency_student.mustache index 1992d5e1ae64073782c3fb59f7dcd05304edda75..6993593671d9b6d72f9e93ab0101ec4b1b3c1ac0 100644 --- a/templates/dashboard_competency_student.mustache +++ b/templates/dashboard_competency_student.mustache @@ -46,42 +46,41 @@ </div> </div> {{/is_teacher}} - <div class='row'> - - <div class='col-12 col-lg-3'> + <div class='iena-grid'> + + <div class='dashboard-panel'> <div class='alert alert-{{proficiency_class}}'> - <h3 class='h4'>Validé</h3> + + <h3 class='h4'>Validation</h3> <p class='m-b-0 btn p-l-0' style='cursor: text;'>{{proficiency}}</p> </div> </div> - <div class='col-12 col-lg-3'> - <div class='alert alert-{{proficiency_class}}'> - <h3 class='h4'>Évaluation</h3> + <div class='dashboard-panel'> + <div class='alert alert-secondary'> + <h3 class='h4'>Dernière évaluation</h3> <p class='m-b-0 btn p-l-0' style='cursor: text;'>{{eval}}</p> - </div> - </div> - <div class='col-12 col-lg-6'> - <div class='alert alert-{{review_class}}' style="text-align:center"> - <h3 class='h4'>{{review_msg}}</h3> {{#review_asked}} - {{#is_me}} + <div class="iena-asked"><small class='review-badge'>Évaluation demandée</small></div> + {{^is_teacher}} <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> - {{/is_me}} + {{/is_teacher}} {{/review_asked}} {{^review_asked}} - {{#is_me}} + {{^is_teacher}} <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> - {{/is_me}} + {{/is_teacher}} {{/review_asked}} {{#is_teacher}} - <button data-toggle='modal' data-target='#modal-assess' class='btn btn-primary'>Évaluer</Button> + <div class="button-assess"> + <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'> <div class='modal-content'> @@ -95,7 +94,7 @@ <label>Évaluation</label> <select name='grade' class='form-control'> {{#scale}} - <option value='{{value}}'{{selected}}>{{title}}</option> + <option value='{{grade}}'{{selected}}>{{label}}</option> {{/scale}} </select> </div> @@ -112,19 +111,25 @@ </div> {{/is_teacher}} </div> - </div> + </div> - </div> - {{#count_all_evidences}} - <div class='alert alert-secondary'> - <div class='col-12'> - <h2 class='h4'>{{#str}} assessments, block_competency_iena {{/str}}</h2> - <div class="iena-chart-unique"> + + <div class='dashboard-chart'> + <div class='iena-chart alert alert-secondary'> + <h2 class='h4'>{{#str}} assessments, block_competency_iena {{/str}}</h2> + <div class="iena-chart-unique big"> + {{#count_all_evidences}} {{{chart}}} - </div> + {{/count_all_evidences}} + {{^count_all_evidences}} + <p><i>Pour afficher le graphique des évaluations, commencez par évaluer l'étudiant sur cette compétence</i></p> + {{/count_all_evidences}} </div> </div> + </div> +</div> + </div> <div class='row iena-history'> <div class='col-12'> <h2 class='h3'>Historique</h2><ul class='nav nav-tabs' id='hist-tabs'> @@ -158,11 +163,15 @@ </li> {{/all_evidences}} + {{^all_evidences}} + <li><p><i>La compétence n'a pas encore été évaluée</i></p></li> + {{/all_evidences}} </ul> </div> </div> - {{/count_all_evidences}} - <h3>Lié à cette compétence</h3> + + + <h3>{{# str }} linked_activities, block_competency_iena{{/ str }}</h3> {{#count_cm_ids}} <div class='list-group'> {{#cm_ids}}