Merge pull request #292 from datanfr/feature-comparison-stats-mps

Correction & change function name
datanfr · Sep 29, 2021 · a760a2a · a760a2a
2 parents 00d58ce + 1dc40e3
commit a760a2a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/application/controllers/Deputes.php b/application/controllers/Deputes.php
@@ -358,7 +358,7 @@ public function individual($nameUrl, $departement) {
       // Historique du député
       $data['depute']['datePriseFonctionLettres'] = utf8_encode(strftime('%B %Y', strtotime($data['depute']['datePriseFonction'])));
       $data['mandat_edito'] = $this->depute_edito->get_nbr_lettre($data['depute']['mandatesN']);
-      $data['history_average'] = round($this->deputes_model->get_history_all_mps($mpId));
+      $data['history_average'] = round($this->deputes_model->get_average_length_as_mp($mpId));
       $data['history_edito'] = $this->depute_edito->history(round($data['depute']['mpLength']/365), $data['history_average']);
       $data['mandats'] = $this->deputes_model->get_historique_mandats($mpId);
       $data['mandatsReversed'] = array_reverse($data['mandats']);

diff --git a/application/models/Depute_edito.php b/application/models/Depute_edito.php
@@ -165,7 +165,7 @@ public function history($mp, $average){
         return 'moins que la moyenne';
       } elseif($mp > $average){
         return 'plus que la moyenne';
-      } elseif($mp == $average){
+      } else {
         return 'autant que la moyenne';
       }
     }

diff --git a/application/models/Deputes_model.php b/application/models/Deputes_model.php
@@ -250,7 +250,7 @@ public function get_other_deputes_legislature($nameLast, $depute_uid, $legislatu
       return $this->db->query($sql, array($depute_uid, $legislature, $nameLast))->result_array();
     }
 
-    public function get_history_all_mps($legislature){
+    public function get_average_length_as_mp($legislature){
       $this->db->select('length');
       $result = $this->db->get('history_mps_average', 1)->row_array();
       return $result['length'];