Skip to content

Commit cf5cc0e

Browse files
authored
Merge pull request #926 from datanfr/participation-ranking
Change Feature MPs
2 parents 71c136f + a7b08fb commit cf5cc0e

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

application/controllers/Stats.php

+12-4
Original file line numberDiff line numberDiff line change
@@ -274,23 +274,31 @@ public function individual($url){
274274
if ($data['mps']) {
275275
$data['participationMean'] = $this->stats_model->get_mps_participation_mean(legislature_current());
276276
$data['participationMean'] = $data['participationMean']['mean'];
277+
277278
$data['participationCommissionMean'] = $this->stats_model->get_mps_participation_commission_mean(legislature_current());
278279
$data['participationCommissionMean'] = $data['participationCommissionMean']['mean'];
280+
279281
$data['participationSolennelsMean'] = $this->stats_model->get_mps_participation_solennels_mean(legislature_current());
280282
$data['participationSolennelsMean'] = $data['participationSolennelsMean']['mean'];
283+
281284
$data['mpsSolennels'] = $this->stats_model->get_mps_participation_solennels(legislature_current());
282285
$data['n_sps'] = $this->votes_model->get_n_votes(legislature_current(), NULL, NULL, 'SPS');
283286
$data['votesN'] = $this->votes_model->get_n_votes(legislature_current());
284287
$data['mpsCommission'] = $this->stats_model->get_mps_participation_commission(legislature_current());
285-
$data['mpActive'] = array_slice($data['mpsSolennels'], 0, 1);
288+
289+
// Features MPs
290+
$data['mpsFeature'] = ($data['n_sps'] > 10 ? $data['mpsSolennels'] : $data['mps'])
291+
292+
$data['mpActive'] = array_slice($data['mpsFeature'], 0, 1);
286293
$data['mpActive'] = $data['mpActive'][0];
287294
$data['mpActive']['name'] = $data['mpActive']['nameFirst']." ".$data['mpActive']['nameLast'];
288295
$data['mpActive']['couleurAssociee'] = $this->groupes_model->get_groupe_color(array($data['mpActive']['libelleAbrev'], $data['mpActive']['couleurAssociee']));
289-
$data['mpActiveGender'] = gender($data['mpActive']["civ"]);
290-
$data['mpInactive'] = end($data['mpsSolennels']);
296+
$data['mpActiveGender'] = gender($data['mpActive']['civ']);
297+
298+
$data['mpInactive'] = end($data['mpsFeature']);
291299
$data['mpInactive']['name'] = $data['mpInactive']['nameFirst']." ".$data['mpInactive']['nameLast'];
292300
$data['mpInactive']['couleurAssociee'] = $this->groupes_model->get_groupe_color(array($data['mpInactive']['libelleAbrev'], $data['mpInactive']['couleurAssociee']));
293-
$data['mpInactiveGender'] = gender($data['mpInactive']["civ"]);
301+
$data['mpInactiveGender'] = gender($data['mpInactive']['civ']);
294302
}
295303

296304
// Meta

0 commit comments

Comments
 (0)