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
zcmZYAeN0tl0LSqMxFByP0txs6D2M`rVi9UsC|14!ilQkhpd|u{mM;~e$55#h(z;@b
zTWe8mrrC@_m(9v0vnF$ie}HSj%r;;8BWt!Kt-e3*bN}j$-}yY}+;gAvyj~g#+Vh>C
z!d*><;}986uDOiq#A896IQ|MXCJ^sheFqv7#dQd#VgmA!DZmGC8S42e^v8`Djy1@i
zY2*}!hmm?5bBsa~H@-zxa0^FZAEsb5H-}&@>Ut^a#k(*PPhc>%V*vhu1F#E+VK1tI
z_i!Qx4e~sfjbXgs<WkTB3vn=(p<28FBd{L%GtJhIFof$btnEl!%_Y>J^`aVd6Ey;N
zP$T;{s^`(1;xHMbdB2%OAqH2X9;`(*<PfT1N0C2sijyk-4ps4GR8Oy<dV1B~{|EIw
z7nNv42BW?gZLbroDd?zz4Ew-jR1aq0P|Qb`gQ-AOSdE(7E%+erwAanZJ538F;%7J-
zyY2mdQO}1lta@J(CSZCv<Ikv=LVIH+s)Bk{50BzlJb~)L71YrGg4Ahlqk8DaJgMQq
zs0K%(UKE3B@JLh#Qc&N^Le(=Xg7Mef6>&o^TxG35>Ne|;KU2p^FF1f|$h)Y9AI0%_
z8Ykc_dw)19Q!f~2orL`(iyEnXR0B&K3L1)XRE2x&^<mUVe1+=KHH^m_sNE9Gc#gpg
zRKu4b3*3}gt5Mr@E9(1AsF7&4_ghf)JEtkAMZNaMZPeTiVb7`JY*fpqqk29U{ctfR
zV=+#|U8oM6LQTne)C(`#>n>z)Opm?(1F6q3eH7F}f0`?U(H94y<|-W3z(o6bCaPgm
zP(98;y|4h)&_$@-RElaqjdcfp?PE*>YUuNLC|LWyh{6SZ0k!JWIO&Bmk+zv7sD`XZ
zt(7`tkjy?*k3U3J*k(UJgW8T4?Dcij6#t27IFt{y|7YTO?f*3@;6c<2&!dLA2UYP+
zRL_3Lc)W*NTqF3g$iigQ=VhoNu0l1;K{a$QM&k#_@-b)ZbtgLN(XSNL!#>nD3FY@!
z6~v$_Oh!F76*bgzkT#e?)JRq1D0Hmvp*nI7wMc(N?Iu^Or{PhkdJ|$9f3+}+8=BKR
zRL>V+Aak|C-Y;joG-PWzsR50s2JT1o{C(71A4h%vB&s84?dKO!4emy*u{)^e`r;hV
zBJz*-^dJ&dQ5G^?CI?fn*jkTj`3Y2y&Y`BL3)RzJWEq*jk)GW#$~qU-!Ob`hYf)2p
z#G#;;evazVSyT@%p&HVS`r=j8i>{-d{|z-I_fZWBVf?il;!ty(j;bfuI@{i#j~a>9
zsQR2b3VOkA)R64M3_Ofeumjc8K$fr?I1DxCsi>*TM!mQY)!;H5i<PJmbfZS_xV0Pg
zVpn4SqIXOv1@4(_YbmNhJ5j54H)^O_P!)cHdeQf&k?2I)XnIjY>o?jMmW`Q!=~!Uh
zhWg&esE)K@jP`#!1z&FT;$-|8^@}zl$@Abm)FLZIjZme%-h>(f2UT&C{rnw!eFR<H
z|I~UCHF95~c3TGq@qW`oApmb+|J<S~ypQU604qy#7LFR~bkyfl(Fd0i{jlgLBs0ir
z@&tK_c#muf%e@y!KaKldP^eR9Z|=43!2(+rd1Nusp7tKq6gJz7x4k!UKViF@wS=|V
ze>}svio8X%ro0FJ(^_-PN(yeGt>ZnGdJDLLJVKr)MPwgYKmtfAd5mb0X}xGS)RQel
zJLDmvb@2vym@Fi3k{v`xjW%wkr~JS3JbOp$VWvARB+7Y`l9pQ|NhVs7hluxJ74{!5
za6Uj9h?ch|_9-%l=$KA?$vW~ZSwgfJo+i(cGBS;5h3Q9L$0{wr6%@35UUPSZ#1(DT
zeGWhJ3MnBklU<~iyhwCtC-{@uB%XMWS1D*sX-DYDC5znCLL=7Z=+Yi*P<v{U_Xd`e
zO2YpPlTW6SZKRk~kWFMhDJ8o}6PZhNL=pW;Z70Fxp!=K9hztt-$K#wIC9^!2=5-7w
pJIQ+DB9qC+R{w!*eyx|o5(oHXy6;Af@yTo*866kUx;%D#(0?y&99aMW

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>