Changeset 864 for trunk/Modules/Export/Export.php

Timestamp:

Feb 5, 2016, 11:47:36 PM (9 years ago)

Author:

chronos

Message:

• Fixed: Do not allow to regenerate multipletimes already running export task.
• Modified: Progress reimplemented as Page class extension with virtual URL to avoid execution of any scripts with path to Modules subdirectory.
• Added: Show estimated time to complete export task.

File:

• trunk/Modules/Export/Export.php (modified) (2 diffs)

trunk/Modules/Export/Export.php

@@ -715 +715 @@
   {
     $this->System->RegisterPage('export', 'PageExport');
+    $this->System->RegisterPage(array('export', 'progress'), 'PageExportProgress');
     $this->System->RegisterMenuItem(array(
       'Title' => 'Exporty',
@@ -723 +724 @@
     ), 2);
   }
+
+  function GetTaskProgress($TaskId)
+  {
+    $Output = '';
+    $DbResult = $this->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` ='.$TaskId.') ORDER BY `Progress` DESC'); // `Export`='.$Export->Id
+    while($Task = $DbResult->fetch_assoc())
+    {
+      $Export = '<a href="'.$this->System->Link('/export/?Action=View&amp;ExportId='.$Task['Export']).'">'.$Task['Export'].'</a>';
+      if ($TaskId == $Task['Export'])
+        $Export = ''.$Export.' (tento)';
+
+      // Show progress bar
+      $Output .= ' <strong>Export '.$Export.': <div id="progress'.$Task['Export'].'">'.
+        ProgressBar(300, $Task['Progress']).'</div></strong>';
+
+      // Show estimated time to complete
+      $PrefixMultiplier = new PrefixMultiplier();
+      $EstimatedTime = (time() - MysqlDateTimeToTime($Task['TimeStart'])) / $Task['Progress'] * (100 - $Task['Progress']);
+      $Output .= 'Zbývající odhadovaný čas: '.$PrefixMultiplier->Add($EstimatedTime, '', 4, 'Time').'<br/>';
+
+      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)'.
+        '</script>';
+    }
+    return($Output);
+  }
 }
-