Changeset 866

Timestamp:

Feb 6, 2016, 12:08:40 AM (9 years ago)

Author:

chronos

Message:

• Add: Show also elapsed time in export task progress.

Location:

trunk

Files:

• Application/Version.php (modified) (1 diff)
• Modules/Export/Export.php (modified) (1 diff)
• locale/cs.php (modified) (1 diff)

trunk/Application/Version.php

@@ -7 +7 @@
 
 $Version = '1.0';
-$Revision = 865; // Subversion revision
+$Revision = 866; // Subversion revision
 $DatabaseRevision = 857; // Database structure revision
 $ReleaseDate = strtotime('2016-02-05');

trunk/Modules/Export/Export.php

@@ -739 +739 @@
 
       // Show progress bar
-      $Output .= ' <strong>Export '.$Export.': <div id="progress'.$Task['Export'].'">'.
-        ProgressBar(300, $Task['Progress']).'</div></strong>';
+      $Output .= ' <strong>Export '.$Export.':</strong> <div id="progress'.$Task['Export'].'">'.
+        '<strong>'.ProgressBar(300, $Task['Progress']).'</strong> ';
 
       // Show estimated time to complete
       $PrefixMultiplier = new PrefixMultiplier();
       if($Task['Progress'] > 0) {
+        $ElapsedTime = time() - MysqlDateTimeToTime($Task['TimeStart']);
+        $Output .= T('Elapsed time').': <strong>'.$PrefixMultiplier->Add($ElapsedTime, '', 4, 'Time').'</strong> / ';
         $EstimatedTime = (time() - MysqlDateTimeToTime($Task['TimeStart'])) / $Task['Progress'] * (100 - $Task['Progress']);
-        $Output .= 'Zbývající odhadovaný čas: '.$PrefixMultiplier->Add($EstimatedTime, '', 4, 'Time').'<br/>';
-      }
+        $Output .= T('Estimated remaining time').': <strong>'.$PrefixMultiplier->Add($EstimatedTime, '', 4, 'Time').'</strong><br/>';
+      }
+      $Output .= '</div>';
 
       if($Task['Progress'] > 99)
         $Output .= '<script type="text/javascript" language="JavaScript" charset="utf-8">'.
-        'setTimeout("parent.location.href=\''.$this->System->Link('/export/?Action=View&amp;Tab=7&amp;ExportId='.$TaskId).'\'", 500)'.
+        'setTimeout("parent.location.href=\''.$this->System->Link('/export/?Action=View&Tab=7&ExportId='.$TaskId).'\'", 500)'.
         '</script>';
     }

trunk/locale/cs.php

@@ -515 +515 @@
         'Moderator' => 'Moderátor',
         'Translate' => 'Překládat',
+        'Estimated remaining time' => 'Odhadovaný zbývající čas',
+        'Elapsed time' => 'Uplynulý čas',
       ),
       'URL' => array(