From 27371bea2cbdf9e0f8d33e1b702493dc337c5d11 Mon Sep 17 00:00:00 2001
From: =?utf8?q?St=C3=A9phane=20Jacob?= <sj@m4x.org>
Date: Sun, 5 Jun 2011 22:28:26 +0200
Subject: [PATCH] Improves statistics veracity.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Jacob <sj@m4x.org>
---
 modules/marketing.php         | 14 +++++++-------
 templates/marketing/index.tpl | 12 ++++++------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/modules/marketing.php b/modules/marketing.php
index e6d3aff..75d99e9 100644
--- a/modules/marketing.php
+++ b/modules/marketing.php
@@ -41,12 +41,12 @@ class MarketingModule extends PLModule
         $page->changeTpl('marketing/index.tpl');
         $page->setTitle('Marketing');
 
-        $alive = new UserFilter(new PFC_Not(new UFC_Dead()));
-        $registered = new UserFilter(new PFC_And(new UFC_Registered(), new PFC_Not(new UFC_Dead())));
-        $alive72 = new UserFilter(new PFC_And(new UFC_Promo('>=', UserFilter::GRADE_ING, 1972), new PFC_Not(new UFC_Dead())));
-        $registered72 = new UserFilter(new PFC_And(new UFC_Registered(), new UFC_Promo('>=', UserFilter::GRADE_ING, 1972), new PFC_Not(new UFC_Dead())));
-        $aliveWomen = new UserFilter(new PFC_And(new UFC_Sex(User::GENDER_FEMALE) , new PFC_Not(new UFC_Dead())));
-        $registeredWomen = new UserFilter(new PFC_And(new UFC_Registered(), new UFC_Sex(User::GENDER_FEMALE), new PFC_Not(new UFC_Dead())));
+        $alive = new ProfileFilter(new PFC_Not(new UFC_Dead()));
+        $registered = new ProfileFilter(new PFC_And(new UFC_Registered(true), new PFC_Not(new UFC_Dead())));
+        $alive72 = new ProfileFilter(new PFC_And(new UFC_Promo('>=', UserFilter::GRADE_ING, 1972), new PFC_Not(new UFC_Dead())));
+        $registered72 = new ProfileFilter(new PFC_And(new UFC_Registered(true), new UFC_Promo('>=', UserFilter::GRADE_ING, 1972), new PFC_Not(new UFC_Dead())));
+        $aliveWomen = new ProfileFilter(new PFC_And(new UFC_Sex(User::GENDER_FEMALE) , new PFC_Not(new UFC_Dead())));
+        $registeredWomen = new ProfileFilter(new PFC_And(new UFC_Registered(true), new UFC_Sex(User::GENDER_FEMALE), new PFC_Not(new UFC_Dead())));
         $statistics = array(
             'alive'           => $alive->getTotalCount(),
             'registered'      => $registered->getTotalCount(),
@@ -59,7 +59,7 @@ class MarketingModule extends PLModule
         $statistics['registeredRate72']    = $statistics['registered72'] / $statistics['alive72'] * 100;
         $statistics['womenRegisteredRate'] = $statistics['womenRegistered'] / $statistics['womenAlive'] * 100;
 
-        $registeredWeek = new UserFilter(new PFC_And(new UFC_Registered(false, '>=', strtotime('1 week ago')), new PFC_Not(new UFC_Dead())));
+        $registeredWeek = new ProfileFilter(new PFC_And(new UFC_Registered(true, '>=', strtotime('1 week ago')), new PFC_Not(new UFC_Dead())));
         $registrationPending = XDB::fetchOneCell('SELECT  COUNT(*)
                                                     FROM  register_pending');
         $registrations = array(
diff --git a/templates/marketing/index.tpl b/templates/marketing/index.tpl
index 1bfbf79..a137e24 100644
--- a/templates/marketing/index.tpl
+++ b/templates/marketing/index.tpl
@@ -40,21 +40,21 @@
 <br />
 
 <p>
-nombre d'X vivants d'après notre base de données&nbsp;: {$statistics.alive}<br />
-nombre d'X vivants inscrits à Polytechnique.org&nbsp;: {$statistics.registered}<br />
+nombre d'étudiants et anciens de l'X vivants d'après notre base de données&nbsp;: {$statistics.alive}<br />
+nombre d'étudiants et anciens de l'X vivants inscrits à Polytechnique.org&nbsp;: {$statistics.registered}<br />
 Soit un pourcentage d'inscrits de&nbsp;: {$statistics.registeredRate} %<br />
 </p>
 
 <p>
 Parmi ceux-ci&nbsp;:<br />
-nombre d'X vivants depuis 1972 d'après notre base de données&nbsp;: {$statistics.alive72}<br />
-nombre d'X vivants depuis 1972 inscrits à Polytechnique.org&nbsp;: {$statistics.registered72}<br />
+nombre d'X vivants depuis la promo 1972 d'après notre base de données&nbsp;: {$statistics.alive72}<br />
+nombre d'X vivants depuis la promo 1972 inscrits à Polytechnique.org&nbsp;: {$statistics.registered72}<br />
 Soit un pourcentage d'inscrits de&nbsp;: {$statistics.registeredRate72} %<br />
 </p>
 
 <p>
-nombre de Polytechniciennes vivantes&nbsp;: {$statistics.womenAlive}<br />
-nombre de Polytechniciennes vivantes et inscrites&nbsp;: {$statistics.womenRegistered}<br />
+nombre de étudiantes et anciennes de l'X vivantes&nbsp;: {$statistics.womenAlive}<br />
+nombre de étudiantes et anciennes de l'X vivantes et inscrites&nbsp;: {$statistics.womenRegistered}<br />
 Soit un pourcentage d'inscrites de&nbsp;: {$statistics.womenRegisteredRate} %<br />
 </p>
 
-- 
2.1.4