X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fmarketing.php;h=96b2cf207bf0e61a9b8830abb4cc16ab3be10208;hb=78a47eb456adb9dec306b7de02391956f98a239c;hp=3d63d6d83611d62145a95e7b3f97ae7793d53f73;hpb=e46cf8c46341b447cc3701c8afcc9baec3da11e5;p=platal.git diff --git a/modules/marketing.php b/modules/marketing.php index 3d63d6d..96b2cf2 100644 --- a/modules/marketing.php +++ b/modules/marketing.php @@ -1,6 +1,6 @@ changeTpl('marketing/index.tpl'); - $page->setTitle('Marketing'); - $page->trigWarning("Les statistiques sont momentanéement désactivées"); + + $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()))); + $statistics = array( + 'alive' => $alive->getTotalCount(), + 'registered' => $registered->getTotalCount(), + 'alive72' => $alive72->getTotalCount(), + 'registered72' => $registered72->getTotalCount(), + 'womenAlive' => $aliveWomen->getTotalCount(), + 'womenRegistered' => $registeredWomen->getTotalCount(), + ); + $statistics['registeredRate'] = $statistics['registered'] / $statistics['alive'] * 100; + $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()))); + $registrationPending = XDB::fetchOneCell('SELECT COUNT(*) + FROM register_pending'); + $registrations = array( + 'week' => $registeredWeek->getTotalCount(), + 'pending' => $registrationPending, + ); + + $ok = XDB::fetchOneCell('SELECT COUNT(*) + FROM register_mstats + WHERE success != \'0000-00-00\''); + $okWeek = XDB::fetchOneCell('SELECT COUNT(*) + FROM register_mstats + WHERE success >= {?}', strtotime('1 week ago')); + $res = XDB::fetchAllAssoc('SELECT type, COUNT(*) as count + FROM register_marketing + GROUP BY type'); + $no = array(); + foreach ($res as $value) { + $no[$value['type']] = $value['count']; + } + $no['week'] = XDB::fetchOneCell('SELECT COUNT(*) + FROM register_marketing + WHERE last >= {?}', strtotime('1 week ago')); + $marketings = array( + 'ok' => $ok, + 'okWeek' => $okWeek, + 'noPerso' => (isset($no['user']) ? $no['user'] : 0), + 'noXorg' => (isset($no['staff']) ? $no['staff'] : 0), + 'noAX' => (isset($no['ax']) ? $no['ax'] : 0), + 'noWeek' => $no['week'], + ); + + $page->assign('statistics', $statistics); + $page->assign('registrations', $registrations); + $page->assign('marketings', $marketings); } function handler_private(&$page, $hruid = null, @@ -64,8 +117,7 @@ class MarketingModule extends PLModule } $matricule = $user->profile()->xorg_id; - require_once('user.func.inc.php'); - $matricule_X = get_X_mat($matricule); + $matricule_X = Profile::getSchoolId($matricule); $page->assign('full_name', $user->fullName()); $page->assign('promo', $user->promo()); @@ -124,8 +176,8 @@ class MarketingModule extends PLModule $res = XDB::iterator( "SELECT r.*, a.alias FROM register_marketing AS r - LEFT JOIN aliases AS a ON (r.sender=a.id AND a.type = 'a_vie') - WHERE uid={?} + LEFT JOIN aliases AS a ON (r.sender = a.uid AND a.type = 'a_vie') + WHERE r.uid = {?} ORDER BY date", $user->id()); $page->assign('addr', $res); @@ -191,7 +243,6 @@ class MarketingModule extends PLModule $page->trigError("Il faut que tu ajoutes un commentaire à ta proposition pour justifier le " . "besoin de changer la redirection de {$user->fullName()}."); } else { - require_once 'validations.inc.php'; $valid = new BrokenReq(S::user(), $user, $email, trim(Post::v('comment'))); $valid->submit(); $page->assign('sent', true); @@ -206,13 +257,13 @@ class MarketingModule extends PLModule $page->changeTpl('marketing/promo.tpl'); if (is_null($promo)) { - $promo = S::v('promo'); + $promo = S::v('promo', S::user()->promo()); } $page->assign('promo', $promo); - $uf = new UserFilter(new UFC_And(new UFC_Promo('=', UserFilter::DISPLAY, $promo), - new UFC_Not(new UFC_Registered())), - array(new UFO_Name(UserFilter::LASTNAME), new UFO_Name(UserFilter::FIRSTNAME))); + $uf = new UserFilter(new PFC_And(new UFC_Promo('=', UserFilter::DISPLAY, $promo), + new PFC_Not(new UFC_Registered())), + array(new UFO_Name(Profile::LASTNAME), new UFO_Name(Profile::FIRSTNAME))); $users = $uf->getUsers(); $page->assign('nonins', $users); } @@ -261,6 +312,7 @@ class MarketingModule extends PLModule require_once 'marketing.inc.php'; $sender = User::getSilent(S::v('uid')); + $perso_signature = 'Cordialement,
--
' . $sender->fullName(); $market = new AnnuaireMarketing(null, true); $text = $market->getText(array( 'sexe' => $user->isFemale(), @@ -270,11 +322,10 @@ class MarketingModule extends PLModule $text = str_replace('%%hash%%', '', $text); $text = str_replace('%%personal_notes%%', '', $text); $text = str_replace('%%sender%%', - "" . $sender->fullName() . '', $text); + '' . $perso_signature . '', $text); $page->assign('text', nl2br($text)); - // TODO (JAC): define a unique Xorg signature for all the emails we send. - $page->assign('xorg_signature', "L'équipe de Polytechnique.org,
Le portail des élèves & anciens élèves de l'École polytechnique"); - $page->assign('perso_signature', $sender->fullName()); + $page->assign('perso_signature', $perso_signature); + $page->assign('mail_part', 'escaped_html'); } } @@ -302,11 +353,13 @@ class MarketingModule extends PLModule if (!is_null($promo)) { - $it = XDB::iterator('SELECT m.uid, m.email + $it = XDB::iterator('SELECT m.uid, m.email, s.alias AS forlife FROM register_marketing AS m INNER JOIN account_profiles AS ap ON (m.uid = ap.uid AND FIND_IN_SET(\'owner\', ap.perms)) INNER JOIN profile_display AS pd ON (pd.pid = ap.pid) - WHERE pd.promo = {?}', $promo); + LEFT JOIN aliases AS s ON (m.sender = s.uid AND s.type = \'a_vie\') + WHERE pd.promo = {?} + ORDER BY pd.sort_name', $promo); $page->assign('addr', $it); } } @@ -316,7 +369,8 @@ class MarketingModule extends PLModule $page->changeTpl('marketing/relance.tpl'); if (Post::has('relancer')) { - $nbdix = Marketing::getAliveUsersCount(); + global $globals; + $nbdix = $globals->core->NbIns; $sent = Array(); $users = User::getBulkUsersWithUIDs($_POST['relance']);