From f41f48b928ca9b29d2161d4b51a8a5c4a56978a3 Mon Sep 17 00:00:00 2001 From: coderkun Date: Fri, 16 May 2014 00:22:24 +0200 Subject: [PATCH] implement managing of Queststopics --- configs/AppConfig.inc | 4 +- controllers/LibraryController.inc | 66 +++++++++++++++++++- locale/de_DE/LC_MESSAGES/The Legend of Z.mo | Bin 14853 -> 14898 bytes locale/de_DE/LC_MESSAGES/The Legend of Z.po | 15 +++-- models/QuesttopicsModel.inc | 60 ++++++++++++++++++ views/html/library/managetopic.tpl | 27 ++++++++ views/html/library/topic.tpl | 5 ++ 7 files changed, 169 insertions(+), 8 deletions(-) create mode 100644 views/html/library/managetopic.tpl diff --git a/configs/AppConfig.inc b/configs/AppConfig.inc index 01237cc3..60021cf4 100644 --- a/configs/AppConfig.inc +++ b/configs/AppConfig.inc @@ -235,6 +235,7 @@ array('^achievements/([^/]+)/?$', 'achievements/index/$1', true), array('^library/([^/]+)/?$', 'library/index/$1', true), array('^library/([^/]+)/([^/]+)/?$', 'library/topic/$1/$2', true), + array('^library/([^/]+)/([^/]+)/manage/?$', 'library/managetopic/$1/$2', true), array('^media/(.*)$', 'media/$1?layout=binary', false), array('^uploads/(.*)$', 'uploads/$1?layout=binary', false) ); @@ -271,7 +272,8 @@ array('^charactergroupsquests/quest/(.*)$', 'charactergroupsquests/$1', true), array('^charactergroupsquests/(edit|delete|manage)/([^/]+)/([^/]+)/([^/]+)$', 'charactergroupsquests/$2/$3/$4/$1', true), array('^achievements/index/(.*)$', 'achievements/$1', true), - array('^library/(index|topic)/(.*)$', 'library/$2', true) + array('^library/(index|topic)/(.*)$', 'library/$2', true), + array('^library/managetopic/(.*)$', 'library/$1/manage', true) ); diff --git a/controllers/LibraryController.inc b/controllers/LibraryController.inc index a82387e6..c88cb21c 100644 --- a/controllers/LibraryController.inc +++ b/controllers/LibraryController.inc @@ -31,7 +31,9 @@ * @var array */ public $permissions = array( - 'index' => array('admin', 'moderator', 'user') + 'index' => array('admin', 'moderator', 'user'), + 'topic' => array('admin', 'moderator', 'user'), + 'managetopic' => array('admin', 'moderator', 'user') ); /** * User seminary permissions @@ -39,7 +41,9 @@ * @var array */ public $seminaryPermissions = array( - 'index' => array('admin', 'moderator', 'user') + 'index' => array('admin', 'moderator', 'user', 'guest'), + 'topic' => array('admin', 'moderator', 'user', 'guest'), + 'managetopic' => array('admin', 'moderator') ); @@ -139,6 +143,64 @@ $this->set('quests', $quests); } + + /** + * Action: managetopic. + * + * Manage a Questtopic and its Quests with Questsubtopics. + * + * @throws IdNotFoundException + * @param string $eminaryUrl URL-Title of Seminary + * @param string $questtopicUrl URL-Title of Questtopic + */ + public function managetopic($seminaryUrl, $questtopicUrl) + { + // Get Seminary + $seminary = $this->Seminaries->getSeminaryByUrl($seminaryUrl); + + // Get Questtopic + $questtopic = $this->Questtopics->getQuesttopicByUrl($seminary['id'], $questtopicUrl); + + // Get Questsubtopics + $questsubtopics = $this->Questtopics->getSubtopicsForQuesttopic($questtopic['id']); + + // Set Questsubtopics for Quests + if($this->request->getRequestMethod() == 'POST' && !is_null($this->request->getPostParam('questsubtopics'))) + { + $quests = $this->Quests->getQuestsForQuesttopic($questtopic['id']); + $selectedSubtopics = $this->request->getPostParam('questsubtopics'); + foreach($quests as &$quest) + { + $subtopics = (array_key_exists($quest['id'], $selectedSubtopics)) ? $selectedSubtopics[$quest['id']] : array(); + $this->Questtopics->setQuestsubtopicsForQuest($quest['id'], array_keys($subtopics)); + } + } + + // Get Quests + $quests = $this->Quests->getQuestsForQuesttopic($questtopic['id']); + foreach($quests as &$quest) + { + // Get Questgroup + $quest['questgroup'] = $this->Questgroups->getQuestgroupById($quest['questgroup_id']); + + // Get Subtopics + $quest['subtopics'] = $this->Questtopics->getQuestsubtopicsForQuest($quest['id']); + $quest['subtopics'] = array_map(function($t) { return $t['id']; }, $quest['subtopics']); + } + + + // Set title + $this->addTitle($questtopic['title']); + $this->addTitleLocalized('Library'); + $this->addTitle($seminary['title']); + + // Pass data to view + $this->set('seminary', $seminary); + $this->set('questtopic', $questtopic); + $this->set('questsubtopics', $questsubtopics); + $this->set('quests', $quests); + } + } ?> diff --git a/locale/de_DE/LC_MESSAGES/The Legend of Z.mo b/locale/de_DE/LC_MESSAGES/The Legend of Z.mo index f634d175f4590331375b9c112c8cbb21dad8202e..cfd2b333030621307e9520e6415dabca3f1b5e8f 100644 GIT binary patch delta 4884 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 AJOBUy diff --git a/locale/de_DE/LC_MESSAGES/The Legend of Z.po b/locale/de_DE/LC_MESSAGES/The Legend of Z.po index 45a50f3d..6d408ad1 100644 --- a/locale/de_DE/LC_MESSAGES/The Legend of Z.po +++ b/locale/de_DE/LC_MESSAGES/The Legend of Z.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: The Legend of Z\n" -"POT-Creation-Date: 2014-05-15 23:32+0100\n" -"PO-Revision-Date: 2014-05-15 23:33+0100\n" +"POT-Creation-Date: 2014-05-16 00:20+0100\n" +"PO-Revision-Date: 2014-05-16 00:21+0100\n" "Last-Translator: \n" "Language-Team: \n" "Language: de_DE\n" @@ -732,7 +732,8 @@ msgstr "Das Kursfeld „%s“ ist ungültig" msgid "Seminary fields" msgstr "Kursfelder" -#: views/html/characters/index.tpl:13 views/html/users/index.tpl:7 +#: views/html/characters/index.tpl:13 views/html/library/managetopic.tpl:26 +#: views/html/users/index.tpl:7 msgid "Manage" msgstr "Verwalten" @@ -842,8 +843,8 @@ msgstr "Du hast Level %d erreicht" msgid "Introduction" msgstr "Einführung" -#: views/html/library/index.tpl:9 views/html/library/topic.tpl:8 -#: views/html/seminarymenu/index.tpl:7 +#: views/html/library/index.tpl:9 views/html/library/managetopic.tpl:8 +#: views/html/library/topic.tpl:8 views/html/seminarymenu/index.tpl:7 msgid "Library" msgstr "Bibliothek" @@ -861,6 +862,10 @@ msgstr "" msgid "Total progress: %d %%" msgstr "Gesamtfortschritt: %d%%" +#: views/html/library/topic.tpl:13 +msgid "Manage topic" +msgstr "Thema verwalten" + #: views/html/menu/index.tpl:2 views/html/users/create.tpl:5 #: views/html/users/delete.tpl:5 views/html/users/edit.tpl:6 #: views/html/users/edit.tpl:8 views/html/users/index.tpl:4 diff --git a/models/QuesttopicsModel.inc b/models/QuesttopicsModel.inc index abd246f7..31328572 100644 --- a/models/QuesttopicsModel.inc +++ b/models/QuesttopicsModel.inc @@ -131,6 +131,25 @@ } + /** + * Get alle Questsubtopics for a Questtopic. + * + * @param int $questtopicId ID of Questtopic + * @return array List of Questsubtopics for this Questtopic + */ + public function getSubtopicsForQuesttopic($questtopicId) + { + return $this->db->query( + 'SELECT id, questtopic_id, title, url '. + 'FROM questsubtopics '. + 'WHERE questsubtopics.questtopic_id = ? '. + 'ORDER BY title ASC', + 'i', + $questtopicId + ); + } + + /** * Get all Questsubtopics for a Quest. * @@ -149,6 +168,47 @@ ); } + + /** + * Set Questsubtopics for a Quest. + * + * @param int $questId ID of Quest to set subtopics for + * @param array $questsubtopicIds List of IDs of subtopics to set + */ + public function setQuestsubtopicsForQuest($questId, $questsubtopicIds) + { + $this->db->setAutocommit(false); + try { + // Remove Questsubtopics + $this->db->query( + 'DELETE FROM quests_questsubtopics '. + 'WHERE quest_id = ?', + 'i', + $questId + ); + + // Add Questsubtopics + foreach($questsubtopicIds as &$questsubtopicId) + { + $this->db->query( + 'INSERT INTO quests_questsubtopics '. + '(quest_id, questsubtopic_id) '. + 'VALUES '. + '(?, ?)', + 'ii', + $questId, $questsubtopicId + ); + } + } + catch(\nre\exceptions\DatamodelException $e) { + $this->db->rollback(); + $this->db->setAutocommit(true); + throw $e; + } + + $this->db->setAutocommit(true); + } + } ?> diff --git a/views/html/library/managetopic.tpl b/views/html/library/managetopic.tpl new file mode 100644 index 00000000..6303e191 --- /dev/null +++ b/views/html/library/managetopic.tpl @@ -0,0 +1,27 @@ + +
+ +
+ +
    +
    • +
    • +
    • +
+

+ +

Quests zu diesem Thema:

+
+
    + +
  • +

    + + checked="checked" /> +
    + +
    • + +
+ +
diff --git a/views/html/library/topic.tpl b/views/html/library/topic.tpl index 8d153215..472ae7b1 100644 --- a/views/html/library/topic.tpl +++ b/views/html/library/topic.tpl @@ -8,6 +8,11 @@

    • + 0) : ?> + +

    Themenfortschritt: /