X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fstats.php;h=aa830a3231b5e5096fc621fa3247265a20a2964c;hb=cbdcd130c8e5189a62587da35f37ea51eddf64b5;hp=a7cc80a8d2b6af7496740d6abbec9139d25ab389;hpb=c1512af9892981d58a3385a4c319a3081b704d40;p=platal.git

diff --git a/modules/stats.php b/modules/stats.php
index a7cc80a..aa830a3 100644
--- a/modules/stats.php
+++ b/modules/stats.php
@@ -108,7 +108,7 @@ set size 640/480
 set xdata time
 set timefmt "%d/%m/%y"
 
-set format x "%m/%y"
+set format x "%d/%m\\n%Y"
 set yr [$ymin:$ymax]
 
 set title "Nombre d'inscrits"
@@ -241,6 +241,7 @@ EOF2;
     function handler_promos($page, $required_promo = null)
     {
         $page->changeTpl('stats/nb_by_promo.tpl');
+        $cycles = array('X' => 'Polytechniciens', 'M' => 'Masters', 'D' => 'Docteurs');
 
         $res = XDB::iterRow('SELECT  pd.promo, COUNT(*)
                                FROM  accounts         AS a
@@ -255,10 +256,10 @@ EOF2;
         while (list($promo, $count) = $res->next()) {
             $prefix = substr($promo, 0, 4) . '-';
             $unit = substr($promo, -1);
-            if(!isset($nbpromo[$prefix])) {
-                $nbpromo[$prefix] = array('', '', '', '', '', '', '', '', '', ''); // Empty array containing 10 cells.
+            if(!isset($nbpromo[$cycles[$promo{0}]][$prefix])) {
+                $nbpromo[$cycles[$promo{0}]][$prefix] = array('', '', '', '', '', '', '', '', '', ''); // Empty array containing 10 cells.
             }
-            $nbpromo[$prefix][$unit] = array('promo' => $promo, 'nb' => $count);
+            $nbpromo[$cycles[$promo{0}]][$prefix][$unit] = array('promo' => $promo, 'nb' => $count);
         }
 
         $count = XDB::fetchOneCell('SELECT  COUNT(*)
@@ -267,7 +268,7 @@ EOF2;
                                 INNER JOIN  profiles         AS p  ON (p.pid = ap.pid)
                                 INNER JOIN  profile_display  AS pd ON (pd.pid = ap.pid)
                                      WHERE  a.state = \'active\' AND p.deathdate IS NULL AND pd.promo = \'D (en cours)\'');
-        $nbpromo['D (en cours)'][0] = array('promo' => 'D (en cours)', 'nb' => $count);
+        $nbpromo[$cycles['D']]['D (en cours)'][0] = array('promo' => 'D (en cours)', 'nb' => $count);
 
         $page->assign_by_ref('nbs', $nbpromo);
         $page->assign('promo', $required_promo);