Changeset 2653 for cpc/trunk/project

Timestamp:

Apr 14, 2012, 2:23:45 PM (9 years ago)

Author:

goya

Message:

ajout commenté du code pour afficher les stats de synthese par sexe et nb mandats

Location:

cpc/trunk/project

Files:

• apps/frontend/modules/parlementaire/actions/actions.class.php (modified) (3 diffs)
• apps/frontend/modules/parlementaire/templates/topSuccess.php (modified) (1 diff)
• lib/model/doctrine/myTools.class.php (modified) (1 diff)

cpc/trunk/project/apps/frontend/modules/parlementaire/actions/actions.class.php

@@ -362 +362 @@
       $this->gpes[$gpe[1]][0]['desc'] = $gpe[3];
     }
+/*
+    $this->mandats = array();
+    for ($i = 1; $i < 6; $i++) {
+      $this->mandats[$i] = array();
+      $this->mandats[$i][0] = array();
+      $this->mandats[$i][0]['nb'] = 0;
+      $this->mandats[$i][0]['nom'] = "$i mandat".($i > 1 ? "s" : "");
+    }
+    $this->sexes = array("H" => array("0" => array("nb" => 0, "nom" => "Hommes")), "F" => array("0" => array("nb" => 0, "nom" => "Femmes")));
+*/
     foreach($parlementaires as $p) {
       $tops = unserialize($p['top']);
@@ -367 +377 @@
       $i = 0;
       $this->tops[$id][$i++] = $p;
+#      $nbmdts = count(unserialize($p['autres_mandats']));
+#      $this->sexes[$p['sexe']][0]['nb']++;
+#      $this->mandats[$nbmdts][0]['nb']++;
       $this->gpes[$p['groupe_acronyme']][0]['nb']++;
       foreach(array_keys($tops) as $key) {
@@ -379 +392 @@
           $this->gpes[$p['groupe_acronyme']][$i] = 0;
         $this->gpes[$p['groupe_acronyme']][$i] += $tops[$key]['value'];
+/*
+        if (!isset($this->sexes[$p['sexe']][$i]))
+          $this->sexes[$p['sexe']][$i] = 0;
+        $this->sexes[$p['sexe']][$i] += $tops[$key]['value'];
+        if (!isset($this->mandats[$nbmdts][$i]))
+          $this->mandats[$nbmdts][$i] = 0;
+        $this->mandats[$nbmdts][$i] += $tops[$key]['value'];
+*/
         $i++;
       }

cpc/trunk/project/apps/frontend/modules/parlementaire/templates/topSuccess.php

@@ -121 +121 @@
 <div class="synthese_groupes">
 <table>
-  <?php $cpt = 0; foreach ($gpes as $gpe => $t) {
-    $cpt++;?><tr<?php if ($cpt %2) echo ' class="tr_odd"'?>>
-    <td id="<?php echo $gpe; ?>" class="jstitle c_<?php echo strtolower($gpe); ?> <?php echo $class['parl']; ?>" title="<?php echo $t[0]['nom']." -- ".$t[0]['desc']; ?>"><a href="<?php echo url_for('@list_parlementaires_groupe?acro='.$gpe); ?>"><?php echo $gpe." : ".$t[0]['nb']." députés"; ?></a></td>
-    <?php for($i = 1 ; $i < count($t) ; $i++) {
-      $t[$i] = round($t[$i]/$t[0]['nb']); ?>
-      <td title="<?php echo $t[$i].' '; if ($t[$i] < 2) echo preg_replace('/s (.*-- )/', ' \\1', preg_replace('/s (.*-- )/', ' \\1', $bulles[$i])); else echo $bulles[$i]; ?>" class="jstitle <?php echo $class[$ktop[$i]]; ?>">
-      <?php if (preg_match('/\./', $t[$i]))
-        printf('%02d', $t[$i]);
-      else echo $t[$i]; ?>
-      </td>
-    <?php } ?>
-  </tr>
-<?php } ?>
+  <?php $cp = 0;
+  $cp = myTools::echo_synthese_groupe($gpes, $bulles, $class, $ktop, $cp);
+#  $cp = myTools::echo_synthese_groupe($sexes, $bulles, $class, $ktop, $cp);
+#  $cp = myTools::echo_synthese_groupe($mandats, $bulles, $class, $ktop, $cp); ?>
 </table>
 </div>

cpc/trunk/project/lib/model/doctrine/myTools.class.php

@@ -179 +179 @@
     return $s;
   }
+
+  public static function echo_synthese_groupe($list, $bulles, $class, $ktop, $cpt) {
+    foreach ($list as $gpe => $t) {
+      $cpt++;
+      echo '<tr'.($cpt %2 ? ' class="tr_odd"' : '').'>';
+      echo '<td id="'.$gpe.'" class="jstitle c_'.strtolower($gpe).' '.$class['parl'].'" title="'.$t[0]['nom'];
+      if (isset($t[0]['desc'])) {
+        echo ' -- '.$t[0]['desc'].'"><a href="'.url_for('@list_parlementaires_groupe?acro='.$gpe).'">'.$gpe.' : '.$t[0]['nb'].' députés</a>';
+      } else {
+        echo '">'.$t[0]['nom']." : ".$t[0]['nb'];
+      }
+      echo '</td>';
+      for($i = 1 ; $i < count($t) ; $i++) {
+        $t[$i] = round($t[$i]/$t[0]['nb']);
+        echo '<td title="'.$t[$i].' '.($t[$i] < 2 ? preg_replace('/s (.*-- )/', ' \\1', preg_replace('/s (.*-- )/', ' \\1', $bulles[$i])) : $bulles[$i]).'" class="jstitle '.$class[$ktop[$i]].'">';
+        if (preg_match('/\./', $t[$i]))
+          printf('%02d', $t[$i]);
+        else echo $t[$i];
+        echo '</td>';
+      }
+      echo '</tr>';
+    }
+    return $cpt;
+  }
+
 }