Merge pull request #1046 from datanfr/delete-warning-card_home

Delete warning card home

Author: remikel

application/controllers/Stats.php

@@ -201,6 +201,10 @@ public function individual($url){
         $data['ageMeanPop'] = round(mean_age_france());
         $data['groupsAge'] = $this->stats_model->get_groups_age();
         if ($data['groupsAge']) {
+          foreach ($data['groupsAge'] as &$group) {
+            $group['couleurCard'] = $this->groupes_model->get_groupe_color_card(['uid' => $group['organeRef']]);
+          } 
+          unset($group);
           $data['groupOldest'] = array_slice($data['groupsAge'], 0, 1);
           $data['groupOldest'] = $data['groupOldest'][0];
           $data['groupOldest']['couleurAssociee'] = $this->groupes_model->get_groupe_color(array($data['groupOldest']['libelleAbrev'], $data['groupOldest']['couleurAssociee']));
@@ -223,6 +227,10 @@ public function individual($url){
         $data['womenMean']['diff'] = abs($women_mean[1]['percentage'] - $data['womenMean']['nSociety']);
         $data['groupsWomen'] = $this->stats_model->get_groups_women();
         if ($data['groupsWomen']) {
+          foreach ($data['groupsWomen'] as &$group) {
+            $group['couleurCard'] = $this->groupes_model->get_groupe_color_card(['uid' => $group['organeRef']]);
+          } 
+          unset($group);
           $data['groupsWomenFirst'] = $data['groupsWomen'][0];
           $data['groupsWomenFirst']['couleurAssociee'] = $this->groupes_model->get_groupe_color(array($data['groupsWomenFirst']['libelleAbrev'], $data['groupsWomenFirst']['couleurAssociee']));
           $data['groupsWomenLast'] = end($data['groupsWomen']);
@@ -256,6 +264,7 @@ public function individual($url){
         $data['groups'] = $this->stats_model->get_groups_cohesion();
         if ($data['groups']) {
           foreach ($data['groups'] as $key => $value) {
+            $data['groups'][$key]['couleurCard'] = $this->groupes_model->get_groupe_color_card(['uid' => $value['organeRef']]);
             if ($value['libelleAbrev'] == 'NI') {
               $keyRemoveNI = $key;
             }
@@ -323,6 +332,10 @@ public function individual($url){
 
         $data['groups'] = $data['n_sps'] < 10 ? $data['votes_all'] : $data['votes_sps'];
         if ($data['groups']) {
+          foreach ($data['groups'] as &$group) {
+            $group['couleurCard'] = $this->groupes_model->get_groupe_color_card(['uid' => $group['organeRef']]);
+          } 
+          unset($group);
           $data['groupsFirst'] = $data['groups'][0];
           $data['groupsFirst']['couleurAssociee'] = $this->groupes_model->get_groupe_color(array($data['groupsFirst']['libelleAbrev'], $data['groupsFirst']['couleurAssociee']));
           $data['groupsLast'] = end($data['groups']);
@@ -362,6 +375,12 @@ public function individual($url){
         }
         $data['groups_rose'] = $this->jobs_model->get_groups_rose();
         if ($data['groups_rose']) {
+          foreach ($data['groups_rose'] as &$group) {
+            $group['couleurCard'] = $this->groupes_model->get_groupe_color_card([
+                'uid' => $group['organeRef']
+            ]);
+          }
+          unset($group);
           $data['rose_first'] = $data['groups_rose'][0];
           $data['rose_first']['couleurAssociee'] = $this->groupes_model->get_groupe_color(array($data['rose_first']['libelleAbrev'], $data['rose_first']['couleurAssociee']));
           $groups = $this->jobs_model->get_groups_representativite();

application/models/Stats_model.php

@@ -98,13 +98,14 @@ public function get_mps_loyalty($legislature) : array
         $sql = 'SELECT 
                     RANK() OVER (ORDER BY cl.score DESC, cl.votesN DESC) AS "rank", 
                     cl.mpId, 
-                    ROUND(cl.score * 100) AS score, 
+                    cl.legislature,
+                    ROUND(cl.score * 100) AS score,
                     cl.votesN, 
                     da.civ, 
                     da.nameLast, 
                     da.nameFirst, 
                     da.nameUrl, 
-                    da.legislature, 
+                    da.legislature AS legislature_last, 
                     da.img, 
                     da.libelle AS libelle, 
                     da.libelleAbrev AS libelleAbrev, 
@@ -195,7 +196,8 @@ public function get_mps_participation() : array
                     da.couleurAssociee, 
                     da.img, 
                     da.departementNom, 
-                    da.departementCode, 
+                    da.departementCode,
+                    CONCAT(da.departementNom, " (", da.departementCode, ")") AS cardCenter,  
                     da.legislature AS legislature_last
                 FROM class_participation cp
                 LEFT JOIN deputes_last da