From 88c1b60cbdb7373e308bb1e3e525fdd299a42ba7 Mon Sep 17 00:00:00 2001
From: Etienne Pallier <epallier@irap.omp.eu>
Date: Thu, 8 Oct 2020 08:51:00 +0200
Subject: [PATCH] amélioration de la vue des utilisateurs de groupes métier/thématiq

---
 src/Template/Common/view.ctp | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/Template/Common/view.ctp b/src/Template/Common/view.ctp
index 30a9ed9..1737864 100755
--- a/src/Template/Common/view.ctp
+++ b/src/Template/Common/view.ctp
@@ -2,6 +2,8 @@
 use App\Controller\SurCategoriesController;
 use App\Model\Entity\SurCategory;
 use Cake\ORM\Entity;
+use App\Model\Entity\GroupesThematique;
+use App\Model\Entity\GroupesMetier;
 
 $DEBUG=false;
 //$DEBUG=true;
@@ -11,6 +13,7 @@ $DEBUG=false;
 $role = $role;
 
 $entity = $entity;
+//debug($entity);
 //$parent_entity_infos=$parent_entity_infos;
 $parent_entities_infos = $parent_entities_infos;
 $fields_label = $fields_label;
@@ -198,16 +201,32 @@ $child_entities_list = $child_entities_list;
 	<?php
 	//debug($entity);
 	//debug($child_entities_list);
-	foreach ($child_entities_list as $controller_name => $es) {
+	foreach ($child_entities_list as $child_controller_name => $es) {
 	    //debug($es);
 	    // function displaySectionShowHide($controller_name, $entity_type_name, $title, $id_name, $is_masculine, $name_field_name, $entities) {
 	    $fk_contained_name = $es['fk_contained_name'];
 	    //debug($entity->$fk_contained_name);
 	    //$entities = $entity->$fk_contained_name;
 	    //debug($entities); exit;
+	    
+	    /* (EP202010)
+	     * CAS TRES PARTICULIER DES UTILISATEURS ASSOCIÉS À UN GROUPE THÉMATIQUE OU MÉTIER
+	     * => On ajoute à chaque nom d'utilisateur la mention '(responsable)' s'il est responsabble du groupe 
+	     * (bidouille, pas très clean, mais difficile de gérer des cas très particuliers dans des algos génériques...)
+	     */
+	    if ( 
+	       ($entity instanceof GroupesThematique || $entity instanceof GroupesMetier)
+	       && 
+	       $child_controller_name == 'Users'
+        ) {
+            $f_isresp_name = ($entity instanceof GroupesThematique) ? 'is_resp_groupes_thematique' : 'is_resp_groupes_metier';
+            foreach ($entity->$fk_contained_name as $user)
+                if ($user->$f_isresp_name) $user->nom = $user->nom.' (responsable)';
+	    }
+	    
 	    $this->MyHelper->displayAssociatedEntitiesAsSectionShowHide(
     	    //$es['controller_name'],
-    	    $controller_name,
+	        $child_controller_name,
     	    $es['entity_type_name_singular'],
     	    $es['entity_title'],
     	    //$es['id_name'],
--
libgit2 0.21.2