Changeset 59

Timestamp:

Aug 4, 2009, 7:47:36 PM (15 years ago)

Author:

george

Message:

• Přidáno: Zobrazení standarního a chybového výstupu úloh.

Location:

trunk/www

Files:

• index.php (modified) (1 diff)
• model/realm.php (modified) (1 diff)
• view/task.php (modified) (3 diffs)

trunk/www/index.php

@@ -201 +201 @@
         $TaskView = new TaskView($this->Database, $this->System);
         $Output .= $TaskView->ItemList();
+      } else      
+      if($_GET['Action'] == 'TaskShowErrorLog')
+      {
+        $TaskView = new TaskView($this->Database, $this->System);
+        $Output .= $TaskView->ErrorLog();
+      } else      
+      if($_GET['Action'] == 'TaskShowStandardLog')
+      {
+        $TaskView = new TaskView($this->Database, $this->System);
+        $Output .= $TaskView->StandardLog();
       } else      
       if($_GET['Action'] == 'Update')

trunk/www/model/realm.php

@@ -85 +85 @@
     }
     // Lookup nearest database with full import
-    $DbResult = $this->Database->query('SELECT * FROM `Database` WHERE (`Emulator` <> 0) AND (`Revision` <= '.$this->Realm['Database']['Revision'].') AND (`SourceFileName` <> "") ORDER BY `Revision` DESC');
+    $DbResult = $this->Database->query('SELECT * FROM `Database` WHERE (`Emulator` <> 0) AND (`Revision` <= '.$this->Data['Database']['Revision'].') AND (`SourceFileName` <> "") ORDER BY `Revision` DESC');
     $Database = $DbResult->fetch_assoc();
     

trunk/www/view/task.php

@@ -10 +10 @@
     'Items' => array(
       'TimeCreate' => array('Type' => 'DateTime', 'Caption' => 'Čas vytvoření', 'Default' => ''),
-      'Title' => array('Type' => 'String', 'Caption' => 'Akce', 'Default' => ''),
+      'Title' => array('Type' => 'String', 'Caption' => 'Operace', 'Default' => ''),
       'State' => array('Type' => 'TaskState', 'Caption' => 'Stav', 'Default' => ''),
       'Duration' => array('Type' => 'String', 'Caption' => 'Trvání', 'Default' => ''),
@@ -31 +31 @@
       $Table = new Table($this->ItemListFormClass);
       $Table->OnRow = array($this, 'ShowListOnRow');
-      $Table->Definition['Table'] = '(SELECT (COALESCE(UNIX_TIMESTAMP(TimeEnd), UNIX_TIMESTAMP(NOW())) - UNIX_TIMESTAMP(TimeStart)) AS Duration, TimeCreate, Title, State FROM Task WHERE User='.$this->System->Modules['User']->User['Id'].' ORDER BY Id DESC)';
+      $Table->Definition['Table'] = '(SELECT Id, (COALESCE(UNIX_TIMESTAMP(TimeEnd), UNIX_TIMESTAMP(NOW())) - UNIX_TIMESTAMP(TimeStart)) AS Duration, TimeCreate, Title, State FROM Task WHERE User='.$this->System->Modules['User']->User['Id'].' ORDER BY Id DESC)';
+      $Table->Definition['Items']['Id'] = array('Type' => 'Hidden', 'Caption' => '', 'Default' => '');
       $Table->LoadValuesFromDatabase($this->Database);
+      $Table->Definition['Items']['Actions'] = array('Type' => 'String', 'Caption' => '', 'Default' => '');
+      foreach($Table->Values as $Index => $Item)
+      {
+        $Table->Values[$Index]['Actions'] = '<a href="?Action=TaskShowErrorLog&amp;Id='.$Item['Id'].'">Výpis chyb</a> <a href="?Action=TaskShowStandardLog&amp;Id='.$Item['Id'].'">Výpis výstupu</a> ';
+        unset($Table->Values[$Index]['Id']);
+      }
       $Output .= $Table->Show();
       $Output .= '<br /><div style="text-align: center;"><a href="?Action=TaskList">Obnovit pohled</a></dev>';      
@@ -38 +45 @@
     return($Output);
   } 
+  
+  function ErrorLog()
+  {
+    $DbResult = $this->Database->select('Task', 'Title, Error', 'Id='.$_GET['Id']);
+    $DbRow = $DbResult->fetch_assoc();
+    $Output = '<h4>Chybový výpis úlohy: '.$DbRow['Title'].'</h4>';
+    $Output .= '<pre>'.$DbRow['Error'].'</pre>';
+    return($Output);
+  }
+
+  function StandardLog()
+  {
+    $DbResult = $this->Database->select('Task', 'Title, Output', 'Id='.$_GET['Id']);
+    $DbRow = $DbResult->fetch_assoc();
+    $Output = '<h4>Výpis výstupu úlohy: '.$DbRow['Title'].'</h4>';
+    $Output .= '<pre>'.$DbRow['Output'].'</pre>';
+    return($Output);
+  }
 }