From 6df13cb5b45b5db56364bf1ec7e5c628ab6e1a96 Mon Sep 17 00:00:00 2001 From: coderkun Date: Thu, 1 May 2014 14:29:34 +0200 Subject: [PATCH] add option to sort users and Characters by registration date --- controllers/CharactersController.inc | 18 +++++ controllers/UsersController.inc | 22 +++++- locale/de_DE/LC_MESSAGES/The Legend of Z.mo | Bin 13424 -> 13505 bytes locale/de_DE/LC_MESSAGES/The Legend of Z.po | 77 ++++++++++++-------- views/html/characters/index.tpl | 1 + views/html/characters/manage.tpl | 1 + views/html/users/manage.tpl | 1 + 7 files changed, 88 insertions(+), 32 deletions(-) diff --git a/controllers/CharactersController.inc b/controllers/CharactersController.inc index 060b96fd..d3e099f7 100644 --- a/controllers/CharactersController.inc +++ b/controllers/CharactersController.inc @@ -716,6 +716,24 @@ } + /** + * Compare two Characters by their registration date. + * + * @param array $a Character a + * @param array $b Character b + * @return int Result of comparison + */ + private function sortCharactersByDate($a, $b) + { + if($a['created'] == $b['created']) { + return 0; + } + + + return ($a['created'] > $b['created']) ? -1 : 1; + } + + /** * Compare two Characters by one of their Seminary fields. * diff --git a/controllers/UsersController.inc b/controllers/UsersController.inc index c616e080..ca5f0412 100644 --- a/controllers/UsersController.inc +++ b/controllers/UsersController.inc @@ -568,8 +568,8 @@ /** * Compare two users by their userroles. * - * @param array $a Character a - * @param array $b Character b + * @param array $a User a + * @param array $b User b * @return int Result of comparison */ private function sortUsersByRole($a, $b) @@ -616,6 +616,24 @@ return 1; } + + /** + * Compare two users by their registration date. + * + * @param array $a User a + * @param array $b User b + * @return int Result of comparison + */ + private function sortUsersByDate($a, $b) + { + if($a['created'] == $b['created']) { + return 0; + } + + + return ($a['created'] > $b['created']) ? -1 : 1; + } + } ?> 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 c6a1e7860e7c38cb2b20622c9773854fcba822a5..0a8a37e0735940506bd501ab5021d1ae79dc8dae 100644 GIT binary patch delta 4510 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 IQoY9q07g}x+yDRo delta 4430 zcmX?@`5~kJo)F7a1_lO((+ms@G7Jn1C2R}~{EQ3?XLvxO3=ABC3=A9$3=Eut3=EtM z3=Be0zKkFP12+Q$gQ_3{gE#{NgP|Y;gEj*LgQp+^14wJBAOiy*0|P@7RQ*Ij1_o9J z28LOJ3=BdH3=9hd85npO80r}|3o<%)ns8z`!6b3{qFmz~CheaX_FjL_v};1A`y~14F(r#HEeG3=F~y z3=C6*85pD(7#LOvGcYJJFfbg3ia!-*VBlw9VE758IYl7mNs2%mtR({Rh@%KZUAzb+ z^&fPBEf@IwR=wEsmQ zQOGI^ae$I21A{yR1B09OBbkQ2t|a1_n_E28It%aW)A^ zQ1eSLFsOhml3-v^Wnf@%g^FiOK-AYrKyt|>2}p>ol3-v^W?*30R4)NZ6xW~v&!7fz zNkW27UlJ0eW|9z#Y$PE;=_?6IL=lpZ#F_$CUnU6&;#x^aNVH2rEbNhlcw~ws#KUu; z`s!Cf4ca3K3Ca^tjn|+S--gl;B_X-txg;cLe?c9>Ck63G{^9|Av z3l2&{g6&Zb3u#khqt)m(e}>OtAXUmjv{h&;qc z@lZNNo`Hdhfq@}Y9ugHf@{q(`GhNR-N zQ2MVj#3Ef4h{Ie|AO`xYKtd*51(MhjRUqn`R2Ue{85kI5Lgg>2K!X0Z3dBM0RUi)h zU#|iwn?+S2ajB;Y@v)mKB)bKvf>J31L#ir7U6m@tr<0-bOI0BT?ofqTd_ooCv-?nW zZ&e{7^JSe$se|pQXXsOh1jQn#!X4_6#B^F6;(&|l zkRZRW&cMLI$iVOlD*ssn5>-DnAP$t&gm^$f6XIh7O-R((YC;^~t_g8)lqMvNWov@W zt!H2;foiCSYUt5~_;8vg#37qBAyKnK6XK%_nvh)bLlcr1|7t?=yMz|R=eAmq0w)AY zS8G8$vPcW!^9@=M2kp^fVBiAf|MOaqY;y}L@lp%ovp-r8m&#~EEK=2mw1ga>bhb7) z2pOhnLkwJ{4QXiX)rKU_+u9HZKh}n1KW-gJxuFWB{dE`^>OoDVN*#z#8+0IvqfH0m z(%CwYpj@s43EC|>kf1)I198}CsJ<&Y5DRZX)j!gK`1rjJ#DRZxARZLdg_y6P3$f2s zm!TfqRpSh7*6RjFjz4# zF#OYHVDM&OV6fCrVnwUnLfkV zfIG&JxOrv_DWSeY#W_tNX++or;u9$ohz05MpN1hFN>68~XJA+c;D4a6larP^SXaa)HW&+I8z0ASpVMfq`Ko1EkKF z%)r2~fdP{B<}pB`(S(74p^|}tAr7h+M1d0I5e5c^AO;48X$+812iecC03?fqL7fSI zPjP zfaGtGR4oGog9QVmi3aKi_Ji8}43Gi|Bp(4Pm_Q5$NLICBU|?`!U|`q|Y7Ilh*Fxzm zQ27sP9+xpdQZ+~%l#g>57#L14Ffbeg34r>D3=9mrplm+|NEU-~!PGi1$-qzor9l*^ z?+2pY85kH=gBr4+?l`E^!N9-}0+Im5zb69&!z56@94Y`RPN7VOcu+5xfq~&T10+jk zGC=Y^Oddr0FfcHrfEWyrlCqrvQX8&hU|_IgU|{fNU|=YR%J(oZFcdQ|FhoQ7U7+~4 zhH^ku8Uq7E8v_HwLIwr~F9rsNtqcqdjSLJ7g$xV~%?u0-OF@bl7#OOc0~Qqw3=AGn zF%XpjB0ysXP#Q#m8n~wz7#P5#91IK$rJ(*H0|P@C0|P?`s7G)Tq>2GDm~emrQkdj| uf`);CA&&vli(%NTE6B>c**gn_cliKN!IcvL 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 5e9180a4..bda0044d 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-05-01 13:08+0100\n" -"PO-Revision-Date: 2014-05-01 13:08+0100\n" +"POT-Creation-Date: 2014-05-01 14:29+0100\n" +"PO-Revision-Date: 2014-05-01 14:29+0100\n" "Last-Translator: \n" "Language-Team: \n" "Language: de_DE\n" @@ -334,7 +334,7 @@ msgstr "Gruppe bearbeiten" #: views/html/charactergroups/editgroup.tpl:59 #: views/html/charactergroups/editgroupsgroup.tpl:50 #: views/html/charactergroupsquests/edit.tpl:75 -#: views/html/characters/edit.tpl:94 +#: views/html/characters/edit.tpl:101 msgid "edit" msgstr "bearbeiten" @@ -378,9 +378,10 @@ msgstr "Mitglied" #: views/html/charactergroups/managegroup.tpl:29 #: views/html/characters/character.tpl:11 #: views/html/characters/character.tpl:13 views/html/characters/delete.tpl:10 -#: views/html/characters/edit.tpl:8 views/html/characters/index.tpl:9 -#: views/html/characters/manage.tpl:8 views/html/characters/register.tpl:8 -#: views/html/seminarymenu/index.tpl:2 views/html/users/user.tpl:27 +#: views/html/characters/edit.tpl:11 views/html/characters/edit.tpl:13 +#: views/html/characters/index.tpl:9 views/html/characters/manage.tpl:8 +#: views/html/characters/register.tpl:8 views/html/seminarymenu/index.tpl:2 +#: views/html/users/user.tpl:27 msgid "Characters" msgstr "Charaktere" @@ -563,7 +564,7 @@ msgstr "Gewonnene Quest" msgid "Lost Quest" msgstr "Verlorene Quest" -#: views/html/characters/character.tpl:21 views/html/characters/edit.tpl:11 +#: views/html/characters/character.tpl:21 views/html/characters/edit.tpl:18 msgid "Edit Character" msgstr "Charakter bearbeiten" @@ -604,80 +605,94 @@ msgstr "Thematischer Fortschritt" msgid "Should the Character “%s” of user “%s” (%s) really be deleted?" msgstr "Soll der Charakter „%s“ von Benutzer %s (%s) wirklich gelöscht werden?" -#: views/html/characters/edit.tpl:23 views/html/characters/register.tpl:22 +#: views/html/characters/edit.tpl:30 views/html/characters/register.tpl:22 #, php-format msgid "Character name is too short (min. %d chars)" msgstr "Der Charaktername ist zu kurz (min. %d Zeichen)" -#: views/html/characters/edit.tpl:25 views/html/characters/register.tpl:24 +#: views/html/characters/edit.tpl:32 views/html/characters/register.tpl:24 #, php-format msgid "Character name is too long (max. %d chars)" msgstr "Der Charaktername ist zu lang (max. %d Zeichen)" -#: views/html/characters/edit.tpl:27 views/html/characters/register.tpl:26 +#: views/html/characters/edit.tpl:34 views/html/characters/register.tpl:26 msgid "Character name contains illegal characters" msgstr "Der Charaktername enthält ungültige Zeichen" -#: views/html/characters/edit.tpl:29 views/html/characters/register.tpl:28 +#: views/html/characters/edit.tpl:36 views/html/characters/register.tpl:28 msgid "Character name already exists" msgstr "Der Charaktername existiert bereits" -#: views/html/characters/edit.tpl:31 views/html/characters/register.tpl:30 +#: views/html/characters/edit.tpl:38 views/html/characters/register.tpl:30 msgid "Character name invalid" msgstr "Der Charaktername ist ungültig" -#: views/html/characters/edit.tpl:43 views/html/characters/register.tpl:48 +#: views/html/characters/edit.tpl:50 views/html/characters/register.tpl:48 msgid "Character properties" msgstr "Charaktereigenschaften" -#: views/html/characters/edit.tpl:44 views/html/characters/edit.tpl:46 -#: views/html/characters/edit.tpl:48 views/html/characters/index.tpl:21 +#: views/html/characters/edit.tpl:51 views/html/characters/edit.tpl:53 +#: views/html/characters/edit.tpl:55 views/html/characters/index.tpl:21 #: views/html/characters/manage.tpl:16 views/html/characters/register.tpl:49 #: views/html/characters/register.tpl:50 msgid "Character name" msgstr "Charaktername" -#: views/html/characters/edit.tpl:67 views/html/characters/register.tpl:67 +#: views/html/characters/edit.tpl:74 views/html/characters/register.tpl:67 #, php-format msgid "The Seminary field “%s” is invalid" msgstr "Das Kursfeld „%s“ ist ungültig" -#: views/html/characters/edit.tpl:72 views/html/characters/register.tpl:72 +#: views/html/characters/edit.tpl:79 views/html/characters/register.tpl:72 msgid "Seminary fields" msgstr "Kursfelder" #: views/html/characters/index.tpl:13 views/html/characters/manage.tpl:10 +#: views/html/users/index.tpl:7 views/html/users/manage.tpl:8 msgid "Manage" msgstr "Verwalten" #: views/html/characters/index.tpl:23 views/html/characters/manage.tpl:18 +#: views/html/users/manage.tpl:15 msgid "Role" msgstr "Rolle" -#: views/html/characters/index.tpl:28 views/html/characters/manage.tpl:23 +#: views/html/characters/index.tpl:24 views/html/characters/manage.tpl:19 +#: views/html/users/manage.tpl:16 +msgid "Date of registration" +msgstr "Registrierungsdatum" + +#: views/html/characters/index.tpl:29 views/html/characters/manage.tpl:24 +#: views/html/users/manage.tpl:18 msgid "Sort list" msgstr "Liste sortieren" -#: views/html/characters/index.tpl:38 views/html/characters/manage.tpl:34 -#: views/html/characters/manage.tpl:49 views/html/characters/manage.tpl:57 +#: views/html/characters/index.tpl:39 views/html/characters/manage.tpl:35 +#: views/html/characters/manage.tpl:50 views/html/characters/manage.tpl:58 +#: views/html/users/manage.tpl:27 views/html/users/manage.tpl:39 +#: views/html/users/manage.tpl:47 msgid "Admin" msgstr "Administrator" -#: views/html/characters/index.tpl:39 views/html/characters/manage.tpl:35 -#: views/html/characters/manage.tpl:50 views/html/characters/manage.tpl:58 +#: views/html/characters/index.tpl:40 views/html/characters/manage.tpl:36 +#: views/html/characters/manage.tpl:51 views/html/characters/manage.tpl:59 +#: views/html/users/manage.tpl:28 views/html/users/manage.tpl:40 +#: views/html/users/manage.tpl:48 msgid "Moderator" msgstr "Moderator" -#: views/html/characters/index.tpl:40 views/html/characters/manage.tpl:36 -#: views/html/characters/manage.tpl:52 views/html/characters/manage.tpl:60 +#: views/html/characters/index.tpl:41 views/html/characters/manage.tpl:37 +#: views/html/characters/manage.tpl:53 views/html/characters/manage.tpl:61 +#: views/html/users/manage.tpl:29 views/html/users/manage.tpl:42 +#: views/html/users/manage.tpl:50 msgid "User" msgstr "Benutzer" -#: views/html/characters/manage.tpl:47 +#: views/html/characters/manage.tpl:48 views/html/users/manage.tpl:37 msgid "Add role" msgstr "Füge Rolle hinzu" -#: views/html/characters/manage.tpl:55 +#: views/html/characters/manage.tpl:56 views/html/users/manage.tpl:45 msgid "Remove role" msgstr "Entferne Rolle" @@ -700,7 +715,8 @@ msgstr "Login" #: views/html/users/create.tpl:85 views/html/users/edit.tpl:87 #: views/html/users/edit.tpl:89 views/html/users/edit.tpl:91 #: views/html/users/login.tpl:12 views/html/users/login.tpl:13 -#: views/html/users/register.tpl:83 views/html/users/register.tpl:84 +#: views/html/users/manage.tpl:14 views/html/users/register.tpl:83 +#: views/html/users/register.tpl:84 msgid "Username" msgstr "Benutzername" @@ -760,8 +776,9 @@ msgstr "Gesamtfortschritt: %d%%" #: views/html/menu/index.tpl:2 views/html/users/create.tpl:5 #: views/html/users/delete.tpl:5 views/html/users/edit.tpl:6 #: views/html/users/edit.tpl:8 views/html/users/index.tpl:4 -#: views/html/users/login.tpl:4 views/html/users/register.tpl:5 -#: views/html/users/user.tpl:6 views/html/users/user.tpl:8 +#: views/html/users/login.tpl:4 views/html/users/manage.tpl:5 +#: views/html/users/register.tpl:5 views/html/users/user.tpl:6 +#: views/html/users/user.tpl:8 msgid "Users" msgstr "Benutzer" @@ -1059,7 +1076,7 @@ msgstr "Benutzer bearbeiten" msgid "Create new user" msgstr "Neuen Benutzer erstellen" -#: views/html/users/index.tpl:10 views/html/users/user.tpl:22 +#: views/html/users/index.tpl:11 views/html/users/user.tpl:22 #, php-format msgid "registered on %s" msgstr "registriert am %s" diff --git a/views/html/characters/index.tpl b/views/html/characters/index.tpl index 5abe9947..6e547654 100644 --- a/views/html/characters/index.tpl +++ b/views/html/characters/index.tpl @@ -21,6 +21,7 @@ + diff --git a/views/html/characters/manage.tpl b/views/html/characters/manage.tpl index d1376fc2..c86cd26b 100644 --- a/views/html/characters/manage.tpl +++ b/views/html/characters/manage.tpl @@ -16,6 +16,7 @@ + diff --git a/views/html/users/manage.tpl b/views/html/users/manage.tpl index 3b89208c..6f5dcda3 100644 --- a/views/html/users/manage.tpl +++ b/views/html/users/manage.tpl @@ -13,6 +13,7 @@