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 zcmbOzx?QCHo)F7a1_lNOJq88_83qQ19!3TRTLuP(KTIG|28IvJ3=9Gc3=AKc85qPF z7#NsX7#O%17#O5j7#M^Z7#LJp7#R2&7#J*}v?mJ#12+Q$LnM?=Wnp08Wnf?^WMN?7 zWME*ZXJKGqWnf_FWC5F7&(IGQSir)-z{9}6unbCXhKe76(#KdB7}yvX7|uW)a2cxZ z9t#5l2Ll7cYbgB%s{SujJu@rBLM|vRzzXqz7%KyVK0`eNgCZ*fg8>5rLm(^IMGQ@> z3=Av`3=ET@8fHNG^H?DkEryD(VTJf;6D!1Fd!Y1TR!GR4g7WV{>8DWh-$2d#3lgsf z1t}ZEU`{p$hWU&P3_@%Whiqbp1o>fhh>LHtGcbrSFfcr0XJC+EU|{&o4hdQj4h9B6 z1_lNt4oC=^a6qEOkptq8Kn{olQ#l~!=0L@3IT#q~L2)yY0}^NRIUqr`8cJ`3YTOPr za32T6A?G+482A_%7;bVv9R32T{v%ZVcPRZ2O0#l8%;n)^U@&B0U=ZSDV6b9fU~u7N zs0SymdQJugb_NE92~dSII3Whl--~bd;;#!IU5*5r03=HxN z3=GN)3=CpWc{v71@PpET1_LBWLB0m%3Xl?Lj%83{U|>)H2{14)$TBc6=t9}5P+A8> zJ7**oB_@|lR$w{Fl3JFUGx<5ocedojyyVoJ$xLkh97cu;M#fgArjuu~DZn|K53*@9 Zft7E5#UaPYk(5-Fnw*iEH`#zI5ddMBU|RqH delta 1184 zcmdlkGEubto)F7a1_lNOeFg>w83qQ1DU1vZ&I}9;Jj@_b1_lWh1_l8J1_ntM1_p5k z1_mt_1_mw$1_mb<1_ogU1_oai1_pix28Ki^UC6?~z|FwG&Go`Ip572?AstPBh+3=9lg zp&E8U`3ImD9EFOXV}5sUkPzZxgE&YIN~^L# z?9*XmU|^|dU|_I?N;t7WeB#N*z%ZYYfguR0@Dn>E=$SbnK9J^MU=U$oU{K>=V31&7 zV6f(Z1aSxl1A`y~149xABqU2XAW_rE0ddGg4v0gRazGrghJ%5j9u$Xrp$1&!fW+N> z4oFbGhHCf-HRuP_0UVqR415d>48oic2P<(x)N6A>EHH%97EszAD(}Y0z+lM0z~IBl zz+lC|z);7@P!CRAJ2@E`*cliYPC*r3f*O2-6XKJHQ2skkh>yN=GBAMBCp#A;D!92A z7^E2(7(}6bLoNmeQBcTmK^zzerK7kYA(RYNSISinvA7;8(9Xrczz9kBU<*Kof^r2& zNEJjdKzs-aW)N3_fq_Affq_8>#9?4y(1y~W6b@p7qDPE@fkBahfk6`_zyL`jpd6$H z%4MMVhl+z;3}S<#1e9eY86feb#K6EH2a;f5U{GOzga9bJsxv^+0Z2-Xfq_8?#9)Ag z2$ad7%K!-hP?iKGZjiVJ1H{v^3=9mipcD)e1m$f|oPyXOEYHBepgj34^OecRS-z?y z7BeI#<|U`*FeK;al_X~7W#*+TRc>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, : ) ()