Changeset 433 for trunk

Timestamp:

Apr 8, 2010, 10:43:50 PM (15 years ago)

Author:

george

Message:

• Opraveno: Správné zobrazení statistiky dokončení skupin u exportů při nevybraných skupinách a při nevybrané verzi.
• Upraveno: U zobrazení překladatelů u exportu také ukazovat úroveň a zkušenosti dle HTML procent namísto obrázků.

Location:

trunk

Files:

• export/index.php (modified) (5 diffs)
• index.php (modified) (1 diff)
• sql/updates/428.sql (modified) (1 diff)

trunk/export/index.php

@@ -162 +162 @@
     array('Name' => 'TranslatedCount', 'Title' => 'Překladů'), 
     array('Name' => 'XP', 'Title' => 'Úroveň'), 
+    array('Name' => 'XP', 'Title' => 'Zkušenost'), 
     array('Name' => '', 'Title' => 'Výběr'), 
     array('Name' => 'Sequence2', 'Title' => 'Pořadí'), 
@@ -197 +198 @@
   while($UserLine = mysql_fetch_assoc($DbResult))
   {
+    $XP = GetLevelMinMax($UserLine['XP']);
     $Checked = $UserLine['Sequence'] != '';
     $Selection = CheckBox('sel'.$UserLine['ID'], $Checked, '', 'CheckBox', !$Editable);
     $Sequence = '<input type="text" name="seq'.$UserLine['ID'].'" style="text-align: center; width: 40px;" value="'.$UserLine['Sequence2'].'"'.$DisabledInput[$Editable].'/>';
-    echo('<tr>
-    <td><a href="'.$System->Link('/TranslationList.php?user='.$UserLine['ID'].'&amp;action=userall').'" title="Zobrazit všechny jeho přeložené texty">'.$UserLine['Name'].'</a></td>
-    <td>'.$UserLine['TranslatedCount'].'</td>
-      <td><img src="'.$Config['Web']['TempFolder'].'/user/'.$UserLine['Name'].'/level.png" alt="Úroveň uživatele" /></td>
-    <td>'.$Selection.'</td><td>'.$Sequence.'</td></tr>');
+    echo('<tr>'.
+    '<td><a href="'.$System->Link('/TranslationList.php?user='.$UserLine['ID'].'&amp;action=userall').'" title="Zobrazit všechny jeho přeložené texty">'.$UserLine['Name'].'</a></td>'.
+    '<td>'.$UserLine['TranslatedCount'].'</td>'.
+    '<td>'.$XP['Level'].'</td>'.
+    '<td>'.ProgressBar(150, round($XP['XP'] / $XP['MaxXP'] * 100, 2), $XP['XP'].' / '.$XP['MaxXP']).'</td>'.
+    '<td>'.$Selection.'</td><td>'.$Sequence.'</td></tr>');
   }
   echo('</table>');
@@ -539 +542 @@
   $Export->LoadFilters();
   
+  if($Export->ClientVersion['BuildNumber'] == '') ErrorMessage('Nebyla vybrána verze klienta');
   $GroupListQuery = 'SELECT `Group`.* FROM `Group` '.
   ' JOIN `ExportGroup` ON (`ExportGroup`.`Export`='.$Export->Id.') AND (`ExportGroup`.`Group`=`Group`.`Id`)';
   $Query = '';
+  $UnionItems = array();
   $DbResult = $Database->SQLCommand($GroupListQuery);
   while($DbRow = mysql_fetch_assoc($DbResult))
   {
-    $Query .= 'SELECT (SELECT COUNT(DISTINCT(`Entry`)) FROM ('.
+    $UnionItems[] = 'SELECT (SELECT COUNT(DISTINCT(`Entry`)) FROM ('.
     ' SELECT `T`.* FROM `'.$DbRow['TablePrefix'].'` AS `T`'.
     ' JOIN `ExportUser` ON (`ExportUser`.`User`=`T`.`User`) AND (`ExportUser`.`Export`='.$Export->Id.') '.
@@ -554 +559 @@
     ' SELECT `T`.* FROM `'.$DbRow['TablePrefix'].'` AS `T`'.
     ' WHERE (`Language` = 0) AND (`VersionStart` <= '.$Export->ClientVersion['BuildNumber'].') AND (`VersionEnd` >= '.$Export->ClientVersion['BuildNumber'].')'.
-    ') AS `C2`) AS `Total`, "'.$DbRow['Name'].'" AS `Name` UNION ';
+    ') AS `C2`) AS `Total`, "'.$DbRow['Name'].'" AS `Name`';
   }
   $Query = substr($Query, 0, - 6);
@@ -577 +582 @@
   $Translated = 0;
   $Total = 0;
-  $ID = $Database->SQLCommand('SELECT *, ROUND(`Translated` / `Total` * 100, 2) AS `Percent` FROM ('.$Query.') AS `C3` '.$Order['SQL'].$PageList['SQLLimit']);
-  while($Group = mysql_fetch_assoc($ID)) 
-  {
-    echo('<tr><td>'.$Group['Name'].'</td><td>'.$Group['Translated'].'</td><td>'.$Group['Total'].'</td><td>'.ProgressBar(150, $Group['Percent']).'</td></tr>');
-    $Translated += $Group['Translated'];
-    $Total += $Group['Total'];
-  }
-  echo('<tr><td><strong>Celkem</strong></td><td><strong>'.$Translated.'</strong></td><td><strong>'.$Total.'</strong></td><td><strong>'.ProgressBar(150, round($Translated / $Total * 100, 2)).'</strong></td></tr>');
+  if(count($UnionItems) > 0)
+  {
+    $ID = $Database->SQLCommand('SELECT *, ROUND(`Translated` / `Total` * 100, 2) AS `Percent` FROM ('.implode(' UNION ALL ', $UnionItems).') AS `C3` '.$Order['SQL'].$PageList['SQLLimit']);
+    while($Group = mysql_fetch_assoc($ID)) 
+    {
+      echo('<tr><td>'.$Group['Name'].'</td><td>'.$Group['Translated'].'</td><td>'.$Group['Total'].'</td><td>'.ProgressBar(150, $Group['Percent']).'</td></tr>');
+      $Translated += $Group['Translated'];
+      $Total += $Group['Total'];
+    }
+  }
+  if($Total > 0) $Percent = $Translated / $Total * 100;
+    else $Percent = 100;
+  
+  echo('<tr><td><strong>Celkem</strong></td><td><strong>'.$Translated.'</strong></td><td><strong>'.$Total.'</strong></td><td><strong>'.ProgressBar(150, round($Percent, 2)).'</strong></td></tr>');
   echo('</table>');
 }

trunk/index.php

@@ -10 +10 @@
   $DbResult = $Database->SQLCommand('SELECT `News`.`Time`, `User`.`Name`, `News`.`Text` FROM `News` JOIN `User` ON `User`.`ID` = `News`.`User` ORDER BY `Time` DESC LIMIT 10');
   while($DbRow = mysql_fetch_assoc($DbResult))
-    $Output .= '<div><strong>'.$DbRow['Name'].' ('.date('d.m.Y', MysqlDateTimeToTime($DbRow['Time'])).')</strong> <br />'.$DbRow['Text'].'</div>';  
+    $Output .= '<div><strong>'.$DbRow['Name'].' ('.HumanDate($DbRow['Time']).')</strong> <br />'.$DbRow['Text'].'</div>';  
   $Output .= '<a href="action.php?action=news">Všechny zprávy</a>';
   $Output .= '</div>';

trunk/sql/updates/428.sql

@@ -4 +4 @@
 UPDATE `Group` SET  `Name` =  'EventAI' WHERE  `Group`.`Id` =11;
 UPDATE `Group` SET  `Name` =  'Skripty ScriptDev2' WHERE  `Group`.`Id` =10;
+
+UPDATE  `GroupItem` SET  `Name` =  'Podrobnosti' WHERE  `GroupItem`.`Id` =2;