Show node events related to a job in job overview

Author: vogti

api/v1/cem.php

@@ -158,7 +158,7 @@ public function post() {
                     // Create event
                     $event = new Event(0, "Job terminated", date('Y-m-d H:i:s'),
                         "The job with the ID " . $job->getId() . " has terminated. The following reason has been provided by the CEM bootstrapper: " . $reason,
-                        Define::EVENT_JOB, $job->getId(), null, $node->getId());
+                        Define::EVENT_NODE, $job->getId(), null, $node->getId());
                     Factory::getEventFactory()->save($event);
                 } else if ($job->getStatus() == Define::JOB_STATUS_RUNNING || $job->getStatus() == Define::JOB_STATUS_SCHEDULED
                     || $job->getStatus() == Define::JOB_STATUS_SETUP ) {
@@ -167,12 +167,12 @@ public function post() {
                     // Create event
                     $event = new Event(0, "Job terminated", date('Y-m-d H:i:s'),
                         "The job with the ID " . $job->getId() . " has terminated. Job was not reported as finished, thus setting job state to failed.",
-                        Define::EVENT_JOB, $job->getId(), null, $node->getId());
+                        Define::EVENT_NODE, $job->getId(), null, $node->getId());
                     Factory::getEventFactory()->save($event);
                 } else {
                     $event = new Event(0, "Job finished", date('Y-m-d H:i:s'),
-                        "The job with the ID " . $job->getId() . " has has been completed.",
-                        Define::EVENT_JOB, $job->getId(), null, $node->getId());
+                        "The job with the ID " . $job->getId() . " has been completed.",
+                        Define::EVENT_NODE, $job->getId(), null, $node->getId());
                     Factory::getEventFactory()->save($event);
                 }
                 $node->setCurrentJob(null);

core/util.php

@@ -441,12 +441,15 @@ public static function eventFilter($array, $limit = 20) {
         foreach ($types as $type) {
             $oF1 = new OrderFilter(Event::TIME, "DESC");
             $oF2 = new OrderFilter(Event::EVENT_ID, "DESC LIMIT $limit");
+            $qF2 = new QueryFilter(Event::EVENT_TYPE, $type, "=");
             if ( $type ==  Define::EVENT_NODE ) {
                 $qF1 = new ContainFilter(Event::NODE_ID, $toload[$type]);
+            } else if ( $type ==  Define::EVENT_JOB ) {
+                $qF1 = new ContainFilter(Event::RELATED_ID, $toload[$type]);
+                $qF2 = new ContainFilter(Event::EVENT_TYPE, [Define::EVENT_JOB, Define::EVENT_NODE] );
             } else {
                 $qF1 = new ContainFilter(Event::RELATED_ID, $toload[$type]);
             }
-            $qF2 = new QueryFilter(Event::EVENT_TYPE, $type, "=");
             $events = Factory::getEventFactory()->filter([Factory::ORDER => [$oF1, $oF2], Factory::FILTER => [$qF1, $qF2]]);
             foreach ($events as $event) {
                 $filteredEvents[$event->getId()] = $event;