From ea6ca0bd8157ecfe32a6300a5dbcc5b4d5e5517d Mon Sep 17 00:00:00 2001
From: coderkun <coderkun@users.noreply.github.com>
Date: Tue, 22 Apr 2014 00:40:21 +0200
Subject: [PATCH] add library description and calculate total progress of
 Character

---
 controllers/LibraryController.inc           |   6 ++++
 locale/de_DE/LC_MESSAGES/The Legend of Z.mo | Bin 8666 -> 9152 bytes
 locale/de_DE/LC_MESSAGES/The Legend of Z.po |  32 ++++++++++++++------
 models/SeminariesModel.inc                  |   6 ++--
 views/html/library/index.tpl                |   6 ++--
 5 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/controllers/LibraryController.inc b/controllers/LibraryController.inc
index a37618ae..b6c77079 100644
--- a/controllers/LibraryController.inc
+++ b/controllers/LibraryController.inc
@@ -62,19 +62,25 @@
 			$character = SeminaryRoleController::$character;
 			
 			// Get Quest topics
+			$totalQuestcount = 0;
+			$totalCharacterQuestcount = 0;
 			$questtopics = $this->Questtopics->getQuesttopicsForSeminary($seminary['id']);
 			foreach($questtopics as &$questtopic)
 			{
 				// Get Quest count
 				$questtopic['questcount'] = $this->Questtopics->getQuestCountForQuesttopic($questtopic['id']);
+				$totalQuestcount += $questtopic['questcount'];
 				
 				// Get Character progress
 				$questtopic['characterQuestcount'] = $this->Questtopics->getCharacterQuestCountForQuesttopic($questtopic['id'], $character['id']);
+				$totalCharacterQuestcount += $questtopic['characterQuestcount'];
 			}
 			
 			
 			// Pass data to view
 			$this->set('seminary', $seminary);
+			$this->set('totalQuestcount', $totalQuestcount);
+			$this->set('totalCharacterQuestcount', $totalCharacterQuestcount);
 			$this->set('questtopics', $questtopics);
 		}
 		
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 e4ce1818495c7fdf88a21227fd34f6caa4c6c141..bbbde6ffcb0f1f8bfdc90f658e3b5323f0e693e0 100644
GIT binary patch
delta 3405
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
JPCl+E3;^9YmoNYT

delta 2928
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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 c85999cc..8ada359f 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-21 21:12+0100\n"
-"PO-Revision-Date: 2014-04-21 21:12+0100\n"
+"POT-Creation-Date: 2014-04-21 21:42+0100\n"
+"PO-Revision-Date: 2014-04-22 00:29+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: de_DE\n"
@@ -147,17 +147,17 @@ msgstr "Platz"
 msgid "You achieved %d of %d Achievements so far"
 msgstr "Du hast bislang %d von insgesamt %d Errungenschaften erreicht"
 
-#: views/html/achievements/index.tpl:66 views/html/characters/character.tpl:39
+#: views/html/achievements/index.tpl:61 views/html/characters/character.tpl:39
 #: views/html/seminarybar/index.tpl:28
 #, php-format
 msgid "achieved at: %s"
 msgstr "erhalten am: %s"
 
-#: views/html/achievements/index.tpl:77
+#: views/html/achievements/index.tpl:72
 msgid "Secret Achievement"
 msgstr "Geheime Errungenschaft"
 
-#: views/html/achievements/index.tpl:82
+#: views/html/achievements/index.tpl:77
 msgid "Continue playing to unlock this secret Achievement"
 msgstr "Spiele weiter, um diesen geheimen Erfolg freizuschalten"
 
@@ -319,6 +319,20 @@ msgstr "registriere dich"
 msgid "Questtopics"
 msgstr "Themen"
 
+#: views/html/library/index.tpl:10
+#, php-format
+msgid "Library description, %s, %s"
+msgstr ""
+"Hier findest du alle Themen aus der Vorlesung „%s“ und die passenden Quests "
+"zum Nachschlagen und Wiederholen. Dein Fortschritt in „%s“ beeinflusst den "
+"Umfang der Bibliothek, spiele also regelmäßig weiter und schalte so Quest "
+"für Quest alle Inhalte frei."
+
+#: views/html/library/index.tpl:12
+#, php-format
+msgid "Total progress: %d %%"
+msgstr "Gesamtfortschritt: %d %%"
+
 #: views/html/menu/index.tpl:2 views/html/users/create.tpl:1
 #: views/html/users/delete.tpl:1 views/html/users/edit.tpl:1
 #: views/html/users/index.tpl:1 views/html/users/login.tpl:1
@@ -362,15 +376,15 @@ msgstr "Questgruppe"
 
 #: views/html/quests/create.tpl:27
 msgid "XPs"
-msgstr ""
+msgstr "XPs"
 
 #: views/html/quests/create.tpl:34
 msgid "Entry text"
-msgstr ""
+msgstr "Einstiegstext"
 
 #: views/html/quests/create.tpl:36
 msgid "Wrong text"
-msgstr ""
+msgstr "Text für falsche Antwort"
 
 #: views/html/quests/create.tpl:37 views/html/quests/quest.tpl:55
 msgid "Task"
@@ -428,7 +442,7 @@ msgstr "Lösung von %s"
 
 #: views/html/quests/submissions.tpl:15
 msgid "submitted"
-msgstr "eingereicht am %s um %s Uhr"
+msgstr "eingereicht"
 
 #: views/html/seminaries/create.tpl:7
 msgid "New seminary"
diff --git a/models/SeminariesModel.inc b/models/SeminariesModel.inc
index 251ade4f..554f3d10 100644
--- a/models/SeminariesModel.inc
+++ b/models/SeminariesModel.inc
@@ -49,7 +49,7 @@
 		{			
 			// Get seminaries
 			return $this->db->query(
-				'SELECT id, created, created_user_id, title, url, description, seminarymedia_id '.
+				'SELECT id, created, created_user_id, title, url, course, description, seminarymedia_id '.
 				'FROM seminaries '.
 				'ORDER BY created DESC'
 			);
@@ -66,7 +66,7 @@
 		public function getSeminaryById($seminaryId)
 		{
 			$seminary = $this->db->query(
-				'SELECT id, created, created_user_id, title, url, description, seminarymedia_id '.
+				'SELECT id, created, created_user_id, title, url, course, description, seminarymedia_id '.
 				'FROM seminaries '.
 				'WHERE id = ?',
 				'i',
@@ -91,7 +91,7 @@
 		public function getSeminaryByUrl($seminaryUrl)
 		{
 			$seminary = $this->db->query(
-				'SELECT id, created, created_user_id, title, url, description, seminarymedia_id '.
+				'SELECT id, created, created_user_id, title, url, course, description, seminarymedia_id '.
 				'FROM seminaries '.
 				'WHERE url = ?',
 				's',
diff --git a/views/html/library/index.tpl b/views/html/library/index.tpl
index df59a4bd..2dd6cd09 100644
--- a/views/html/library/index.tpl
+++ b/views/html/library/index.tpl
@@ -7,11 +7,11 @@
 	<li><a href="<?=$linker->link(array('seminaries',$seminary['url']))?>"><?=$seminary['title']?></a></li>
 </ul>
 <h1><i class="fa fa-book fa-fw"></i><?=_('Questtopics')?></h1>
-<p>Hier findest du alle Themen aus der Vorlesung "Wissensrepräsentation" und die passenden Quests zum Nachschlagen und Wiederholen. Dein Fortschritt in "Die Legende von Zyren" beeinflusst den Umfang der Bibliothek, spiele also regelmäßig weiter und schalte so Quest für Quest alle Inhalte frei.</p>
+<p><?=sprintf(_('Library description, %s, %s'), $seminary['course'], $seminary['title'])?></p>
 <div class="libindxpr cf">
-	<p><small>Gesamtfortschritt: 77%</small></p>
+	<p><small><?=sprintf(_('Total progress: %d %%'), ($totalQuestcount > 0) ? $numberFormatter->format(round($totalCharacterQuestcount/$totalQuestcount*100)) : 0) ?></small></p>
 	<div class="xpbar">
-		<span style="width:77%"></span>
+		<span style="width:<?=($totalQuestcount > 0) ? round($totalCharacterQuestcount/$totalQuestcount*100) : 0 ?>%"></span>
 	</div>
 </div>
 <ul class="libindx cf">