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

show all Questtexts at once in a box

Browse source
This commit is contained in:
coderkun 2014-04-01 12:17:20 +02:00
commit 4485fba10b
4 changed files with 74 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

10
controllers/QuestgroupsController.inc
View file

@ -147,7 +147,15 @@
$currentQuest['solved'] = $this->Quests->hasCharacterSolvedQuest($currentQuest['id'], $character['id']);
// Attach related Questgroups
$currentQuest['relatedQuestgroups'] = $this->Questgroups->getRelatedQuestsgroupsOfQuest($currentQuest['id']);
$currentQuest['relatedQuestgroups'] = array();
$relatedQuestgroups = $this->Questgroups->getRelatedQuestsgroupsOfQuest($currentQuest['id']);
foreach($relatedQuestgroups as &$relatedQuestgroup)
{
$firstQuest = $this->Quests->getFirstQuestOfQuestgroup($relatedQuestgroup['id']);
if(!empty($firstQuest) && $this->Quests->hasCharacterEnteredQuest($firstQuest['id'], $character['id'])) {
$currentQuest['relatedQuestgroups'][] = $relatedQuestgroup;
}
}
// Add Quest to Quests
$quests[] = $currentQuest;

40
controllers/QuestsController.inc
View file

@ -136,28 +136,27 @@
}
}
// Get Questtext
$questtext = null;
// Get Questtexts
if(is_null($questtexttypeUrl)) {
$questtexttypeUrl = 'Prolog';
}
$questtexttypes = $this->Questtexts->getQuesttexttypes();
$questtexttypes = array_map(function($t) { return $t['url']; }, $questtexttypes);
$questtextCount = $this->Questtexts->getQuesttextsCountForQuest($quest['id'], $questtexttypeUrl);
if(in_array($questtexttypeUrl, $questtexttypes))
//$questtexttypesUrls = array_map(function($t) { return $t['url']; }, $questtexttypes);
if(($questtexttypeIndex = array_search($questtexttypeUrl, array_map(function($t) { return $t['url']; }, $questtexttypes))) === false) {
throw new ParamsNotValidException($questtexttypeUrl);
}
$questtexttype = $questtexttypes[$questtexttypeIndex];
$questtexts = $this->Questtexts->getQuesttextsOfQuest($quest['id'], $questtexttypeUrl);
foreach($questtexts as &$questtext)
{
$questtextPos = max(intval($questtextPos), 1);
try {
$questtext = $this->Questtexts->getQuesttextByUrl($quest['id'], $questtexttypeUrl, $questtextPos);
$questtext['count'] = $questtextCount;
// Questtext media
if(!is_null($questtext['questsmedia_id'])) {
$questtext['media'] = $this->Media->getMediaById($questtext['questsmedia_id']);
}
// Related Questgroups
$questtext['relatedQuestsgroups'] = $this->Questgroups->getRelatedQuestsgroupsOfQuesttext($questtext['id']);
}
catch(\nre\exceptions\IdNotFoundException $e) {
if(!($questtexttypeUrl == 'Prolog' || $questtexttypeUrl == 'Epilog' && $questtextPos == 1)) {
throw $e;
}
}
}
// Quest status
$questStatus = $this->request->getGetParam('status');
@ -175,12 +174,9 @@
}
}
// Media
// Quest media
$questmedia = null;
if(!is_null($questtext) && array_key_exists('questmedia_id', $questtext) && !empty($questtext['questsmedia_id'])) {
$questmedia = $this->Media->getMediaById($questtext['questsmedia_id']);
}
elseif(!is_null($quest['questsmedia_id'])) {
if(!is_null($quest['questsmedia_id'])) {
$questmedia = $this->Media->getMediaById($quest['questsmedia_id']);
}
@ -227,6 +223,7 @@
{
// Related (Main-) Quest
$nextQuest = $relatedQuesttext['quest'];
$nextQuest['entered'] = true;
$nextQuests = array($nextQuest);
}
}
@ -236,7 +233,8 @@
// Pass data to view
$this->set('seminary', $seminary);
$this->set('questgroup', $questgroup);
$this->set('questtext', $questtext);
$this->set('questtexttype', $questtexttype);
$this->set('questtexts', $questtexts);
$this->set('quest', $quest);
$this->set('queststatus', $questStatus);
$this->set('queststatustext', $questStatusText);

59
models/QuesttextsModel.inc
View file

@ -34,41 +34,16 @@
/**
* Get a Questtext for a Quest by its URL.
*
* @throws IdNotFoundException
* @param int $questId ID of the Quest to get text for
* @param string $questtexttypeUrl URL of the Questtexttype
* @param int $pos Position of Questtexttype
* @return array Questtexttype data
*/
public function getQuesttextByUrl($questId, $questtexttypeUrl, $pos)
{
$data = $this->db->query(
'SELECT questtexts.id, questtexts.text, questtexts.pos, questtexts.out_text, questtexts.abort_text, questtexts.questsmedia_id, questtexttypes.id AS type_id, questtexttypes.type, questtexttypes.url AS type_url '.
'FROM questtexts '.
'LEFT JOIN questtexttypes ON questtexttypes.id = questtexts.questtexttype_id '.
'WHERE questtexts.quest_id = ? AND questtexttypes.url = ? AND questtexts.pos = ?',
'isi',
$questId, $questtexttypeUrl, $pos
);
if(empty($data)) {
throw new \nre\exceptions\IdNotFoundException($questtexttypeUrl);
}
return $data = $data[0];
}
/**
* Get all Questtexts for a Quest.
*
* @param int $questId ID of the Quest
* @param string $questtexttypeUrl URL of the Questtexttype
* @return array All Questtexts for a Quest
*/
public function getQuesttextsOfQuest($questId)
public function getQuesttextsOfQuest($questId, $questtexttypeUrl=null)
{
if(is_null($questtexttypeUrl))
{
return $this->db->query(
'SELECT questtexts.id, questtexts.text, questtexts.pos, questtexts.out_text, questtexts.abort_text, questtexts.questsmedia_id, questtexttypes.id AS type_id, questtexttypes.type, questtexttypes.url AS type_url '.
@ -79,32 +54,18 @@
$questId
);
}
/**
* Get count of Questtexts for a Quest.
*
* @param int $questId ID of the Quest
* @param string $questtexttypeUrl URL of the Questtexttype
* @return int Conut of Questtexts for Quest
*/
public function getQuesttextsCountForQuest($questId, $questtexttypUrl)
else
{
$count = 0;
$data = $this->db->query(
'SELECT COUNT(questtexts.id) AS c '.
return $this->db->query(
'SELECT questtexts.id, questtexts.text, questtexts.pos, questtexts.out_text, questtexts.abort_text, questtexts.questsmedia_id, questtexttypes.id AS type_id, questtexttypes.type, questtexttypes.url AS type_url '.
'FROM questtexts '.
'LEFT JOIN questtexttypes ON questtexttypes.id = questtexts.questtexttype_id '.
'WHERE questtexts.quest_id = ? AND questtexttypes.url = ?',
'WHERE questtexts.quest_id = ? and questtexttypes.url = ?',
'is',
$questId, $questtexttypUrl
$questId,
$questtexttypeUrl
);
if(!empty($data)) {
$count = $data[0]['c'];
}
return $count;
}

30
views/html/quests/quest.tpl
View file

@ -18,30 +18,30 @@
</section>
<?php endif ?>
<?php if(!is_null($questtext)) : ?>
<?php if(count($questtexts) > 0) : ?>
<section>
<h1 id="questtext"><?=$questtext['type']?></h1>
<div id="qtextbox">
<p class="qtext cf"><?php if(!is_null($media)) : ?><img src="<?=$linker->link(array('media','index',$seminary['url'],$media['url']))?>" /><?php endif ?><?=\hhu\z\Utils::t($questtext['text'])?></p>
</div>
<h1 id="questtext"><?=$questtexttype['type']?></h1>
<div id="qtextbox">
<?php foreach($questtexts as &$questtext) : ?>
<p class="qtext cf">
<?php if(array_key_exists('media', $questtext)) : ?><img src="<?=$linker->link(array('media','index',$seminary['url'],$questtext['media']['url']))?>" /><?php endif ?>
<?=\hhu\z\Utils::t($questtext['text'])?>
</p>
<?php if(count($questtext['relatedQuestsgroups']) > 0 || !empty($questtext['abort_text'])) : ?>
<ul>
<?php foreach($questtext['relatedQuestsgroups'] as &$relatedQuestgroup) : ?>
<li><a href="<?=$linker->link(array('questgroups','questgroup',$seminary['url'],$relatedQuestgroup['url']))?>"><?=$relatedQuestgroup['entry_text']?></a></li>
<?php endforeach ?>
<?php if(!empty($questtext['abort_text'])) : ?>
<li><a href="<?=$linker->link(array('quest',$seminary['url'],$relatedquesttext['quest']['questgroup_url'],$relatedquesttext['quest']['url'],$relatedquesttext['type_url'],$relatedquesttext['pos']),1)?>"><?=$questtext['abort_text']?></a></li>
<?php endif ?>
<?php if(!empty($questtext['out_text']) && $questtext['pos'] < $questtext['count']) : ?>
<li><a href="<?=$linker->link(array($questtext['type_url'],$questtext['pos']+1),5,true,null,true,'questtext')?>"><?=$questtext['out_text']?></a></li>
<li><a href="<?=$linker->link(array('quest',$seminary['url'],$relatedquesttext['quest']['questgroup_url'],$relatedquesttext['quest']['url'],$relatedquesttext['type_url']),1)?>"><?=$questtext['abort_text']?></a></li>
<?php endif ?>
</ul>
<?php if(array_key_exists('pos', $questtext)) : ?>
<?php if($questtext['pos'] > 1) : ?><a href="<?=$linker->link(array($questtext['type_url'],$questtext['pos']-1),5,true,null,true,'questtext')?>">&lt;</a><?php endif ?>
<?=$questtext['pos']?>/<?=$questtext['count']?>
<?php if($questtext['pos'] < $questtext['count'] && empty($questtext['out_text'])) : ?><a href="<?=$linker->link(array($questtext['type_url'],$questtext['pos']+1),5,true,null,true,'questtext')?>">&gt;</a><?php endif ?>
<?php endif ?>
<?php endforeach ?>
</div>
</section>
<?php endif ?>
@ -64,7 +64,7 @@
<li>
<?=_('Quest')?>:
<?php if($nextquest['entered'] || !$charactedHasChoosenNextQuest) : ?>
<a href="<?=$linker->link(array($nextquest['questgroup_url'],$nextquest['url'],$relatedquesttext['type_url'],$relatedquesttext['pos']),3)?>"><?=$nextquest['title']?></a>
<a href="<?=$linker->link(array($nextquest['questgroup_url'],$nextquest['url'],$relatedquesttext['type_url']),3)?>"><?=$nextquest['title']?></a>
<?php else : ?>
<?=$nextquest['title']?>
<?php endif ?>