From f8a271f62db9473f669531e11184e29aac230d31 Mon Sep 17 00:00:00 2001
From: Myriam Delaruelle <myriam.delaruelle@univ-lorraine.fr>
Date: Thu, 6 Jun 2024 09:43:33 +0200
Subject: [PATCH] new icons

---
 .../courseformat/content/section/header.php   |  7 +++---
 styles.css                                    |  9 ++++++-
 suivi_unit.php                                | 24 +++++++++++++++----
 .../content/section/header.mustache           | 14 ++++++++++-
 templates/modal-details.mustache              |  2 ++
 5 files changed, 47 insertions(+), 9 deletions(-)

diff --git a/classes/output/courseformat/content/section/header.php b/classes/output/courseformat/content/section/header.php
index 19ac53e..d403f01 100644
--- a/classes/output/courseformat/content/section/header.php
+++ b/classes/output/courseformat/content/section/header.php
@@ -133,12 +133,13 @@ class header extends header_base{
         if($display_button){
             //si trop d'étudiants on va afficher le premier groupe dans le suivi
             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{
-                $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";
+          
         }
             
             
diff --git a/styles.css b/styles.css
index 173066a..59c3846 100644
--- a/styles.css
+++ b/styles.css
@@ -221,6 +221,13 @@ ul.nav.navbar-nav.ml-auto {
     background: #02746C;
 }
 
+.iena-icon-suivi{
+	display: block;
+  min-width: 0;
+  padding: 6px 10px;
+  border-radius: 50px;
+}
+
 .right_info {
 	margin-left: auto;
     display: flex;
@@ -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;
 	padding-bottom: .5rem;
 }
diff --git a/suivi_unit.php b/suivi_unit.php
index f0173dc..47d6f7d 100644
--- a/suivi_unit.php
+++ b/suivi_unit.php
@@ -415,13 +415,22 @@ if (isset($_POST['action']) && $_POST['action'] == "details") {
 
     if(!empty($gradesobject)){
         $lastgradeobject=end($gradesobject->items[0]->grades);
+       
         if($lastgradeobject){
             $lastgrade["lastgrade"]=$lastgradeobject->str_long_grade;
+            error_log($lastgrade["lastgrade"]);
             $lastgrade["datelastgrade"]=$lastgradeobject->dategraded;
         }
-        
-        $lastgrade["passgrade"]=$gradesobject->items[0]->gradepass ? number_format($gradesobject->items[0]->gradepass, 2, ',', '') : null;
-      $data["grades"]=$lastgrade;
+
+        if(isset($gradesobject->items[0]->gradepass)){
+            $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)
@@ -430,7 +439,7 @@ if (isset($_POST['action']) && $_POST['action'] == "details") {
     $data =array();
     $data['url']=strval($cm->url);
     $data['completion']=strval($cm->completion);
- 
+ $data["grades"]=$lastgrade;
     $data["customcompletion"]=$cm->customdata;
     $data["completioninfos"]=$activityhtml;
     $data["completionstate"]=$completiondetails->get_overall_completion();
@@ -496,6 +505,13 @@ else if (isset($_POST['action']) && !empty($_POST['action'])) {
             $msg = $_GET["msg_success"];
             $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);
diff --git a/templates/courseformat/content/section/header.mustache b/templates/courseformat/content/section/header.mustache
index eeb3df4..9d8a7b7 100644
--- a/templates/courseformat/content/section/header.mustache
+++ b/templates/courseformat/content/section/header.mustache
@@ -116,9 +116,21 @@
         {{/date}}
 
         {{#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 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>
+            </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>
         {{/link_suivi}}
diff --git a/templates/modal-details.mustache b/templates/modal-details.mustache
index 24e5c2e..41be416 100644
--- a/templates/modal-details.mustache
+++ b/templates/modal-details.mustache
@@ -17,7 +17,9 @@
 						<label><b>Modalités d'achèvements :</b></label>
 						<div id="modal-completion-infos">{{{completioninfos}}}
 						</div>
+
 						{{#grades}}
+						
 							{{#lastgrade}}
 							<div><b>Dernière note : </b> {{lastgrade}}</div>
 							{{/lastgrade}}
-- 
GitLab