sort Achievements by position and hide title and description of secret Achievements

This commit is contained in:
coderkun 2014-04-14 15:35:57 +02:00
commit de7e5e05cb
2 changed files with 13 additions and 7 deletions

View file

@ -66,15 +66,16 @@
* @param int $seminaryId ID of Seminary to get Achievements of
* @return array Achievements data
*/
public function getAchievementsForSeminary($seminaryId, $includeHidden=false)
public function getAchievementsForSeminary($seminaryId)
{
return $this->db->query(
'SELECT achievements.id, achievementconditions.condition, title, url, description, progress, unachieved_achievementsmedia_id, achieved_achievementsmedia_id '.
'SELECT achievements.id, achievementconditions.condition, title, url, description, progress, hidden, unachieved_achievementsmedia_id, achieved_achievementsmedia_id '.
'FROM achievements '.
'LEFT JOIN achievementconditions ON achievementconditions.id = achievements.achievementcondition_id '.
'WHERE seminary_id = ? AND hidden <= ?',
'ii',
$seminaryId, $includeHidden
'WHERE seminary_id = ? '.
'ORDER BY achievements.pos ASC',
'i',
$seminaryId
);
}

View file

@ -12,8 +12,13 @@
<?php if(!is_null($achievement[$achievement['media_index']])) : ?>
<img src="<?=$linker->link(array('media','achievement',$seminary['url'],$achievement['url']))?>" />
<?php endif ?>
<h3><?=$achievement['title']?></h3>
<?=\hhu\z\Utils::t($achievement['description'])?><br />
<h3><?=(!$achievement['hidden']) ? $achievement['title'] : _('Secret Achievement')?></h3>
<?php if(!$achievement['hidden']) : ?>
<?=\hhu\z\Utils::t($achievement['description'])?>
<?php else : ?>
<?=_('Continue playing to unlock this secret Achievement')?>
<?php endif ?>
<br />
<?php if(array_key_exists('characterProgress', $achievement)) : ?>
<div class="cf">