Skip to content
Snippets Groups Projects
Commit f8a271f6 authored by DELARUELLE Myriam's avatar DELARUELLE Myriam
Browse files

new icons

parent 68d5fda7
No related branches found
No related tags found
No related merge requests found
...@@ -133,12 +133,13 @@ class header extends header_base{ ...@@ -133,12 +133,13 @@ class header extends header_base{
if($display_button){ if($display_button){
//si trop d'étudiants on va afficher le premier groupe dans le suivi //si trop d'étudiants on va afficher le premier groupe dans le suivi
if($this->count_students($context)>299 && count($groups)>0){ if($this->count_students($context)>299 && count($groups)>0){
$link_suivi = $CFG->wwwroot . "/course/format/iena/suivi_unit.php?courseid=" . $courseid . "&sectionid=" . $section->id . "&groupid=".reset($groups)->id; $link_suivi = array("section"=>$CFG->wwwroot . "/course/format/iena/suivi_unit.php?courseid=" . $courseid . "&sectionid=" . $section->id . "&groupid=".reset($groups)->id);
} }
else{ else{
$link_suivi = $CFG->wwwroot . "/course/format/iena/suivi_unit.php?courseid=" . $courseid . "&sectionid=" . $section->id . "&groupid=0"; $link_suivi = array("section"=>$CFG->wwwroot . "/course/format/iena/suivi_unit.php?courseid=" . $courseid . "&sectionid=" . $section->id . "&groupid=0");
} }
$link_suivi["full"] = $CFG->wwwroot . "/course/format/iena/suivi_unit.php?courseid=" . $courseid . "&sectionid=0&groupid=0";
} }
......
...@@ -221,6 +221,13 @@ ul.nav.navbar-nav.ml-auto { ...@@ -221,6 +221,13 @@ ul.nav.navbar-nav.ml-auto {
background: #02746C; background: #02746C;
} }
.iena-icon-suivi{
display: block;
min-width: 0;
padding: 6px 10px;
border-radius: 50px;
}
.right_info { .right_info {
margin-left: auto; margin-left: auto;
display: flex; display: flex;
...@@ -911,7 +918,7 @@ tbody th{ ...@@ -911,7 +918,7 @@ tbody th{
} }
#suivi thead .first-column-iena, #suivi thead .second-column-iena, #suivi thead .third-column-iena,#suivi thead .actions-column-iena{ #suivi thead .first-column-iena, #suivi thead .second-column-iena, #suivi thead .third-column-iena,#suivi thead .actions-column-iena, #suivi thead .group-column-iena{
vertical-align: bottom; vertical-align: bottom;
padding-bottom: .5rem; padding-bottom: .5rem;
} }
......
...@@ -415,13 +415,22 @@ if (isset($_POST['action']) && $_POST['action'] == "details") { ...@@ -415,13 +415,22 @@ if (isset($_POST['action']) && $_POST['action'] == "details") {
if(!empty($gradesobject)){ if(!empty($gradesobject)){
$lastgradeobject=end($gradesobject->items[0]->grades); $lastgradeobject=end($gradesobject->items[0]->grades);
if($lastgradeobject){ if($lastgradeobject){
$lastgrade["lastgrade"]=$lastgradeobject->str_long_grade; $lastgrade["lastgrade"]=$lastgradeobject->str_long_grade;
error_log($lastgrade["lastgrade"]);
$lastgrade["datelastgrade"]=$lastgradeobject->dategraded; $lastgrade["datelastgrade"]=$lastgradeobject->dategraded;
} }
$lastgrade["passgrade"]=$gradesobject->items[0]->gradepass ? number_format($gradesobject->items[0]->gradepass, 2, ',', '') : null; if(isset($gradesobject->items[0]->gradepass)){
$data["grades"]=$lastgrade; $lastgrade["passgrade"]=number_format($gradesobject->items[0]->gradepass, 2, ',', '');
}
else{
}
/*$lastgrade["passgrade"]=$gradesobject->items[0]->gradepass ? number_format($gradesobject->items[0]->gradepass, 2, ',', '') : null;*/
error_log(print_r($data["grades"], true));
} }
//en cas d'achèvement manuel on créé les petites pastilles vertes ou grises (terminé ou à faire) //en cas d'achèvement manuel on créé les petites pastilles vertes ou grises (terminé ou à faire)
...@@ -430,7 +439,7 @@ if (isset($_POST['action']) && $_POST['action'] == "details") { ...@@ -430,7 +439,7 @@ if (isset($_POST['action']) && $_POST['action'] == "details") {
$data =array(); $data =array();
$data['url']=strval($cm->url); $data['url']=strval($cm->url);
$data['completion']=strval($cm->completion); $data['completion']=strval($cm->completion);
$data["grades"]=$lastgrade;
$data["customcompletion"]=$cm->customdata; $data["customcompletion"]=$cm->customdata;
$data["completioninfos"]=$activityhtml; $data["completioninfos"]=$activityhtml;
$data["completionstate"]=$completiondetails->get_overall_completion(); $data["completionstate"]=$completiondetails->get_overall_completion();
...@@ -496,6 +505,13 @@ else if (isset($_POST['action']) && !empty($_POST['action'])) { ...@@ -496,6 +505,13 @@ else if (isset($_POST['action']) && !empty($_POST['action'])) {
$msg = $_GET["msg_success"]; $msg = $_GET["msg_success"];
$data["msg_success"] = $msg; $data["msg_success"] = $msg;
} }
var_dump($PAGE->navigation);
$coursenode = $PAGE->navigation->find($courseid, navigation_node::TYPE_COURSE);
/*$thingnode = $coursenode->add(
get_string('thingname'),
new moodle_url('/a/link/if/you/want/one.php')
);*/
var_dump($coursenode);
} }
$renderer->display_completion($data); $renderer->display_completion($data);
......
...@@ -116,9 +116,21 @@ ...@@ -116,9 +116,21 @@
{{/date}} {{/date}}
{{#link_suivi}} {{#link_suivi}}
<a href='{{link_suivi}}' style='color : white'> <!--<a href='{{link_suivi}}' style='color : white'>
<div style="display:block;" class="nb_pers set_height id_groupe0">Suivi étudiant</div> <div style="display:block;" class="nb_pers set_height id_groupe0">Suivi étudiant</div>
<div class="nb_pers set_height mobile-bouton-suivi"><i class="fa fa-tasks"></i>
</div>
</a>-->
<a href='{{full}}' style='color : white' data-toggle="tooltip" title="Suivi global">
<div style="display:block;" class="nb_pers set_height iena-icon-suivi"><i class="fa fa-tasks"></i></div>
<div class="nb_pers set_height mobile-bouton-suivi"><i class="fa fa-tasks"></i></div> <div class="nb_pers set_height mobile-bouton-suivi"><i class="fa fa-tasks"></i></div>
</a>
<a href='{{section}}' style='color : white' data-toggle="tooltip" title="Suivi de la section">
<div style="display:block;" class="nb_pers set_height iena-icon-suivi"><i class="fa fa-table"></i></div>
</a>
</a> </a>
{{/link_suivi}} {{/link_suivi}}
......
...@@ -17,7 +17,9 @@ ...@@ -17,7 +17,9 @@
<label><b>Modalités d'achèvements :</b></label> <label><b>Modalités d'achèvements :</b></label>
<div id="modal-completion-infos">{{{completioninfos}}} <div id="modal-completion-infos">{{{completioninfos}}}
</div> </div>
{{#grades}} {{#grades}}
{{#lastgrade}} {{#lastgrade}}
<div><b>Dernière note : </b> {{lastgrade}}</div> <div><b>Dernière note : </b> {{lastgrade}}</div>
{{/lastgrade}} {{/lastgrade}}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment