From 43245814be70acbfeaa7ecbb596f765bdf7beb7c Mon Sep 17 00:00:00 2001 From: coderkun 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 zcmY+`32YQq9LMq3S}o-$Qi@m*I)E(&D$s)5cezB1pa>!$Y};vfWV_q$?3P1di;93I zimu>+N}^~&RM6B$Lr~C$n4lsECIoM;L=q$sFd~Wg{cRrxU-|-eOF`JZ&r9zyUn?8gub7s$n+0x5XZK6BZ$l%pfeqF}6N}N}vIi*m~@Y zuV6>qY5f$*%^XabFy=TH{4;0xlZ6*i1O9_IVis9wWjdk;D8_soi?`w;%)#ign2BFvcRZqc#y97=P=iaT8K#r28fKyHb5RYuV>j%B?2;LWYFCEZty$Ow z=iB=TD&ggLJ8r}R+=+VcC??eLSuXnEAILv*3$1ith-x?kHG>EiVH}m<>!_vNft|1! zwSr%u5KJJ8u!A@?7uRldQ!aEGzd_C9bn63i3HfJk;u~|Y zC+cjBM{QL(-huU~&v6^-4D7X@N5(SwWTmq;3^nsI)Rxc0c8qW4axt8W3e-$qK`q&K zq!05kG8uE&-k(7wauu~w9hi;=$VW|}7}b6Z>b+U0m3kQU-MgrjU5mZ-{Xee@Y(`~# z4Ey4F)amU?E3Hr;)E10H&15{bVQFXB`uq9y(Mrrm4Y&f8P$OzfHlfFRsDxLcmNbb+`2p0H9YeK0XT69@_zG&J za`IV!byUiomSzN&U>T0WIPxi*_fd(pp!V(vYD-R`R_t$7Vp&e>FJumC#YUr6Y_4@J zD&co=5Pq28LZ|r@Dv>t5S`S?|YGwMOIvRqS;Y`%lEWl!1gG|P}g9Gt^^)f1_e9u}Uc zjX`}S<*0raqqf9DCX_IBTxdyFqh`DgbvmCzHFys-z(<&dYl#U&IkA$szUVVn8BOSC zwvf=^PZIYK;|QG(l_^9q13*uwPJ=M=P6Z+_!}UG5gY|GhZsZX z?93u`mgW+V5&9L>p{*buA|??J5UUAoabNBKwX%*2-7O}%5;|P#36+^d4dD~D#C^o| zWhyrzTXFAo51!y!hj0cFCngdqgNX<+RwL^3Swv(I(+HJSL<6yexK?x+M-Y$LiU+Or z*xz24pi9&d4&f2wiDkrcLZ7lq4)Hiq+0?1smh`M}EV{ypxyxh8w>o^)&8vt8xUX{k z%BWWt^CID5r@&VBy$zxrZ`3O!2~g%yVn})KEL}&LyUMZq%vv!i*Jjs^U%{6mp$8 zLATZoJAt@Q4pC=rBpP!4I0Kw$e7(Rw(fFzp4_7%=p6k>FeBY&U*qI%t2j5v4uXSby zDuaGyFchevUT@CxT>1${LT-4VGuidR&eTXW#w*c;7mGRE|JQMa%j4=$+*dj@f1tKH zz`#mll2;M(BC(*mwAk_MJeNcRAwS|o-5NJk+p@i7n^)s3bG;bvYE=3UgkrA4E2-q1 z>XtoGdzqT%UEyHc)Em`N*BjWhx!bQ9nbTZ9P#ddGmUPceHsoLEF^4^AZCK4+F?`_wuIozk@AGrf8wzv$KZU)?yDFaQ7m delta 2928 zcmY+`drZ}39LMqJz!4FXm2F+#pWk_C_3V6kJ-^4_`Tf4n_j#UE z7gi1}^9@J4PZ(M!kwnaK8xz2?aQ@H|CK?luiI|ICybB-0Xl%eqxDO}eQPln2I0MgO zBwoRL@CN2!I1ia(jL#I((LgEYVk^et>!>e&fD!m9hG9SQG2if~0I%8cc(PCe$*9CU z7=ugkZro_yhU8${9DT+dqQl3$z@G`&jpMKfRgp8O2Y-$!ID`rK2PR?+S?az#RAQy5 zgsV``sm1ZQ!(Q)1-PeX;yx(-v(HEZA0G>d7p&O^-8_24dKGYX4qE=@B<8a7ckDwC0 zgP9n?w5Ov7bzddwxs8~C&FCY{NjuPs`r;*2<|CMmzoHUM;pr+}4o2ZTRK-@I5?^os zz1og%MJ3*ZdT|RX@x7>t9G=YjQ$=%}0ln}wYY%D-&!E<@50$_ml8YHe58lLlOePzR zSD+HCu{NR-+=bj~4x$n{j;g>bQPf{wJZ}dsqbe|p$~>MdQZWg&n~PD2)*)3k4c2zl z%$`H-{$r@;yoq}8WqbWSYDwJ8O3%sh(NTu^I1`Jo0P9eRokW$k7xjX7?DdDp$DFs< zU!f}WEh_PA*6SF;^-W|><`+~#p&T*Y=ZmGIOcGHuNJk!$j5BvPpZ!UZaUfnr%-Fsi+Oknb=>Zt2NOAS zay9Y}(~jCiFQI1sDr#*{qxQhNI3LfUCUP5@y!i|Hm}q7d%ll0(9Stl-B~pzl)ppbi z+EFt&f_gv~szPt!G<**=voA3nhpjHkp+qw=3m2dg+k&c06OPmQKTJn6II02cLe0Dz z^`djA1U^A6!654X?@$T+h+4}~E;JsFTFMwyLg}dQEk|xO<(Px@=u_uqI?A*URl=`P z84n|qF=70?X>+DpOHqlopq8owHM7&Gik(Fz{4uKZ1E`5yvHpNc=z0?M*MmkG(2IXZ zJwX4Z&{9l7_LrH4dO*H)J}Tiws7h6$p3{n|z#jDC5iG)wkdtR_p%M#A4ldc0Wa_WA z$YMYxD@J8jhS^w&D%pNirA}Edq7wcYJ@^}H^JbBa5?O=VQ|nNbX+TY^4YeelI177x zboj0r#MwA%O-l_XvKEzbH5Ow%>i3}+H9mwY@eS0>Z`ff{Nbs;+E zf1&LxLG9udsNG+MdT>3e^v$Rlbf9MbEV4b!i`KVM_kV_}-~hUC1M%Nh$Ay+g)mo3j#_KAxx^k~IkBJEO6cfS5POLRS)P^%`i&RU|erX{8T8YOA9k*m+0ntI+OX%!o5^76`ZNz$A(4Gon4q~3|^E2Z7VA)IO zD66j%(MW{q!f7m!&Z}B!5VIPeA#}XdT8OYf{lu;ie?;ULfsx2~w?8H3{lL|jHkZrm uuZl|_?@cZ67I_N-2jcqO{!LSV3T#Na>h_nX-3rvCdtLtSj41!H49`Dk5chll 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 @@

    • -

    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.

    +

    -

    Gesamtfortschritt: 77%

    +

    0) ? $numberFormatter->format(round($totalCharacterQuestcount/$totalQuestcount*100)) : 0) ?>

    - +