Changeset 734

Timestamp:

Jan 8, 2014, 4:43:28 PM (11 years ago)

Author:

maron

Message:

• Added: list of progress task

Location:

trunk

Files:

• Modules/Export/ExportOutput.php (modified) (1 diff)
• Modules/Export/ProcessTask.php (modified) (2 diffs)
• admin/index.php (modified) (1 diff)
• includes/Version.php (modified) (1 diff)
• includes/system.php (modified) (1 diff)

trunk/Modules/Export/ExportOutput.php

@@ -228 +228 @@
     global $System;
     $Output = '';
-    $DbResult = $System->Database->query('SELECT Progress FROM `ExportTask` WHERE `Export`='.$Export->Id);
-    $Task = $DbResult->fetch_assoc();
-
-//      $Output .= '<script type="text/javascript" language="JavaScript" charset="utf-8">'.
-//                               'setTimeout("parent.location.href=\''.$System->Link('/export/?Action=View&Tab=7&Auto&ExportId='.$Export->Id).'\'", 5000)'.
-//                                               '</script>';                                       '.ProgressBar(300, $Task['Progress']).'
-        $Output .= '<script src="http://code.jquery.com/jquery-latest.js"></script>'.
+    $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").load("'.$System->Link('/Modules/Export/Progress.php?ExportId='.$Export->Id).'"); '.
+                  '$("#progress'.$Task['Export'].'").load("'.$System->Link('/Modules/Export/Progress.php?ExportId='.$Task['Export']).'"); '.
                   '}, 1000);'.
                   '});'.
                '</script>';
-    $Output .= ' <strong>Dokončeno procent: <div id="progress">'.ProgressBar(300, $Task['Progress']).'</div></strong>';
-            //   $(\'#load_progress\').load(\''.'?Action=View&Tab=7&Auto&ExportId='.$Export->Id.'\');   
-              // Modules/Export/Progress.php?ExportId=37
-    if ($Task['Progress'] == 0) $Output .= '<br/><br/><strong>Soubor čeká na zpracování ve frontě.</strong><br/>';
-    
+      $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/>';
+    
+    }
     return ($Output);
 }

trunk/Modules/Export/ProcessTask.php

@@ -21 +21 @@
         $System->Database->query('UPDATE `ExportTask` SET `Progress`='.$per.' WHERE `Export`='.$Export->Id);
 }
-function SetOnline() {
-  global $System;
-        $File = new FileStream();
-        $File->CreateFile(dirname(__FILE__).'/../../'.$System->Config['Web']['TempFolder'].'ProcessTask');
-        $File->WriteLine(1);
-}
+
 
 function DeleteOldFiles($deldir)
@@ -102 +97 @@
 while(1)
 {
-  //setonline
-  SetOnline();
   // DBC files
   $DbResult = $System->Database->query('SELECT `ExportTask`.`Export`, `Export`.`Id` AS `ExportId` FROM `ExportTask`'.

trunk/admin/index.php

@@ -14 +14 @@
   $Output = '<h3>Volby pro správu</h3>'; 
   
-  $fileprocesstask = dirname(__FILE__).'/../'.$System->Config['Web']['TempFolder'].'ProcessTask';
-  if (file_exists($fileprocesstask)) {
-    if (filemtime($fileprocesstask) > (time()-1-$System->Config['ExportTaskProcessPeriod'])) {
-       $Output .= 'ProcessTask je online<br />';
-    } else $Output .= '<b>ProcessTask je offline f</b><br />';
-  } else $Output .= '<b>ProcessTask je offline</b><br />';
-
   $Output .= '<br />'.
   '<a href="https://'.$Config['Web']['Host'].'/phpmyadmin/">Správa databáze</a><br/>'.

trunk/includes/Version.php

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

trunk/includes/system.php

@@ -406 +406 @@
                 $Output .= $this->ShowSearchBox();
 
-                if($this->System->User->Licence(LICENCE_ADMIN)) {
-                  $fileprocesstask = dirname(__FILE__).'/../'.$this->Config['Web']['TempFolder'].'ProcessTask';
-      if (file_exists($fileprocesstask)) {
-        if (filemtime($fileprocesstask) > (time()-1-$this->Config['ExportTaskProcessPeriod'])) {
-           $Output .= 'ProcessTask je online<br />';
-        } else $Output .= '<b>ProcessTask je offline</b><br />';
-      } else $Output .= '<b>ProcessTask je offline</b><br />';
-    }
                 $Output .= '</td><td id="border-left"></td><td class="content">';
                 return($Output);