coderkun/questlab
1
0
Fork 0
Code Issues 15 Pull requests Projects Releases Wiki Activity

update XP-level structure

Browse source
This commit is contained in:
coderkun 2014-03-22 00:06:24 +01:00
commit 6e807a43e1
9 changed files with 79 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

10
controllers/CharactersController.inc
View file

@ -54,6 +54,13 @@
// Get registered Characters // Get registered Characters
$characters = $this->Characters->getCharactersForSeminary($seminary['id']); $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 // Pass data to view
$this->set('seminary', $seminary); $this->set('seminary', $seminary);
@ -78,6 +85,9 @@
// Get Character // Get Character
$character = $this->Characters->getCharacterByUrl($seminary['id'], $characterUrl); $character = $this->Characters->getCharacterByUrl($seminary['id'], $characterUrl);
// Character Level
$character['xplevel'] = $this->Characters->getXPLevelOfCharacters($character['id']);
// Get Seminarycharacterfields // Get Seminarycharacterfields
$characterfields = $this->Seminarycharacterfields->getFieldsForCharacter($character['id']); $characterfields = $this->Seminarycharacterfields->getFieldsForCharacter($character['id']);

7
controllers/UsersController.inc
View file

@ -71,6 +71,13 @@
// Get Characters // Get Characters
$characters = $this->Characters->getCharactersForUser($user['id']); $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 // Pass data to view
$this->set('user', $user); $this->set('user', $user);

BIN
locale/de_DE/LC_MESSAGES/The Legend of Z.mo
View file

Binary file not shown.

63
locale/de_DE/LC_MESSAGES/The Legend of Z.po
View file

@ -1,8 +1,8 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: The Legend of Z\n" "Project-Id-Version: The Legend of Z\n"
"POT-Creation-Date: 2014-03-18 23:06+0100\n" "POT-Creation-Date: 2014-03-21 23:55+0100\n"
"PO-Revision-Date: 2014-03-18 23:09+0100\n" "PO-Revision-Date: 2014-03-21 23:55+0100\n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: \n" "Language-Team: \n"
"Language: de_DE\n" "Language: de_DE\n"
@ -24,16 +24,13 @@ msgstr "Fehler"
#: ../../../views/html/charactergroups/groupsgroup.tpl:1 #: ../../../views/html/charactergroups/groupsgroup.tpl:1
#: ../../../views/html/charactergroups/index.tpl:1 #: ../../../views/html/charactergroups/index.tpl:1
#: ../../../views/html/charactergroupsquests/quest.tpl:1 #: ../../../views/html/charactergroupsquests/quest.tpl:1
#: ../../../views/html/menu/index.tpl:3 #: ../../../views/html/menu/index.tpl:4 ../../../views/html/quests/quest.tpl:1
#: ../../../views/html/questgroups/questgroup.tpl:1
#: ../../../views/html/quests/quest.tpl:1
#: ../../../views/html/quests/submission.tpl:1 #: ../../../views/html/quests/submission.tpl:1
#: ../../../views/html/quests/submissions.tpl:1 #: ../../../views/html/quests/submissions.tpl:1
#: ../../../views/html/seminaries/create.tpl:1 #: ../../../views/html/seminaries/create.tpl:1
#: ../../../views/html/seminaries/delete.tpl:1 #: ../../../views/html/seminaries/delete.tpl:1
#: ../../../views/html/seminaries/edit.tpl:1 #: ../../../views/html/seminaries/edit.tpl:1
#: ../../../views/html/seminaries/index.tpl:1 #: ../../../views/html/seminaries/index.tpl:1
#: ../../../views/html/seminaries/seminary.tpl:1
msgid "Seminaries" msgid "Seminaries"
msgstr "Kurse" msgstr "Kurse"
@ -41,14 +38,14 @@ msgstr "Kurse"
#: ../../../views/html/charactergroups/groupsgroup.tpl:3 #: ../../../views/html/charactergroups/groupsgroup.tpl:3
#: ../../../views/html/charactergroups/index.tpl:3 #: ../../../views/html/charactergroups/index.tpl:3
#: ../../../views/html/characters/character.tpl:19 #: ../../../views/html/characters/character.tpl:19
#: ../../../views/html/seminaries/seminary.tpl:9 #: ../../../views/html/seminaries/seminary.tpl:42
msgid "Character Groups" msgid "Character Groups"
msgstr "Charaktergruppen" msgstr "Charaktergruppen"
#: ../../../views/html/charactergroups/group.tpl:12 #: ../../../views/html/charactergroups/group.tpl:12
#: ../../../views/html/characters/character.tpl:2 #: ../../../views/html/characters/character.tpl:2
#: ../../../views/html/characters/index.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 #: ../../../views/html/users/user.tpl:11
msgid "Characters" msgid "Characters"
msgstr "Charaktere" msgstr "Charaktere"
@ -58,7 +55,7 @@ msgid "Group Leader"
msgstr "Gruppenleiter" msgstr "Gruppenleiter"
#: ../../../views/html/charactergroups/group.tpl:21 #: ../../../views/html/charactergroups/group.tpl:21
#: ../../../views/html/questgroups/questgroup.tpl:31 #: ../../../views/html/questgroups/questgroup.tpl:35
msgid "Quests" msgid "Quests"
msgstr "Quests" msgstr "Quests"
@ -68,6 +65,7 @@ msgid "Character Groups Quests"
msgstr "Charactergruppen-Quests" msgstr "Charactergruppen-Quests"
#: ../../../views/html/charactergroupsquests/quest.tpl:12 #: ../../../views/html/charactergroupsquests/quest.tpl:12
#: ../../../views/html/seminaries/seminary.tpl:2
msgid "Description" msgid "Description"
msgstr "Beschreibung" msgstr "Beschreibung"
@ -83,44 +81,43 @@ msgstr "Gewonnene Quest"
msgid "Lost Quest" msgid "Lost Quest"
msgstr "Verlorene 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 #: ../../../views/html/characters/character.tpl:8
msgid "User" msgid "User"
msgstr "Benutzer" msgstr "Benutzer"
#: ../../../views/html/html.tpl:21
msgid "as"
msgstr "als"
#: ../../../views/html/introduction/index.tpl:1 #: ../../../views/html/introduction/index.tpl:1
#: ../../../views/html/menu/index.tpl:2
msgid "Introduction" msgid "Introduction"
msgstr "Einführung" 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/delete.tpl:1 ../../../views/html/users/edit.tpl:1
#: ../../../views/html/users/index.tpl:1 ../../../views/html/users/login.tpl:1 #: ../../../views/html/users/index.tpl:1 ../../../views/html/users/login.tpl:1
#: ../../../views/html/users/user.tpl:1 #: ../../../views/html/users/user.tpl:1
msgid "Users" msgid "Users"
msgstr "Benutzer" 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 #: ../../../views/html/users/login.tpl:11
msgid "Login" msgid "Login"
msgstr "Login" msgstr "Login"
#: ../../../views/html/menu/index.tpl:7 #: ../../../views/html/menu/index.tpl:12
msgid "Logout" msgid "Logout"
msgstr "Logout" msgstr "Logout"
#: ../../../views/html/questgroups/questgroup.tpl:22 #: ../../../views/html/questgroups/questgroup.tpl:26
#: ../../../views/html/questgroups/questgroup.tpl:47 #: ../../../views/html/questgroups/questgroup.tpl:51
#: ../../../views/html/seminaries/seminary.tpl:26 #: ../../../views/html/seminaries/seminary.tpl:28
msgid "locked" msgid "locked"
msgstr "gesperrt" 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/quest.tpl:21
#: ../../../views/html/quests/submissions.tpl:28 #: ../../../views/html/quests/submissions.tpl:28
msgid "solved" msgid "solved"
@ -131,16 +128,16 @@ msgstr "gelöst"
msgid "unsolved" msgid "unsolved"
msgstr "ungelöst" msgstr "ungelöst"
#: ../../../views/html/quests/quest.tpl:56 #: ../../../views/html/quests/quest.tpl:60
msgid "Go on" msgid "Go on"
msgstr "Hier geht es weiter" msgstr "Hier geht es weiter"
#: ../../../views/html/quests/quest.tpl:61 #: ../../../views/html/quests/quest.tpl:65
#: ../../../views/html/quests/quest.tpl:63 #: ../../../views/html/quests/quest.tpl:67
msgid "Quest" msgid "Quest"
msgstr "Quest" msgstr "Quest"
#: ../../../views/html/quests/quest.tpl:77 #: ../../../views/html/quests/quest.tpl:81
msgid "Task" msgid "Task"
msgstr "Aufgabe" msgstr "Aufgabe"
@ -166,7 +163,7 @@ msgid "create"
msgstr "erstellen" msgstr "erstellen"
#: ../../../views/html/seminaries/delete.tpl:2 #: ../../../views/html/seminaries/delete.tpl:2
#: ../../../views/html/seminaries/seminary.tpl:5 #: ../../../views/html/seminaries/seminary.tpl:38
msgid "Delete seminary" msgid "Delete seminary"
msgstr "Kurs löschen" msgstr "Kurs löschen"
@ -186,7 +183,7 @@ msgid "cancel"
msgstr "abbrechen" msgstr "abbrechen"
#: ../../../views/html/seminaries/edit.tpl:2 #: ../../../views/html/seminaries/edit.tpl:2
#: ../../../views/html/seminaries/seminary.tpl:4 #: ../../../views/html/seminaries/seminary.tpl:37
msgid "Edit seminary" msgid "Edit seminary"
msgstr "Kurs bearbeiten" msgstr "Kurs bearbeiten"
@ -200,7 +197,7 @@ msgid "Create new seminary"
msgstr "Neuen Kurs erstellen" msgstr "Neuen Kurs erstellen"
#: ../../../views/html/seminaries/index.tpl:10 #: ../../../views/html/seminaries/index.tpl:10
#: ../../../views/html/seminaries/seminary.tpl:12 #: ../../../views/html/seminaries/seminary.tpl:45
#, php-format #, php-format
msgid "created by %s on %s" msgid "created by %s on %s"
msgstr "erstellt von %s am %s" msgstr "erstellt von %s am %s"
@ -255,6 +252,12 @@ msgstr "registriert am %s"
msgid "Roles" msgid "Roles"
msgstr "Rollen" msgstr "Rollen"
#~ msgid "as"
#~ msgstr "als"
#~ msgid "containing optional Quests"
#~ msgstr "Enthaltene optionale Quests"
#~ msgid "This Quest is optional" #~ msgid "This Quest is optional"
#~ msgstr "Diese Quest ist optional" #~ msgstr "Diese Quest ist optional"

25
models/CharactersModel.inc
View file

@ -179,6 +179,31 @@
return $data[0]; 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;
}
} }
?> ?>

2
views/html/characters/character.tpl
View file

@ -4,7 +4,7 @@
<section> <section>
<p> <p>
XPs: <?=$character['xps']?> (<?=$character['xplevel']?>)<br /> XPs: <?=$character['xps']?> (<?=_('Level')?> <?=$character['xplevel']['level']?><?php if(!is_null($character['xplevel']['name'])) : ?>: <?=$character['xplevel']['name']?><?php endif ?>)<br />
<?=_('User')?>: <a href="<?=$linker->link(array('users','user',$user['url']))?>"><?=$user['username']?></a><br /> <?=_('User')?>: <a href="<?=$linker->link(array('users','user',$user['url']))?>"><?=$user['username']?></a><br />
<?php foreach($characterfields as &$field) : ?> <?php foreach($characterfields as &$field) : ?>
<?=$field['title']?>: <?=$field['value']?><br /> <?=$field['title']?>: <?=$field['value']?><br />

2
views/html/characters/index.tpl
View file

@ -3,6 +3,6 @@
<ul> <ul>
<?php foreach($characters as &$character) : ?> <?php foreach($characters as &$character) : ?>
<li><a href="<?=$linker->link(array('character',$seminary['url'],$character['url']),1)?>"><?=$character['name']?></a> (<?=$character['xps']?> XPs, <?=$character['xplevel']?>)</li> <li><a href="<?=$linker->link(array('character',$seminary['url'],$character['url']),1)?>"><?=$character['name']?></a> (<?=$character['xps']?> XPs, <?=_('Level')?> <?=$character['xplevel']['level']?><?php if(!is_null($character['xplevel']['name'])) : ?>: <?=$character['xplevel']['name']?><?php endif ?>)</li>
<?php endforeach ?> <?php endforeach ?>
</ul> </ul>

2
views/html/html.tpl
View file

@ -23,7 +23,7 @@
<label for="toggle" class="toggle" onclick><a id="navicon"><i class="fa fa-bars"></i>Menü</a></label> <label for="toggle" class="toggle" onclick><a id="navicon"><i class="fa fa-bars"></i>Menü</a></label>
<?php if(!is_null($loggedUser)) : ?> <?php if(!is_null($loggedUser)) : ?>
<?php if(!is_null($loggedCharacter)) : ?> <?php if(!is_null($loggedCharacter)) : ?>
<a href="<?=$linker->link(array('characters','character',$loggedSeminary['url'],$loggedCharacter['url']))?>" id="profile"><i class="fa fa-user fa-fw"></i><?=$loggedCharacter['name']?><span class="circlenote"><?=$loggedCharacter['xps']?></span></a> <a href="<?=$linker->link(array('characters','character',$loggedSeminary['url'],$loggedCharacter['url']))?>" id="profile"><i class="fa fa-user fa-fw"></i><?=$loggedCharacter['name']?><span class="circlenote"><?=$loggedCharacter['xplevel']?></span></a>
<?php else : ?> <?php else : ?>
<a href="<?=$linker->link(array('users',$loggedUser['url']))?>" id="profile"><i class="fa fa-user fa-fw"></i><?=$loggedUser['username']?></a> <a href="<?=$linker->link(array('users',$loggedUser['url']))?>" id="profile"><i class="fa fa-user fa-fw"></i><?=$loggedUser['username']?></a>
<?php endif ?> <?php endif ?>

2
views/html/users/user.tpl
View file

@ -11,7 +11,7 @@
<h3><?=_('Characters')?></h3> <h3><?=_('Characters')?></h3>
<ul> <ul>
<?php foreach($characters as &$character) : ?> <?php foreach($characters as &$character) : ?>
<li><a href="<?=$linker->link(array('characters','character',$character['seminary_url'],$character['url']))?>"><?=$character['name']?></a> (<?=$character['xps']?> XPs, <?=$character['xplevel']?>) (<a href="<?=$linker->link(array('seminaries',$character['seminary_url']))?>"><?=$character['seminary_title']?></a>)</li> <li><a href="<?=$linker->link(array('characters','character',$character['seminary_url'],$character['url']))?>"><?=$character['name']?></a> (<?=$character['xps']?> XPs, <?=_('Level')?> <?=$character['xplevel']['level']?><?php if(!is_null($character['xplevel']['name'])) : ?>: <?=$character['xplevel']['name']?><?php endif ?>) (<a href="<?=$linker->link(array('seminaries',$character['seminary_url']))?>"><?=$character['seminary_title']?></a>)</li>
<?php endforeach ?> <?php endforeach ?>
</ul> </ul>