Changeset 525 for trunk/export

Timestamp:

Feb 20, 2013, 11:30:49 PM (12 years ago)

Author:

chronos

Message:

• Opraveno: Zobrazení porovnání překladů.
• Opraveno: Zobrazení stavu dokončení pro všechny překlady.
• Přidáno: V seznamu překladů přidán sloupec Jazyk.
• Opraveno: Místa, kde s pevným indexem anglického originálu upravena na nastavitelný.

Location:

trunk/export

Files:

• export.php (modified) (1 diff)
• index.php (modified) (7 diffs)

trunk/export/export.php

@@ -63 +63 @@
     // Expand query for loading english texts
     $Query = 'SELECT `T4`.*, '.$OriginalColumns.' FROM ('.$Query.') AS `T4` '.
-    ' LEFT JOIN `'.$Group['TablePrefix'].'` AS `T3` ON (`T3`.`Entry` = `T4`.`Entry`) AND (`T3`.`Language` = 0) AND (`T3`.`VersionStart` = `T4`.`VersionStart`) AND (`T3`.`VersionEnd` = `T4`.`VersionEnd`)';  
+    ' LEFT JOIN `'.$Group['TablePrefix'].'` AS `T3` ON (`T3`.`Entry` = `T4`.`Entry`) '.
+    'AND (`T3`.`Language` = '.$Config['OriginalLanguage'].') AND '.
+    '(`T3`.`VersionStart` = `T4`.`VersionStart`) AND (`T3`.`VersionEnd` = `T4`.`VersionEnd`)';  
 
     return($Query);

trunk/export/index.php

@@ -505 +505 @@
   $Export = $DbResult->fetch_assoc();
 
+  if($Export['OutputType'] == '') $Output .= ShowMessage('Nevybrán typ exportu', MESSAGE_CRITICAL);
+  else {
   $Query = 'SELECT `ClientVersion`.* FROM `ExportVersion` LEFT JOIN `ClientVersion` ON `ClientVersion`.`Id`=`ExportVersion`.`ClientVersion` WHERE `ExportType`='.$Export['OutputType'];
 
@@ -544 +546 @@
     '</form>'.
     $PageList['Output'];
+  }
   return($Output);
 }
@@ -551 +554 @@
   global $System;
   
+  $Output = '';
   $DbResult = $System->Database->query('SELECT * FROM `Export` WHERE `Id`='.$_GET['ExportId']);
   $Export = $DbResult->fetch_assoc();
-  $DbResult = $System->Database->query('SELECT * FROM `ExportOutputType` WHERE `Id`='.$Export['OutputType']);
+  if($Export['OutputType'] == '') $Output .= ShowMessage('Nevybrán typ exportu', MESSAGE_CRITICAL);
+  else {
+        $DbResult = $System->Database->query('SELECT * FROM `ExportOutputType` WHERE `Id`='.$Export['OutputType']);
   if($DbResult->num_rows > 0)
   {
@@ -563 +569 @@
     } else $Output = ShowMessage('Nebyla vybrána požadovaná verze klienta.', MESSAGE_CRITICAL);
   } else $Output = ShowMessage('Nebyl vybrán formát výstupu.', MESSAGE_CRITICAL);
+    }
   return($Output);
 }
@@ -568 +575 @@
 function ExportViewStat()
 {
-  global $System;
+  global $System, $Config;
 
   $Export = new Export($System);
   $Export->Id = $_GET['ExportId'];
   $Export->Init();
-  $Export->LoadFilters();
+  if($Export->ClientVersion == '') $Output = ShowMessage('Nebyla vybrána verze klienta', MESSAGE_CRITICAL);
+  else {
+        $Export->LoadFilters();
   
   if($Export->ClientVersion['BuildNumber'] == '') $Output = ShowMessage('Nebyla vybrána verze klienta', MESSAGE_CRITICAL);
-  {
+  else {
         $GroupListQuery = 'SELECT `Group`.* FROM `Group` '.
   ' JOIN `ExportGroup` ON (`ExportGroup`.`Export`='.$Export->Id.') AND (`ExportGroup`.`Group`=`Group`.`Id`)';
@@ -592 +601 @@
     '(SELECT COUNT(DISTINCT(`Entry`)) FROM ('.
     ' SELECT `T`.* FROM `'.$DbRow['TablePrefix'].'` AS `T`'.
-    ' WHERE (`Language` = 0) AND (`VersionStart` <= '.$Export->ClientVersion['BuildNumber'].') AND (`VersionEnd` >= '.$Export->ClientVersion['BuildNumber'].')'.
+    ' WHERE (`Language` = '.$Config['OriginalLanguage'].') AND (`VersionStart` <= '.$Export->ClientVersion['BuildNumber'].') AND (`VersionEnd` >= '.$Export->ClientVersion['BuildNumber'].')'.
     ') AS `C2`) AS `Total`, "'.$DbRow['Name'].'" AS `Name`';
   }
@@ -631 +640 @@
   $Output .= '<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>';
   $Output .= '</table>';
+  }
   }
   return($Output);