From 6e807a43e1e9da520f2e70fb473050f145e880be Mon Sep 17 00:00:00 2001 From: coderkun Date: Sat, 22 Mar 2014 00:06:24 +0100 Subject: [PATCH] update XP-level structure --- controllers/CharactersController.inc | 10 ++++ controllers/UsersController.inc | 7 +++ locale/de_DE/LC_MESSAGES/The Legend of Z.mo | Bin 2705 -> 2615 bytes locale/de_DE/LC_MESSAGES/The Legend of Z.po | 63 ++++++++++---------- models/CharactersModel.inc | 25 ++++++++ views/html/characters/character.tpl | 2 +- views/html/characters/index.tpl | 2 +- views/html/html.tpl | 2 +- views/html/users/user.tpl | 2 +- 9 files changed, 79 insertions(+), 34 deletions(-) diff --git a/controllers/CharactersController.inc b/controllers/CharactersController.inc index 581b5b5a..e2e56b64 100644 --- a/controllers/CharactersController.inc +++ b/controllers/CharactersController.inc @@ -54,6 +54,13 @@ // Get registered Characters $characters = $this->Characters->getCharactersForSeminary($seminary['id']); + // Additional Character information + foreach($characters as &$character) + { + // Level + $character['xplevel'] = $this->Characters->getXPLevelOfCharacters($character['id']); + } + // Pass data to view $this->set('seminary', $seminary); @@ -78,6 +85,9 @@ // Get Character $character = $this->Characters->getCharacterByUrl($seminary['id'], $characterUrl); + // Character Level + $character['xplevel'] = $this->Characters->getXPLevelOfCharacters($character['id']); + // Get Seminarycharacterfields $characterfields = $this->Seminarycharacterfields->getFieldsForCharacter($character['id']); diff --git a/controllers/UsersController.inc b/controllers/UsersController.inc index a9eb9f91..f6203cc6 100644 --- a/controllers/UsersController.inc +++ b/controllers/UsersController.inc @@ -71,6 +71,13 @@ // Get Characters $characters = $this->Characters->getCharactersForUser($user['id']); + // Additional Character information + foreach($characters as &$character) + { + // Level + $character['xplevel'] = $this->Characters->getXPLevelOfCharacters($character['id']); + } + // Pass data to view $this->set('user', $user); 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 0ad327264913d4f176c26dad8e53281cf46435cc..0f2ca49e2ddf1e2fa39b5aa5a2aabd4b70abb0a1 100644 GIT binary patch delta 1102 zcmX}rPe>GD7{~F)ah!HHE8A8pEn6-7XO>zX5;{a(I(qE5E(0D!NTOQ|bPEELA+U=E zK^^Ln8+fTGgrKM{9U_8-4*j7zBm{dfqwjBg>Sdq(%=_-V@B6&Z?98?=m6CcfykWGX z#4h4mli4Z!9q>i_*=*K^E4Uql(5!%+xDESo3!Ze(;YRxB-558~zkqp6um!Io>n1ki z1Gli1AMUs{AAjmT$B5rwp%QqDy1$M&{O|LaqM;wf>sM+1~EZmC0|Bm`~ge&8F%0+s}vhwdVWfLzmM&7wYU=0o21gK6$w4AenQpmB9!DIVxOLW522>ltCP^9;BB)# z#9pF{@;jkR8`%Nn5VCI+%APVF9%XC^AsmFmT`9KHzSOYvm- zC2U01%2buhAezYy50!_HkB*F_H>2|ZPVHILA7r=JzU8``a^vIEadje|N(T#-zhRhQ ATL1t6 delta 1184 zcmX}rPe_w-9LMpWZq9Aa{-`re(`C-gt#k&lln9gpp$IDt`|!*0BYd(pApzz*tF>mBT*{s1HR1l#Z#GH%7J*@h1o zqhsCr&9-l2i1r=S#Jjd%qlBqZf_iYfKKgT0DEu@`*0R@#FueD=1?c;qpqfkTF44Aq<@_~q#WvhV zPQD(RK!fUEp-48U?@)s%666UoO)63i>ZhTiuBVqgOdcZ@dPkVXOpr0%e>1dVg|0-` z(NF4hM#v#jF-qzLCds3u-UG!L*;Ow!c4mv_I0c=6u2nC$Vw}{b4=MEqEA-#ioi<~b z!jam~z((zTaCg)xo4n)Y-J;2tJl`pJ1@Bs-bloqMJg1mgTz1QTx%Rg0Za9-oOrM;Y yI#s(8N;E5{SF52^>+19HV9R*1Y@A%~rkh`KJ#)_Umz<*SdhY+R+~#0kBF;ZA>TC=E 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 95a49652..57f560a6 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-03-18 23:06+0100\n" -"PO-Revision-Date: 2014-03-18 23:09+0100\n" +"POT-Creation-Date: 2014-03-21 23:55+0100\n" +"PO-Revision-Date: 2014-03-21 23:55+0100\n" "Last-Translator: \n" "Language-Team: \n" "Language: de_DE\n" @@ -24,16 +24,13 @@ msgstr "Fehler" #: ../../../views/html/charactergroups/groupsgroup.tpl:1 #: ../../../views/html/charactergroups/index.tpl:1 #: ../../../views/html/charactergroupsquests/quest.tpl:1 -#: ../../../views/html/menu/index.tpl:3 -#: ../../../views/html/questgroups/questgroup.tpl:1 -#: ../../../views/html/quests/quest.tpl:1 +#: ../../../views/html/menu/index.tpl:4 ../../../views/html/quests/quest.tpl:1 #: ../../../views/html/quests/submission.tpl:1 #: ../../../views/html/quests/submissions.tpl:1 #: ../../../views/html/seminaries/create.tpl:1 #: ../../../views/html/seminaries/delete.tpl:1 #: ../../../views/html/seminaries/edit.tpl:1 #: ../../../views/html/seminaries/index.tpl:1 -#: ../../../views/html/seminaries/seminary.tpl:1 msgid "Seminaries" msgstr "Kurse" @@ -41,14 +38,14 @@ msgstr "Kurse" #: ../../../views/html/charactergroups/groupsgroup.tpl:3 #: ../../../views/html/charactergroups/index.tpl:3 #: ../../../views/html/characters/character.tpl:19 -#: ../../../views/html/seminaries/seminary.tpl:9 +#: ../../../views/html/seminaries/seminary.tpl:42 msgid "Character Groups" msgstr "Charaktergruppen" #: ../../../views/html/charactergroups/group.tpl:12 #: ../../../views/html/characters/character.tpl:2 #: ../../../views/html/characters/index.tpl:2 -#: ../../../views/html/seminaries/seminary.tpl:8 +#: ../../../views/html/seminaries/seminary.tpl:41 #: ../../../views/html/users/user.tpl:11 msgid "Characters" msgstr "Charaktere" @@ -58,7 +55,7 @@ msgid "Group Leader" msgstr "Gruppenleiter" #: ../../../views/html/charactergroups/group.tpl:21 -#: ../../../views/html/questgroups/questgroup.tpl:31 +#: ../../../views/html/questgroups/questgroup.tpl:35 msgid "Quests" msgstr "Quests" @@ -68,6 +65,7 @@ msgid "Character Groups Quests" msgstr "Charactergruppen-Quests" #: ../../../views/html/charactergroupsquests/quest.tpl:12 +#: ../../../views/html/seminaries/seminary.tpl:2 msgid "Description" msgstr "Beschreibung" @@ -83,44 +81,43 @@ msgstr "Gewonnene Quest" msgid "Lost Quest" msgstr "Verlorene Quest" +#: ../../../views/html/characters/character.tpl:7 +#: ../../../views/html/characters/index.tpl:6 +#: ../../../views/html/users/user.tpl:14 +msgid "Level" +msgstr "Level" + #: ../../../views/html/characters/character.tpl:8 msgid "User" msgstr "Benutzer" -#: ../../../views/html/html.tpl:21 -msgid "as" -msgstr "als" - #: ../../../views/html/introduction/index.tpl:1 +#: ../../../views/html/menu/index.tpl:2 msgid "Introduction" msgstr "Einführung" -#: ../../../views/html/menu/index.tpl:2 ../../../views/html/users/create.tpl:1 +#: ../../../views/html/menu/index.tpl:3 ../../../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 #: ../../../views/html/users/user.tpl:1 msgid "Users" msgstr "Benutzer" -#: ../../../views/html/menu/index.tpl:5 ../../../views/html/users/login.tpl:2 +#: ../../../views/html/menu/index.tpl:10 ../../../views/html/users/login.tpl:2 #: ../../../views/html/users/login.tpl:11 msgid "Login" msgstr "Login" -#: ../../../views/html/menu/index.tpl:7 +#: ../../../views/html/menu/index.tpl:12 msgid "Logout" msgstr "Logout" -#: ../../../views/html/questgroups/questgroup.tpl:22 -#: ../../../views/html/questgroups/questgroup.tpl:47 -#: ../../../views/html/seminaries/seminary.tpl:26 +#: ../../../views/html/questgroups/questgroup.tpl:26 +#: ../../../views/html/questgroups/questgroup.tpl:51 +#: ../../../views/html/seminaries/seminary.tpl:28 msgid "locked" msgstr "gesperrt" -#: ../../../views/html/questgroups/questgroup.tpl:39 -msgid "containing optional Quests" -msgstr "Enthaltene optionale Quests" - #: ../../../views/html/quests/quest.tpl:21 #: ../../../views/html/quests/submissions.tpl:28 msgid "solved" @@ -131,16 +128,16 @@ msgstr "gelöst" msgid "unsolved" msgstr "ungelöst" -#: ../../../views/html/quests/quest.tpl:56 +#: ../../../views/html/quests/quest.tpl:60 msgid "Go on" msgstr "Hier geht es weiter" -#: ../../../views/html/quests/quest.tpl:61 -#: ../../../views/html/quests/quest.tpl:63 +#: ../../../views/html/quests/quest.tpl:65 +#: ../../../views/html/quests/quest.tpl:67 msgid "Quest" msgstr "Quest" -#: ../../../views/html/quests/quest.tpl:77 +#: ../../../views/html/quests/quest.tpl:81 msgid "Task" msgstr "Aufgabe" @@ -166,7 +163,7 @@ msgid "create" msgstr "erstellen" #: ../../../views/html/seminaries/delete.tpl:2 -#: ../../../views/html/seminaries/seminary.tpl:5 +#: ../../../views/html/seminaries/seminary.tpl:38 msgid "Delete seminary" msgstr "Kurs löschen" @@ -186,7 +183,7 @@ msgid "cancel" msgstr "abbrechen" #: ../../../views/html/seminaries/edit.tpl:2 -#: ../../../views/html/seminaries/seminary.tpl:4 +#: ../../../views/html/seminaries/seminary.tpl:37 msgid "Edit seminary" msgstr "Kurs bearbeiten" @@ -200,7 +197,7 @@ msgid "Create new seminary" msgstr "Neuen Kurs erstellen" #: ../../../views/html/seminaries/index.tpl:10 -#: ../../../views/html/seminaries/seminary.tpl:12 +#: ../../../views/html/seminaries/seminary.tpl:45 #, php-format msgid "created by %s on %s" msgstr "erstellt von %s am %s" @@ -255,6 +252,12 @@ msgstr "registriert am %s" msgid "Roles" 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/CharactersModel.inc b/models/CharactersModel.inc index 109bee80..a0f27fbe 100644 --- a/models/CharactersModel.inc +++ b/models/CharactersModel.inc @@ -179,6 +179,31 @@ return $data[0]; } + + /** + * Get the XP-level of a Character. + * + * @param string $characterId ID of the Character + * @return array XP-level of Character + */ + public function getXPLevelOfCharacters($characterId) + { + $data = $this->db->query( + 'SELECT xplevels.xps, xplevels.level, xplevels.name '. + 'FROM v_charactersxplevels '. + 'INNER JOIN xplevels ON xplevels.id = v_charactersxplevels.xplevel_id '. + 'WHERE v_charactersxplevels.character_id = ?', + 'i', + $characterId + ); + if(!empty($data)) { + return $data[0]; + } + + + return null; + } + } ?> diff --git a/views/html/characters/character.tpl b/views/html/characters/character.tpl index b4bb166d..74ea3a38 100644 --- a/views/html/characters/character.tpl +++ b/views/html/characters/character.tpl @@ -4,7 +4,7 @@

- XPs: ()
+ XPs: ( : )
:
:
diff --git a/views/html/characters/index.tpl b/views/html/characters/index.tpl index f16261cb..850aca96 100644 --- a/views/html/characters/index.tpl +++ b/views/html/characters/index.tpl @@ -3,6 +3,6 @@

    -
  • ( XPs, )
    • +
  • ( XPs, : )
diff --git a/views/html/html.tpl b/views/html/html.tpl index e22367cf..cc7bcb76 100644 --- a/views/html/html.tpl +++ b/views/html/html.tpl @@ -23,7 +23,7 @@ - + diff --git a/views/html/users/user.tpl b/views/html/users/user.tpl index 506fdf94..f3a092d9 100644 --- a/views/html/users/user.tpl +++ b/views/html/users/user.tpl @@ -11,7 +11,7 @@

    -
  • ( XPs, ) ()
    • +
  • ( XPs, : ) ()