Changeset 743

Timestamp:

Jan 9, 2014, 2:44:51 PM (11 years ago)

Author:

maron

Message:

• Modify: Progress.php like all list task
• Modify: Search in form for same text

Location:

trunk

Files:

• Modules/Export/ExportOutput.php (modified) (1 diff)
• Modules/Export/Progress.php (modified) (1 diff)
• Modules/Translation/Form.php (modified) (2 diffs)
• Modules/Translation/LoadNames.php (modified) (2 diffs)
• Modules/Translation/Progress.php (modified) (1 diff)
• includes/Version.php (modified) (1 diff)
• includes/global.php (modified) (1 diff)

trunk/Modules/Export/ExportOutput.php

@@ -229 +229 @@
     global $System;
     $Output = '';
-    $DbResult = $System->Database->query('SELECT * FROM `ExportTask`'.
-    ' LEFT JOIN `Export` ON `Export`.`Id` = `ExportTask`.`Export` WHERE  (`Export`.`OutputType` = 9 OR  `Export`.`OutputType` = 10 ) AND `TimeFinish` IS NULL ORDER BY `Progress` DESC');// `Export`='.$Export->Id
     $Output .= 'Fronta zpracování exportů. Zobrazuje procenta dokončení: <br /><br />';
-    while($Task = $DbResult->fetch_assoc()) {
+
+
         $Output .= '<script src="http://code.jquery.com/jquery-latest.js"></script>'.
                '<script>'.
                   '$(document).ready(function() {'.
                   'var refreshId = setInterval(function() {'.
-                  '$("#progress'.$Task['Export'].'").load("'.$System->Link('/Modules/Export/Progress.php?RedirectId='.$_GET['ExportId'].'&ExportId='.$Task['Export']).'"); '.
+                  '$("#progress").load("'.$System->Link('/Modules/Export/Progress.php?RedirectId='.$_GET['ExportId']).'"); '.
                   '}, 1000);'.
                   '});'.
                '</script>';
-      $Export = '<a href="'.$System->Link('/export/?Action=View&ExportId='.$Task['Export']).'">'.$Task['Export'].'</a>';         
-      if ($_GET['ExportId'] == $Task['Export'])
-        $Export = ''.$Export.' (aktuální)';
-    
-      $Output .= ' <strong>Export '.$Export.': <div id="progress'.$Task['Export'].'">'.ProgressBar(300, $Task['Progress']).'</div></strong><br />';
-   // if ($Task['Progress'] == 0) $Output .= '<br/><br/><strong>Soubor čeká na zpracování ve frontě.</strong><br/>';
-    
-    }
+
+    
+      $Output .= ' <strong><div id="progress"></div></strong><br />';
+
     $DbResult = $System->Database->query('SELECT * FROM `ExportTask` LEFT JOIN `Export` ON `Export`.`Id` = `ExportTask`.`Export` WHERE '.
     ' (`Export`.`OutputType` = 9 OR  `Export`.`OutputType` = 10 ) AND `TimeFinish` IS NULL AND `TimeStart` < NOW()-10000');

trunk/Modules/Export/Progress.php

@@ -8 +8 @@
     
 
+    $Output = '';
+    $DbResult = $System->Database->query('SELECT * FROM `ExportTask`'.
+    ' LEFT JOIN `Export` ON `Export`.`Id` = `ExportTask`.`Export` WHERE  (`Export`.`OutputType` = 9 OR  `Export`.`OutputType` = 10 ) AND `TimeFinish` IS NULL  OR `Export` ='.$_GET['RedirectId'].' ORDER BY `Progress` DESC');// `Export`='.$Export->Id
+    while($Task = $DbResult->fetch_assoc()) {
+      $Export = '<a href="'.$System->Link('/export/?Action=View&ExportId='.$Task['Export']).'">'.$Task['Export'].'</a>';         
+      if ($_GET['RedirectId'] == $Task['Export'])
+        $Export = ''.$Export.' (tento)';
+      $Output .= ' <strong>Export '.$Export.': <div id="progress'.$Task['Export'].'">'.ProgressBar(300, $Task['Progress']).'</div></strong><br />';
+      if ( $Task['Progress'] > 99 )   echo '<script type="text/javascript" language="JavaScript" charset="utf-8">'.
+      'setTimeout("parent.location.href=\''.$System->Link('/export/?Action=View&Tab=7&ExportId='.$_GET['RedirectId']).'\'", 500)'.
+      '</script>';
+    }    
 
-    $DbResult = $System->Database->query('SELECT Progress FROM `ExportTask` WHERE `Export`='.$_GET['ExportId']);
-    $Task = $DbResult->fetch_assoc();
-    
-    if ( $Task['Progress'] > 99 )   echo '<script type="text/javascript" language="JavaScript" charset="utf-8">'.
-   'setTimeout("parent.location.href=\''.$System->Link('/export/?Action=View&Tab=7&ExportId='.$_GET['RedirectId']).'\'", 500)'.
-   '</script>';
+    echo $Output;
+    //echo ''.ProgressBar(300, $Task['Progress']).'';
 
-
-    echo ''.ProgressBar(300, $Task['Progress']).'';
-

trunk/Modules/Translation/Form.php

@@ -49 +49 @@
           foreach($TranslationTree[$GroupId]['Items'] as $Index => $TextItem)
             $Columns .= ' `Orig`.`'.$TextItem['Column'].'` as `Orig_'.$TextItem['Column'].'`, `Tran`.`'.$TextItem['Column'].'` as `'.$TextItem['Column'].'`,';
+
+
+            //search for same text with other entry
+                                          foreach($TranslationTree[$GroupId]['Items'] as $Index => $TextItem)
+                                                  if($TextItem['Visible'] == 1)
+                                                  if (($LineAJ[$TextItem['Column']] <> '') and 
+                    ($LineAJ[$TextItem['Column']] == $Line[$TextItem['Column']]) and
+                    (strlen($LineAJ[$TextItem['Column']]) < 20)
+                   )
+                 {       
+                                $sql = 'SELECT '.$Columns.' Tran.`Entry` FROM `'.$Table.'` as Tran';
+                    $join = ' JOIN `'.$Table.'` as `Orig` ON `Orig`.`Language` = 0 AND `Tran`.`Entry` = `Orig`.`Entry` AND `Tran`.`VersionEnd` = `Orig`.`VersionEnd` ';
+                    $where = ' WHERE '.'( `Tran`.'.$Language.' ) AND '.' `Orig`.`'.$TextItem['Column'].'` = "'.$LineAJ[$TextItem['Column']].'" ORDER BY `Tran`.`ModifyTime` DESC LIMIT 1';
+                    $DbResult = $this->Database->query($sql.$join.$where);
+                    while ($LineSearch = $DbResult->fetch_assoc()) {
+                      $Line[$TextItem['Column']] = $LineSearch[$TextItem['Column']];
+                    }
+                 }      
           
                                 $sql = 'SELECT '.$Columns.' Tran.`Entry` FROM `'.$Table.'` as Tran';
@@ -68 +86 @@
           }
           
+                    
         } else {
                                 $DbResult = $this->Database->query('SELECT * FROM `'.$Table.'` WHERE '.

trunk/Modules/Translation/LoadNames.php

@@ -58 +58 @@
 
 
-  //todo:haveto load
   $Text = '';
         function LoadNames() {
@@ -78 +77 @@
                                         } else {
                                         if(($GroupId == 13)) {
-                                                $names = GetTranslatNames($Text, 0, array('Dictionary' => 'Text', 'TextGlobalString' => 'Text', 'TextArea' => 'Name', 'TextCharacterClass' => 'Name','TextCharacterRace' => 'Name1',),false);
+                                                $names = GetTranslatNames($Text, 0, array('Dictionary' => 'Text', 'TextGlobalString' => 'Text', 'TextArea' => 'Name', 'TextItemSublass' => 'Name', 'TextCharacterRace' => 'Name1',),false);
             } else {
-                                                $names = GetTranslatNames($Text, 0, array('Dictionary' => 'Text'));
+                                                $names = GetTranslatNames($Text, 0, GetTranslatNamesArray());
                                         }
                                         }

trunk/Modules/Translation/Progress.php

@@ -112 +112 @@
 $Output .= $this->ShowStatTable();
 
-$Output .= '<div>Počet stáhnutí přeložených textů v SQL souboru: <strong>';    
-$ID = $this->Database->query('SELECT count(distinct(`IP`)) FROM `Log` WHERE `Type` = 2');
-$Line = $ID->fetch_row();
-$Output .= $Line[0];
-$Output .= '</strong></div>';
-                
-$Output .= '<div>Počet stáhnutí: <strong>';      
-$ID = $this->Database->query('SELECT count(distinct(`IP`)) FROM `Log` WHERE `Type` = 0');
-$Line = $ID->fetch_row();
-$Output .= $Line[0];
-$Output .= '</strong></div>';
     return($Output);
   }

trunk/includes/Version.php

@@ -6 +6 @@
 // and system will need database update. 
 
-$Revision = 742; // Subversion revision
+$Revision = 743; // Subversion revision
 $DatabaseRevision = 732; // Database structure revision 
 $ReleaseTime = '2014-01-08';

trunk/includes/global.php

@@ -523 +523 @@
     'TextCharacterRace' => 'Name1',
     'TextItemSubClass' => 'Name',
+    'TextItemSubClass' => 'Name2',
     'TextCreatureType' => 'Name',
     'TextItem' => 'Name',