coderkun/questlab
1
0
Fork 0
Code Issues 15 Pull requests Projects Releases Wiki Activity

do not list only-once-Achievements that have already be achieved (Issue #215)

Browse source
This commit is contained in:
coderkun 2014-05-06 10:15:18 +02:00
commit 3fea2c4799
2 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
controllers/AchievementsController.inc
View file

@ -74,7 +74,16 @@
$achievedAchievements = $this->Achievements->getAchievedAchievementsForCharacter($character['id'], false); $achievedAchievements = $this->Achievements->getAchievedAchievementsForCharacter($character['id'], false);
// Get unachieved Achievements // Get unachieved Achievements
$unachievedAchievements = $this->Achievements->getUnachhievedAchievementsForCharacter($seminary['id'], $character['id'], true, false); $unachievedAchievements = array_merge(
$this->Achievements->getUnachhievedAchievementsForCharacter($seminary['id'], $character['id'], false, false),
$this->Achievements->getUnachievedOnlyOnceAchievementsForSeminary($seminary['id'])
);
usort($unachievedAchievements, function($a, $b) {
if($a['pos'] == $b['pos']) {
return 0;
}
return ($a['pos'] > $b['pos']) ? 1 : -1;
});
foreach($unachievedAchievements as &$achievement) foreach($unachievedAchievements as &$achievement)
{ {
// Get Character progress // Get Character progress

10
models/AchievementsModel.inc
View file

@ -70,7 +70,7 @@
public function getUnachievedOnlyOnceAchievementsForSeminary($seminaryId) public function getUnachievedOnlyOnceAchievementsForSeminary($seminaryId)
{ {
return $this->db->query( return $this->db->query(
'SELECT achievements.id, achievementconditions.condition, title, url, description, progress, hidden, only_once, all_conditions, deadline, unachieved_achievementsmedia_id, achieved_achievementsmedia_id '. 'SELECT achievements.id, achievements.pos, achievementconditions.condition, title, url, description, progress, hidden, only_once, all_conditions, deadline, unachieved_achievementsmedia_id, achieved_achievementsmedia_id '.
'FROM achievements '. 'FROM achievements '.
'LEFT JOIN achievementconditions ON achievementconditions.id = achievements.achievementcondition_id '. 'LEFT JOIN achievementconditions ON achievementconditions.id = achievements.achievementcondition_id '.
'WHERE achievements.seminary_id = ? AND only_once = 1 AND NOT EXISTS ('. 'WHERE achievements.seminary_id = ? AND only_once = 1 AND NOT EXISTS ('.
@ -93,7 +93,7 @@
public function getDeadlineAchievements($seminaryId) public function getDeadlineAchievements($seminaryId)
{ {
return $this->db->query( return $this->db->query(
'SELECT achievements.id, achievementconditions.condition, title, url, description, progress, hidden, only_once, all_conditions, deadline, unachieved_achievementsmedia_id, achieved_achievementsmedia_id '. 'SELECT achievements.id, achievements.pos, achievementconditions.condition, title, url, description, progress, hidden, only_once, all_conditions, deadline, unachieved_achievementsmedia_id, achieved_achievementsmedia_id '.
'FROM achievements '. 'FROM achievements '.
'LEFT JOIN achievementconditions ON achievementconditions.id = achievements.achievementcondition_id '. 'LEFT JOIN achievementconditions ON achievementconditions.id = achievements.achievementcondition_id '.
'WHERE achievements.seminary_id = ? AND deadline IS NOT NULL '. 'WHERE achievements.seminary_id = ? AND deadline IS NOT NULL '.
@ -114,7 +114,7 @@
public function getSeldomAchievements($seminaryId, $count, $alsoWithDeadline=true) public function getSeldomAchievements($seminaryId, $count, $alsoWithDeadline=true)
{ {
return $this->db->query( return $this->db->query(
'SELECT achievements.id, achievements.title, achievements.url, achievements.description, achievements.progress, achievements.hidden, achievements.unachieved_achievementsmedia_id, achievements.achieved_achievementsmedia_id, count(DISTINCT achievements_characters.character_id) AS c '. 'SELECT achievements.id, achievements.pos, achievements.title, achievements.url, achievements.description, achievements.progress, achievements.hidden, achievements.unachieved_achievementsmedia_id, achievements.achieved_achievementsmedia_id, count(DISTINCT achievements_characters.character_id) AS c '.
'FROM achievements_characters '. 'FROM achievements_characters '.
'INNER JOIN characters_characterroles ON characters_characterroles.character_id = achievements_characters.character_id '. 'INNER JOIN characters_characterroles ON characters_characterroles.character_id = achievements_characters.character_id '.
'INNER JOIN characterroles ON characterroles.id = characters_characterroles.characterrole_id AND characterroles.name = ? '. 'INNER JOIN characterroles ON characterroles.id = characters_characterroles.characterrole_id AND characterroles.name = ? '.
@ -141,7 +141,7 @@
public function getAchievedAchievementsForCharacter($characterId, $alsoWithDeadline=true) public function getAchievedAchievementsForCharacter($characterId, $alsoWithDeadline=true)
{ {
return $this->db->query( return $this->db->query(
'SELECT achievements.id, achievements_characters.created, achievements.title, achievements.url, achievements.description, achievements.progress, unachieved_achievementsmedia_id, achieved_achievementsmedia_id '. 'SELECT achievements.id, achievements.pos, achievements_characters.created, achievements.title, achievements.url, achievements.description, achievements.progress, unachieved_achievementsmedia_id, achieved_achievementsmedia_id '.
'FROM achievements '. 'FROM achievements '.
'INNER JOIN achievements_characters ON achievements_characters.achievement_id = achievements.id '. 'INNER JOIN achievements_characters ON achievements_characters.achievement_id = achievements.id '.
'WHERE achievements_characters.character_id = ? '. 'WHERE achievements_characters.character_id = ? '.
@ -163,7 +163,7 @@
public function getUnachhievedAchievementsForCharacter($seminaryId, $characterId, $includeOnlyOnce=false, $alsoWithDeadline=true) public function getUnachhievedAchievementsForCharacter($seminaryId, $characterId, $includeOnlyOnce=false, $alsoWithDeadline=true)
{ {
return $this->db->query( return $this->db->query(
'SELECT achievements.id, achievementconditions.condition, title, url, description, progress, hidden, only_once, all_conditions, deadline, unachieved_achievementsmedia_id, achieved_achievementsmedia_id '. 'SELECT achievements.id, achievements.pos, achievementconditions.condition, title, url, description, progress, hidden, only_once, all_conditions, deadline, unachieved_achievementsmedia_id, achieved_achievementsmedia_id '.
'FROM achievements '. 'FROM achievements '.
'LEFT JOIN achievementconditions ON achievementconditions.id = achievements.achievementcondition_id '. 'LEFT JOIN achievementconditions ON achievementconditions.id = achievements.achievementcondition_id '.
'WHERE achievements.seminary_id = ? AND only_once <= ? AND NOT EXISTS ('. 'WHERE achievements.seminary_id = ? AND only_once <= ? AND NOT EXISTS ('.