Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

leaderboard #34

Merged
merged 1 commit into from
Feb 6, 2015
Merged

leaderboard #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions src/PlaygroundReward/Controller/Frontend/IndexController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,20 +69,25 @@ public function leaderboardAction()
{
$filter = $this->getEvent()->getRouteMatch()->getParam('filter');
$search = $this->params()->fromQuery('name');
$order = $this->params()->fromQuery('order');
$dir = $this->params()->fromQuery('dir');

$leaderboard = $this->getLeaderboardService()->getLeaderboardQuery($filter, 0, $search);
$leaderboard = $this->getLeaderboardService()->getLeaderboardQuery($filter, 0, $search, $order, $dir);

$filters = $this->getLeaderboardTypeService()->getLeaderboardTypeMapper()->findAll();
$paginator = new Paginator(new DoctrineAdapter(new ORMPaginator($leaderboard)));
$paginator->setItemCountPerPage(100);

$paginator = new \Zend\Paginator\Paginator(new \Zend\Paginator\Adapter\ArrayAdapter($leaderboard));
$paginator->setItemCountPerPage(10);
$paginator->setCurrentPageNumber($this->getEvent()->getRouteMatch()->getParam('p'));

return new ViewModel(
array(
'search' => $search,
'filter' => $filter,
'filters' => $filters,
'leaderboard' => $paginator
'leaderboard' => $paginator,
'order' => $order,
'dir' => $dir
)
);
}
Expand Down
62 changes: 40 additions & 22 deletions src/PlaygroundReward/Service/Leaderboard.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
use ZfcBase\EventManager\EventProvider;
use PlaygroundReward\Options\ModuleOptions;
use PlaygroundReward\Entity\Leaderboard as LeaderboardEntity;
use Doctrine\ORM\Query\ResultSetMappingBuilder;

class Leaderboard extends EventProvider implements ServiceManagerAwareInterface
{
Expand Down Expand Up @@ -104,39 +105,56 @@ public function getTotal($user)
*
* @return Query $query
*/
public function getLeaderboardQuery($leaderboardType = null, $nbItems = 5, $search = null)
public function getLeaderboardQuery($leaderboardType = null, $nbItems = 5, $search = null, $order = null, $dir = null)
{
$em = $this->getServiceManager()->get('playgroundreward_doctrine_em');
$filterSearch = '';


if ($search != '') {
$filterSearch = ' AND (u.username LIKE :queryString1 OR u.lastname LIKE :queryString2 OR u.firstname LIKE :queryString3)';
$filterSearch = ' AND (u.address LIKE :queryString1 OR u.address2 LIKE :queryString2 OR u.city LIKE :queryString3)'; // FIXME fields to apply querySearch
}

$query = $em->createQuery('
SELECT e.totalPoints as points, u.username, u.avatar, u.id, u.firstname, u.lastname, u.title, u.state
FROM PlaygroundReward\Entity\Leaderboard e
JOIN e.user u
WHERE u.state = 1 AND e.leaderboardType = :leaderboardTypeId '.$filterSearch.'
ORDER BY e.totalPoints DESC
');

if (empty($leaderboardType)) {
$leaderboardType = $this->getLeaderboardTypeService()->getLeaderboardTypeDefault();
}elseif (is_string($leaderboardType)) {

$availableOrders = array('total_points', 'city', 'address2', 'address');
if ($order && in_array($order, $availableOrders)) {
$order = 'ORDER BY ' . $order;
} else {
$order = 'ORDER BY total_points';
}

if ($dir && in_array($dir, array('asc', 'desc'))) {
$order .= ' ' . $dir;
} else {
$order .= ' desc';
}

$dbal = $em->getConnection();
$stmt = '
SELECT e.*, u.*
FROM (
SELECT sube.*, @curRank := @curRank + 1 AS rank FROM reward_leaderboard sube, (SELECT @curRank := 0) r ORDER BY sube.total_points DESC
) as e
JOIN user u ON u.user_id = e.user_id
WHERE u.state = 1 AND e.leaderboardtype_id = :leaderboardTypeId '.$filterSearch. ' ' . $order;

if (is_string($leaderboardType) && !empty($leaderboardType)) {
$leaderboardType = $this->getLeaderboardTypeService()->getLeaderboardTypeMapper()->findOneBy(array('name' => $leaderboardType));
} else {
$leaderboardType = $this->getLeaderboardTypeService()->getLeaderboardTypeDefault();
}

$query->setParameter('leaderboardTypeId', $leaderboardType->getId());

if (!$leaderboardType) {
$leaderboardType = $this->getLeaderboardTypeService()->getLeaderboardTypeDefault();
}

$parameters = array('leaderboardTypeId' => $leaderboardType->getId());

if ($search != '') {
$query->setParameter('queryString1', '%'.$search.'%');
$query->setParameter('queryString2', '%'.$search.'%');
$query->setParameter('queryString3', '%'.$search.'%');
$parameters['queryString1'] = '%'.$search.'%';
$parameters['queryString2'] = '%'.$search.'%';
$parameters['queryString3'] = '%'.$search.'%';
}

return $query;
return $dbal->fetchAll($stmt, $parameters);
}

/**
Expand Down