From 0089c28a9605d0ac81971adcad0f924dd69e1e68 Mon Sep 17 00:00:00 2001
From: coderkun <coderkun@users.noreply.github.com>
Date: Thu, 24 Apr 2014 16:49:09 +0200
Subject: [PATCH] show optional Questlines also for Questgroup (Issue #132)

---
 controllers/QuestgroupsController.inc       |   9 ++++++
 locale/de_DE/LC_MESSAGES/The Legend of Z.mo | Bin 10054 -> 10124 bytes
 locale/de_DE/LC_MESSAGES/The Legend of Z.po |  23 ++++++++--------
 models/QuestgroupsModel.inc                 |  29 +++++++++++++++++---
 views/html/questgroups/questgroup.tpl       |   6 ++--
 5 files changed, 50 insertions(+), 17 deletions(-)

diff --git a/controllers/QuestgroupsController.inc b/controllers/QuestgroupsController.inc
index 687887a6..8e4d01c4 100644
--- a/controllers/QuestgroupsController.inc
+++ b/controllers/QuestgroupsController.inc
@@ -113,6 +113,15 @@
 						$data = $this->Questgroups->getCumulatedDataForQuestgroup($group['id'], $character['id']);
 						$group['xps'] = $data['xps'];
 						$group['character_xps'] = $data['character_xps'];
+						
+						// Attach related Questgroups
+						$group['relatedQuestgroups'] = array();
+						$relatedQuestgroups = $this->Questgroups->getRelatedQuestsgroupsOfQuestgroup($group['id']);
+						foreach($relatedQuestgroups as &$relatedQuestgroup) {
+							if($this->Questgroups->hasCharacterEnteredQuestgroup($relatedQuestgroup['id'], $character['id'])) {
+								$group['relatedQuestgroups'][] = $this->Questgroups->getQuestgroupById($relatedQuestgroup['id']);
+							}
+						}
 					}
 				}
 			}
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 c67ab17165b10a06a7e21b6ca67f7c32dce39d7e..df2c161487e13f364061d59f3851f83fc6cedc1f 100644
GIT binary patch
delta 3349
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

delta 3293
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

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 8c8fee42..445f46f9 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-04-24 15:46+0100\n"
-"PO-Revision-Date: 2014-04-24 15:46+0100\n"
+"POT-Creation-Date: 2014-04-24 16:46+0100\n"
+"PO-Revision-Date: 2014-04-24 16:46+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: de_DE\n"
@@ -216,7 +216,7 @@ msgstr "Charaktere"
 
 #: views/html/charactergroups/group.tpl:45
 #: views/html/charactergroups/managegroup.tpl:54
-#: views/html/questgroups/questgroup.tpl:55 views/html/quests/create.tpl:9
+#: views/html/questgroups/questgroup.tpl:57 views/html/quests/create.tpl:9
 #: views/html/quests/index.tpl:9
 msgid "Quests"
 msgstr "Quests"
@@ -277,7 +277,7 @@ msgstr "Ranking"
 #: views/html/characters/character.tpl:67
 #: views/html/characters/character.tpl:73
 #: views/html/characters/character.tpl:79
-#: views/html/characters/character.tpl:90 views/html/quests/index.tpl:38
+#: views/html/characters/character.tpl:90 views/html/quests/index.tpl:37
 #: views/html/seminarybar/index.tpl:6 views/html/seminarybar/index.tpl:42
 #, php-format
 msgid "%d XPs"
@@ -439,24 +439,28 @@ msgstr "Kurse"
 msgid "Logout"
 msgstr "Logout"
 
-#: views/html/questgroups/create.tpl:9
+#: views/html/questgroups/create.tpl:8
 msgid "Questgroups"
 msgstr "Questgruppen"
 
-#: views/html/questgroups/create.tpl:11
+#: views/html/questgroups/create.tpl:10
 msgid "Create Questgroup"
 msgstr "Questgruppe erstellen"
 
-#: views/html/questgroups/create.tpl:15 views/html/questgroups/create.tpl:16
+#: views/html/questgroups/create.tpl:14 views/html/questgroups/create.tpl:15
 #: views/html/seminaries/create.tpl:11 views/html/seminaries/create.tpl:12
 #: views/html/seminaries/edit.tpl:11 views/html/seminaries/edit.tpl:12
 msgid "Title"
 msgstr "Titel"
 
-#: views/html/questgroups/create.tpl:18 views/html/quests/create.tpl:43
+#: views/html/questgroups/create.tpl:17 views/html/quests/create.tpl:43
 msgid "Create"
 msgstr "Erstellen"
 
+#: views/html/questgroups/questgroup.tpl:45
+msgid "Found optional Questline"
+msgstr "Optionale Questline gefunden"
+
 #: views/html/quests/create.tpl:11
 msgid "Create Quest"
 msgstr "Quest erstellen"
@@ -789,8 +793,5 @@ msgstr "Rollen"
 #~ msgid "as"
 #~ msgstr "als"
 
-#~ msgid "containing optional Quests"
-#~ msgstr "Enthaltene optionale Quests"
-
 #~ msgid "This Quest is optional"
 #~ msgstr "Diese Quest ist optional"
diff --git a/models/QuestgroupsModel.inc b/models/QuestgroupsModel.inc
index 1534251d..21ee1452 100644
--- a/models/QuestgroupsModel.inc
+++ b/models/QuestgroupsModel.inc
@@ -369,8 +369,8 @@
 		/**
 		 * Get all related Questgroups of a Questtext.
 		 * 
-		 * @param	int	$questtextId	ID of the questtext
-		 * @return	array			Sidequests for the questtext
+		 * @param	int	$questtextId	ID of the Questtext
+		 * @return	array			Related Questgroups for the Questtext
 		 */
 		public function getRelatedQuestsgroupsOfQuesttext($questtextId)
 		{
@@ -388,8 +388,8 @@
 		/**
 		 * Get all related Questgroups of a Quest.
 		 * 
-		 * @param	int	$questId	ID of the quest
-		 * @return	array			Sidequests for the quest
+		 * @param	int	$questId	ID of the Quest
+		 * @return	array			Related Quests for the Quest
 		 */
 		public function getRelatedQuestsgroupsOfQuest($questId)
 		{
@@ -406,6 +406,27 @@
 		}
 		
 		
+		/**
+		 * Get all related Questgroups of a Questgroup.
+		 * 
+		 * @param	int	$questgroupId	ID of the Questgroup
+		 * @return	array			Related Questgroups for the Questgroup
+		 */
+		public function getRelatedQuestsgroupsOfQuestgroup($questgroupId)
+		{
+			return $this->db->query(
+				'SELECT questgroups_questtexts.questgroup_id AS id '.
+				'FROM questgroups '.
+				'INNER JOIN quests ON quests.questgroup_id = questgroups.id '.
+				'INNER JOIN questtexts ON questtexts.quest_id = quests.id '.
+				'INNER JOIN questgroups_questtexts ON questgroups_questtexts.questtext_id = questtexts.id '.
+				'WHERE questgroups.id = ?',
+				'i',
+				$questgroupId
+			);
+		}
+		
+		
 		/**
 		 * Calculate cumulated data for a Questgroup, its
 		 * sub-Questgroups and all its Quests.
diff --git a/views/html/questgroups/questgroup.tpl b/views/html/questgroups/questgroup.tpl
index c0f2218e..347880a7 100644
--- a/views/html/questgroups/questgroup.tpl
+++ b/views/html/questgroups/questgroup.tpl
@@ -40,10 +40,12 @@
 			</div>
 			<p class="xpnumeric"><?=$group['character_xps']?> / <?=$group['xps']?> XP</p>
 		</div>
+		<?php foreach($group['relatedQuestgroups'] as &$relatedGroup) : ?>
 		<div class="qghidden">
-			<p>Versteckte Bonus-Questline gefunden:</p>
-			<p><a href="#"><i class="fa fa-star-o fa-fw"></i>Hier der Titel der entsprechenden Bonus-Questline</a></p>
+			<p><?=_('Found optional Questline')?>:</p>
+			<p><a href="<?=$linker->link(array($seminary['url'],$relatedGroup['url']),2)?>"><i class="fa fa-star-o fa-fw"></i><?=$relatedGroup['title']?></a></p>
 		</div>
+		<?php endforeach ?>
 	</li>
 	<?php endforeach?>
 </ul>