Changeset 825 for trunk

Timestamp:

Mar 1, 2015, 1:27:40 PM (10 years ago)

Author:

chronos

Message:

• Added: Show user level and experience also on user profile page.

Location:

trunk

Files:

• Modules/User/Profile.php (modified) (2 diffs)
• Modules/User/UserList.php (modified) (3 diffs)
• includes/Version.php (modified) (1 diff)
• style/style.css (modified) (1 diff)

trunk/Modules/User/Profile.php

@@ -135 +135 @@
     $Output = '';
     $Query = 'SELECT `User`.`Name`, `UserTrace`.`LastLogin`, `UserTrace`.`LastIP`, '.
-        '`User`.`Email`, `UserTrace`.`UserAgent`, `User`.`PreferredVersion`, '.
-        '`User`.`TranslatedCount`, `User`.`Team`, `User`.`ID`, `User`.`Info`, '.
-        '`Team`.`Name` AS `TeamName`, `Language`.`Name` AS `LanguageName`, '.
-        '`ClientVersion`.`Version` AS `Version` FROM `User` '.
-        'LEFT JOIN `UserTrace` ON `UserTrace`.`User` = `User`.`Id` '.
-        'LEFT JOIN `Language` ON `Language`.`Id` = `User`.`Language` '.
-        'LEFT JOIN `Team` ON `Team`.`Id` = `User`.`Team` '.
-        'LEFT JOIN `ClientVersion` ON `ClientVersion`.`Id` = `User`.`PreferredVersion` '.
-        'WHERE `User`.`Id` = '.($_GET['user'] * 1);
+      '`User`.`Email`, `UserTrace`.`UserAgent`, `User`.`PreferredVersion`, '.
+      '`User`.`TranslatedCount`, `User`.`Team`, `User`.`ID`, `User`.`Info`, '.
+      '`Team`.`Name` AS `TeamName`, `Language`.`Name` AS `LanguageName`, '.
+      '`ClientVersion`.`Version` AS `Version`, `User`.`XP` FROM `User` '.
+      'LEFT JOIN `UserTrace` ON `UserTrace`.`User` = `User`.`Id` '.
+      'LEFT JOIN `Language` ON `Language`.`Id` = `User`.`Language` '.
+      'LEFT JOIN `Team` ON `Team`.`Id` = `User`.`Team` '.
+      'LEFT JOIN `ClientVersion` ON `ClientVersion`.`Id` = `User`.`PreferredVersion` '.
+      'WHERE `User`.`Id` = '.($_GET['user'] * 1);
     $DbResult = $this->Database->query($Query);
     if($DbResult->num_rows > 0)
     {
-    $UserLine = $DbResult->fetch_array();
-
-    $Output .=
-    '<h3>Překladatel '.$UserLine['Name'].'</h3>'.
-    'Výchozí jazyk: <strong>'.$UserLine['LanguageName'].'</strong><br />'.
-    'Výchozí verze klienta: <a href="'.$this->System->Link('/client-version/?action=item&amp;id='.$UserLine['PreferredVersion']).'"><strong>'.$UserLine['Version'].'</strong></a><br />'.
-    'Poslední připojení: <strong>'.HumanDateTime($UserLine['LastLogin']).'</strong><br />'.
-    'Počet přeložených: <a href="TranslationList.php?user='.$UserLine['ID'].'&amp;state=2&amp;group=0" title="Zobrazit Všechny jeho přeložené texty"><strong>'.$UserLine['TranslatedCount'].'</strong></a><br />';
-    if($UserLine['TeamName'] != '')
-      $Output .= 'Člen týmu: <a href="team/?action=team&amp;id='.$UserLine['Team'].'"><strong>'.$UserLine['TeamName'].'</strong></a><br />';
-    //user tags
-    $Query = 'SELECT * FROM `UserTag` '.
-     'LEFT JOIN `UserTagType` ON `UserTagType`.`ID` = `UserTag`.`UserTagType` '.
-     'WHERE `User` = '.($_GET['user'] * 1);
-    $DbResult = $this->Database->query($Query);
-    if ($DbResult->num_rows != 0) {
-      $Output .= 'Překladatel se řídí těmito pravidly:<br />';
-      $Output .= '<ul>';
-      while ($UserTag = $DbResult->fetch_array()) {
-        $Output .= ' <li>'.$UserTag['Text'].'</li>';
-      }
-      $Output .= '</ul>';
-    }
+      $UserLine = $DbResult->fetch_array();
+
+      $XP = GetLevelMinMax($UserLine['XP']);
+      $Output .=
+        '<h3>Překladatel '.$UserLine['Name'].'</h3>'.
+        'Výchozí jazyk: <strong>'.$UserLine['LanguageName'].'</strong><br />'.
+        'Výchozí verze klienta: <a href="'.$this->System->Link('/client-version/?action=item&amp;id='.$UserLine['PreferredVersion']).'"><strong>'.$UserLine['Version'].'</strong></a><br />'.
+        'Poslední připojení: <strong>'.HumanDateTime($UserLine['LastLogin']).'</strong><br />'.
+        'Počet přeložených: <a href="TranslationList.php?user='.$UserLine['ID'].'&amp;state=2&amp;group=0" title="Zobrazit Všechny jeho přeložené texty"><strong>'.$UserLine['TranslatedCount'].'</strong></a><br />'.
+        'Úroveň: <strong>'.$XP['Level'].'</strong><br/>'.
+        'Zkušenost: '.ProgressBar(150, round($XP['XP'] / $XP['MaxXP'] * 100, 2), $XP['XP'].' / '.$XP['MaxXP']).'<br/>';
+      if($UserLine['TeamName'] != '')
+        $Output .= 'Člen týmu: <a href="team/?action=team&amp;id='.$UserLine['Team'].'"><strong>'.$UserLine['TeamName'].'</strong></a><br />';
+
+      // User tags
+      $Query = 'SELECT * FROM `UserTag` '.
+        'LEFT JOIN `UserTagType` ON `UserTagType`.`ID` = `UserTag`.`UserTagType` '.
+        'WHERE `User` = '.($_GET['user'] * 1);
+      $DbResult = $this->Database->query($Query);
+      if ($DbResult->num_rows != 0) {
+        $Output .= 'Překladatel se řídí těmito pravidly:<br />';
+        $Output .= '<ul>';
+        while ($UserTag = $DbResult->fetch_array()) {
+          $Output .= ' <li>'.$UserTag['Text'].'</li>';
+        }
+        $Output .= '</ul>';
+      }
 
 
@@ -233 +237 @@
           '<input type="submit" value="Odeslat" />'.
           '</div></form></fieldset>';
-    }
+      }
     } else $Output .= ShowMessage('Uživatel nenalezen', MESSAGE_CRITICAL);
     return($Output);

trunk/Modules/User/UserList.php

@@ -50 +50 @@
       array('Name' => 'XP', 'Title' => T('Level')),
       array('Name' => 'XP', 'Title' => T('Experience')),
-      //array('Name' => 'GM', 'Title' => T('GM')),
       array('Name' => 'LastLogin', 'Title' => T('Last logged in')),
       array('Name' => 'RegistrationTime', 'Title' => T('Registration time')),
@@ -58 +57 @@
 
     $Query = 'SELECT `User`.`ID`, `User`.`Name`, `LastLogin`, `GM`, `XP`, `TranslatedCount`, `RegistrationTime` '.
-        'FROM `User` '.
-        'LEFT JOIN `UserTrace` ON `UserTrace`.`User` = `User`.`Id` '.
-        'WHERE 1'.$SearchQuery.$TeamFilter.$Order['SQL'].$PageList['SQLLimit'];
+      'FROM `User` '.
+      'LEFT JOIN `UserTrace` ON `UserTrace`.`User` = `User`.`Id` '.
+      'WHERE 1'.$SearchQuery.$TeamFilter.$Order['SQL'].$PageList['SQLLimit'];
 
     $DbResult = $this->Database->query($Query);
@@ -67 +66 @@
       $XP = GetLevelMinMax($Line['XP']);
       $Output .= '<tr><td><a href="user.php?user='.$Line['ID'].'">'.$Line['Name'].'</a></td>'.
-          '<td style="text-align: center;"><a href="TranslationList.php?user='.$Line['ID'].'&amp;group=0&amp;state=2" title="Zobrazit Všechny jeho přeložené texty">'.$Line['TranslatedCount'].'</a></td>'.
-          '<td>'.$XP['Level'].'</td>'.
-          '<td>'.ProgressBar(150, round($XP['XP'] / $XP['MaxXP'] * 100, 2), $XP['XP'].' / '.$XP['MaxXP']).'</td>'.
-          //<td>'.$Moderators[$Line['GM']].'</td>
-      '<td>'.HumanDate($Line['LastLogin']).'</td>'.
-      '<td>'.HumanDate($Line['RegistrationTime']).'</td></tr>';
+        '<td style="text-align: center;"><a href="TranslationList.php?user='.$Line['ID'].'&amp;group=0&amp;state=2" title="Zobrazit Všechny jeho přeložené texty">'.$Line['TranslatedCount'].'</a></td>'.
+        '<td>'.$XP['Level'].'</td>'.
+        '<td>'.ProgressBar(150, round($XP['XP'] / $XP['MaxXP'] * 100, 2), $XP['XP'].' / '.$XP['MaxXP']).'</td>'.
+        '<td>'.HumanDate($Line['LastLogin']).'</td>'.
+        '<td>'.HumanDate($Line['RegistrationTime']).'</td></tr>';
     }
     $Output .= '</table>'.

trunk/includes/Version.php

@@ -6 +6 @@
 // and system will need database update.
 
-$Revision = 824; // Subversion revision
+$Revision = 825; // Subversion revision
 $DatabaseRevision = 811; // Database structure revision
-$ReleaseTime = '2015-02-27';
+$ReleaseTime = '2015-03-01';

trunk/style/style.css

@@ -481 +481 @@
   border: 0px solid black;
   background-color: #e0e0e0;
+  display: inline-block;
 }