Changeset 303

Timestamp:

Jan 4, 2010, 10:57:57 AM (15 years ago)

Author:

george

Message:

• Opraveno: Zobrazování obrázků úrovně překladatelů na stránce Exportu.
• Opraveno: Výchozí automatické řazení nevybraných položek překladatelů. Nyní se počáteční pořadí vytváří dle zvoleného řazení sloupce tabulky.
• Opraveno: Zobrazování vedoucího týmu na stránce týmu.
• Opraveno: Generování výpisu dostupných týmů na stránce registrace překladatele.

Location:

trunk

Files:

• export/index.php (modified) (3 diffs)
• includes/global.php (modified) (1 diff)
• registrace.php (modified) (1 diff)
• sql/updates/302.sql (modified) (1 diff)
• sql/updates/303.sql (added)
• team.php (modified) (1 diff)

trunk/export/index.php

@@ -167 +167 @@
   }
 
-  $Columns = '';
-  $Joins = '';
-  foreach($TranslationTree as $Group)
-    if($Group['TablePrefix'] != '')
-    {
-      $Columns .= 'COALESCE(T'.$Group['Id'].'.Count, 0) + ';
-      $Joins .= ' LEFT JOIN (SELECT User, COUNT(User) as Count FROM `'.$Group['TablePrefix'].'` WHERE (Complete = 1) AND (Language <> 0) GROUP BY User) as T'.$Group['Id'].' ON user.ID=T'.$Group['Id'].'.User';
-    }
-  $Query = 'SELECT (@I := @I + 1) AS Sequence2, ExportUser.Sequence, T.ID, T.TranslatedCount, T.user, T.XP FROM (SELECT user.ID, user.user, user.XP, ('.substr($Columns, 0, -3).') as TranslatedCount FROM `user`'.$Joins.') AS T';
-  $Query .=' LEFT JOIN ExportUser ON ExportUser.Export = '.$_GET['ExportId'].' AND ExportUser.User=T.ID';
-  $Query .=' WHERE T.TranslatedCount > 0 ORDER BY COALESCE(Sequence, 100)';
-
-  $DbResult = $Database->SQLCommand('SELECT COUNT(*) FROM ('.$Query.') AS X');
-  $DbRow = mysql_fetch_row($DbResult);
-  $PageList = GetPageList($DbRow[0]);    
-  
   $TableColumns = array(
     array('Name' => 'user', 'Title' => 'Jméno'), 
@@ -191 +175 @@
   );  
   $Order = GetOrderTableHeader($TableColumns, 'TranslatedCount', 1);
+
+  $Columns = '';
+  $Joins = '';
+  foreach($TranslationTree as $Group)
+    if($Group['TablePrefix'] != '')
+    {
+      $Columns .= 'COALESCE(T'.$Group['Id'].'.Count, 0) + ';
+      $Joins .= ' LEFT JOIN (SELECT User, COUNT(User) as Count FROM `'.$Group['TablePrefix'].'` WHERE (Complete = 1) AND (Language <> 0) GROUP BY User) as T'.$Group['Id'].' ON user.ID=T'.$Group['Id'].'.User';
+    }
+  $Query = 'SELECT (@I := @I + 1) AS Sequence2, TT.* FROM (SELECT ExportUser.Sequence, T.ID, T.TranslatedCount, T.user, T.XP FROM (SELECT user.ID, user.user, user.XP, ('.substr($Columns, 0, -3).') as TranslatedCount FROM `user`'.$Joins.') AS T';
+  $Query .=' LEFT JOIN ExportUser ON ExportUser.Export = '.$_GET['ExportId'].' AND ExportUser.User=T.ID';
+  $Query .=' WHERE T.TranslatedCount > 0 ORDER BY COALESCE(ExportUser.Sequence, 100000000), '.substr($Order['SQL'], 10).') AS TT';
+
+  $DbResult = $Database->SQLCommand('SELECT COUNT(*) FROM ('.$Query.') AS X');
+  $DbRow = mysql_fetch_row($DbResult);
+  $PageList = GetPageList($DbRow[0]);    
+  
   echo('<form action="?Action=View&amp;ExportId='.$_GET['ExportId'].'&amp;Operation=Save" method="post">');
   echo('<h3>Překladatelé</h3>');
@@ -212 +213 @@
     <td><a href="'.$Config['Web']['BaseURL'].'/TranslationList.php?user='.$User['ID'].'&amp;action=userall" title="Zobrazit všechny jeho přeložené texty">'.$User['user'].'</a></td>
     <td>'.$User['TranslatedCount'].'</td>
-      <td><img src="'.$Config['Web']['TempFolder'].$User['user'].'/level.png" alt="Úroveň uživatele" /></td>
+      <td><img src="'.$Config['Web']['TempFolder'].'/user/'.$User['user'].'/level.png" alt="Úroveň uživatele" /></td>
     <td>'.$Selection.'</td><td>'.$Sequence.'</td></tr>');
   }

trunk/includes/global.php

@@ -323 +323 @@
 
     echo('</td></tr>');
-    if($Config['Web']['ShowRuntimeInfo'] == true) echo('<tr><td colspan="3" style="text-align: center;">Doba generování: '.$ScriptGenerateDuration.' s / '.ini_get('max_execution_time').' s &nbsp;&nbsp; Použitá paměť: '.HumanSize(memory_get_peak_usage(FALSE)).' / '.ini_get('memory_limit').'B</td></tr>');
+    if($Config['Web']['ShowRuntimeInfo'] == true) echo('<tr><td colspan="3" style="text-align: center;">Doba generování: '.$ScriptGenerateDuration.' s / '.ini_get('max_execution_time').' s &nbsp;&nbsp; Použitá paměť: '.HumanSize(memory_get_peak_usage(FALSE)).' / '.ini_get('memory_limit').'B &nbsp;&nbsp; <a href="http://validator.w3.org/check?uri='.htmlentities('http://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'].'?'.$_SERVER['QUERY_STRING']).'">HTML validator</a></td></tr>');
     echo('</table>'.
       '</body>'.

trunk/registrace.php

@@ -68 +68 @@
       <td><select name="Team"><option value="0">Žádného</option>
       ');
-    $ID = $Database->SQLCommand('SELECT `name`, `Id` FROM `Team`');
+    $ID = $Database->SQLCommand('SELECT `Name`, `Id` FROM `Team`');
     while($Line = mysql_fetch_assoc($ID))
     {

trunk/sql/updates/302.sql

@@ -1 +1 @@
 ALTER TABLE `team` ADD `URL` VARCHAR( 255 ) NOT NULL ;
 ALTER TABLE `team` CHANGE `ID` `Id` INT( 11 ) NOT NULL AUTO_INCREMENT ;
-LTER TABLE `team` CHANGE `name` `Name` VARCHAR( 255 ) CHARACTER SET utf8 COLLATE utf8_czech_ci NOT NULL;
+ALTER TABLE `team` CHANGE `name` `Name` VARCHAR( 255 ) CHARACTER SET utf8 COLLATE utf8_czech_ci NOT NULL;
 ALTER TABLE `team` CHANGE `description` `Description` TEXT CHARACTER SET utf8 COLLATE utf8_czech_ci NOT NULL ;
 

trunk/team.php

@@ -185 +185 @@
       $Team = mysql_fetch_assoc($Database->SQLCommand('SELECT *, (SELECT count(*) FROM `user` WHERE `team` = `Team`.`Id`) as `NumberUser`, (SELECT SUM('.substr($Columns, 0, -3).') FROM user '.$Joins.' WHERE `team` = `Team`.`Id`) as `NumberTranslate` FROM `Team` WHERE `Id`='.$_GET['id'])); 
       $DbResult = $Database->SQLCommand('SELECT user FROM user WHERE ID='.$Team['Leader']);
-      if(mysql_num_rows($DbResult) > 0) $Leader = mysql_fetch_assoc($DbResult);
-        else $Leader = '';
+      if(mysql_num_rows($DbResult) > 0) 
+      {
+        $Leader = mysql_fetch_assoc($DbResult);
+        $Leader = $Leader['user'];
+      } else $Leader = '';
     
       echo('<strong>Překladatelský tým '.$Team['Name'].'</strong><br />'.