<?php
/***************************************************************************
- * Copyright (C) 2003-2013 Polytechnique.org *
+ * Copyright (C) 2003-2014 Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
protected function buildCondition(Watch $watch)
{
+ $not_dead = new PFC_Not(new UFC_Dead());
$select_date = new PFC_OR(new UFC_Birthday('=', time()),
new PFC_And(new UFC_Birthday('<=', time() + self::WATCH_LIMIT),
new UFC_Birthday('>', $watch->date() + self::WATCH_LIMIT)));
new UFC_Promo('<=', $profile->mainGrade(), $profile->yearpromo() + 1)),
$watch->groupCondition());
}
- return new PFC_And($select_date, $cond);
+ return new PFC_And($not_dead, $select_date, $cond);
}
public function getOrder()
}
}
-// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
+// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8:
?>