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

include pictures for Questgroups and Quests

Browse source
This commit is contained in:
coderkun 2014-02-14 18:59:39 +01:00
commit fc814a515e
8 changed files with 32 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
agents/intermediate/QuestgroupsAgent.inc
View file

@ -29,6 +29,7 @@
public function questgroup(\nre\core\Request $request, \nre\core\Response $response)
{
$this->addSubAgent('Questgroupshierarchypath', 'index', $request->getParam(3), $request->getParam(4));
$this->addSubAgent('Questgroupspicture', 'index', $request->getParam(3), $request->getParam(4), true);
}
}

2
agents/intermediate/QuestsAgent.inc
View file

@ -29,6 +29,7 @@
public function quest(\nre\core\Request $request, \nre\core\Response $response)
{
$this->addSubAgent('Questgroupshierarchypath', 'index', $request->getParam(3), $request->getParam(4), true);
$this->addSubAgent('Questgroupspicture', 'index', $request->getParam(3), $request->getParam(4), true);
}
@ -38,6 +39,7 @@
public function sidequest(\nre\core\Request $request, \nre\core\Response $response)
{
$this->addSubAgent('Questgroupshierarchypath', 'index', $request->getParam(3), $request->getParam(4), true);
$this->addSubAgent('Questgroupspicture', 'index', $request->getParam(3), $request->getParam(4), true);
}
}

17
controllers/QuestsController.inc
View file

@ -24,7 +24,7 @@
*
* @var array
*/
public $models = array('seminaries', 'questgroups', 'quests', 'questtexts');
public $models = array('seminaries', 'questgroups', 'quests', 'questtexts', 'media');
/**
* User permissions
*
@ -93,6 +93,13 @@
$showTask = true;
}
// Media
$questmedia = null;
if(!is_null($quest['questsmedia_id'])) {
$questmedia = $this->Media->getMediaById($quest['questsmedia_id']);
}
// Pass data to view
$this->set('seminary', $seminary);
@ -100,6 +107,7 @@
$this->set('questtext', $questtext);
$this->set('quest', $quest);
$this->set('showtask', $showTask);
$this->set('media', $questmedia);
}
/**
@ -156,6 +164,12 @@
$showTask = true;
}
// Media
$sidequestmedia = null;
if(!is_null($sidequest['questsmedia_id'])) {
$sidequestmedia = $this->Media->getMediaById($sidequest['questsmedia_id']);
}
// Pass data to view
$this->set('seminary', $seminary);
@ -165,6 +179,7 @@
$this->set('questtext', $questtext);
$this->set('sidequest', $sidequest);
$this->set('showtask', $showTask);
$this->set('media', $sidequestmedia);
}
}

4
models/QuestgroupsModel.inc
View file

@ -78,7 +78,7 @@
public function getQuestgroupById($questgroupId)
{
$data = $this->db->query(
'SELECT id, questgroupshierarchy_id, parent_questgroup_id, pos, title, url '.
'SELECT id, questgroupshierarchy_id, parent_questgroup_id, pos, title, url, questgroupspicture_id '.
'FROM questgroups '.
'WHERE questgroups.id = ?',
'i',
@ -104,7 +104,7 @@
public function getQuestgroupByUrl($seminaryId, $questgroupUrl)
{
$data = $this->db->query(
'SELECT questgroups.id, questgroups.questgroupshierarchy_id, questgroups.parent_questgroup_id, questgroups.pos, questgroups.title, questgroups.url '.
'SELECT questgroups.id, questgroups.questgroupshierarchy_id, questgroups.parent_questgroup_id, questgroups.pos, questgroups.title, questgroups.url, questgroups.questgroupspicture_id '.
'FROM questgroups '.
'LEFT JOIN questgroupshierarchy ON questgroupshierarchy.id = questgroups.questgroupshierarchy_id '.
'WHERE questgroupshierarchy.seminary_id = ? AND questgroups.url = ?',

4
models/QuestsModel.inc
View file

@ -64,7 +64,7 @@
public function getQuestByUrl($seminaryId, $questgroupId, $questUrl)
{
$data = $this->db->query(
'SELECT quests.id, quests.questtype_id, quests.title, quests.url, quests.xps, quests.task '.
'SELECT quests.id, quests.questtype_id, quests.title, quests.url, quests.xps, quests.task, quests.questsmedia_id '.
'FROM quests '.
'LEFT JOIN questgroups ON questgroups.id = quests.questgroup_id '.
'LEFT JOIN questgroupshierarchy ON questgroupshierarchy.id = questgroups.questgroupshierarchy_id '.
@ -94,7 +94,7 @@
public function getSidequestByUrl($seminaryId, $questgroupId, $questId, $sidequestUrl)
{
$data = $this->db->query(
'SELECT sidequests.id, sidequests.questtype_id, sidequests.title, sidequests.url, sidequests.xps, sidequests.task '.
'SELECT sidequests.id, sidequests.questtype_id, sidequests.title, sidequests.url, sidequests.xps, sidequests.task, sidequests.questsmedia_id '.
'FROM sidequests '.
'LEFT JOIN questtexts ON questtexts.id = sidequests.questtext_id '.
'LEFT JOIN quests ON quests.id = questtexts.quest_id '.

1
views/html/questgroups/questgroup.tpl
View file

@ -2,6 +2,7 @@
<h2><?=$seminary['title']?></h3>
<?=$questgroupshierarchypath?>
<?=$questgroupspicture?>
<h3><?=$questgroupshierarchy['title_singular']?> <?=$questgroup['pos']?>: <?=$questgroup['title']?></h3>
<?php foreach($texts as &$text) : ?>

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

@ -2,8 +2,12 @@
<h2><?=$seminary['title']?></h2>
<?=$questgroupshierarchypath?>
<?=$questgroupspicture?>
<h3><?=$quest['title']?></h3>
<?php if(!is_null($media)) : ?>
<img src="<?=$linker->link(array('media','index',$seminary['url'],$media['url']))?>" />
<?php endif ?>
<section>
<h1><?=$questtext['type']?></h1>
<p><?=$questtext['text']?></p>

4
views/html/quests/sidequest.tpl
View file

@ -2,10 +2,14 @@
<h2><?=$seminary['title']?></h2>
<?=$questgroupshierarchypath?>
<?=$questgroupspicture?>
<h3><a href="<?=$linker->link(array('quest',$seminary['url'],$questgroup['url'],$quest['url'],$questtext['type_url'],$questtext['pos']),1)?>"><?=$quest['title']?></a></h3>
<h4><?=$sidequest['title']?></h4>
<p><?=_('This Quest is optional')?>.</p>
<?php if(!is_null($media)) : ?>
<img src="<?=$linker->link(array('media','index',$seminary['url'],$media['url']))?>" />
<?php endif ?>
<section>
<h1><?=$sidequesttext['type']?></h1>
<p><?=$sidequesttext['text']?></p>