Selective options - Only type 3 results can choose evaluation plots w…

…ith aggregation functions
Chronos-EaaS · Sep 2, 2024 · 8e38b75 · 8e38b75
1 parent 6949f99
commit 8e38b75
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/core/system.php b/core/system.php
@@ -91,11 +91,7 @@ public function getParameterElements(&$elements) {
     public function getResultPlots($plots) {
         $systemPlots = Util::scanForPlots($this->path . "results");
         foreach ($systemPlots as $plot) {
-            # Only show plots that are for Job and Overall Results
-            if(strpos(gettype($plot), 'For Evaluations') === false) {
-                echo gettype($plot);
-            }
-            #echo gettype($plot);
+            echo gettype($plot);
             $plots[] = $plot;
         }
     }

diff --git a/core/util.php b/core/util.php
@@ -185,7 +185,7 @@ public static function mergeJobs($jobs, $parameter) {
      * @return Plot[]
      * @throws Exception
      */
-    public static function scanForPlots($path) {
+    public static function scanForPlots($path, $type = "") {
         if (!is_dir($path)) {
             return [];
         }
@@ -201,7 +201,14 @@ public static function scanForPlots($path) {
             // TODO: check if override happens
             $plot = new Plot($path . $entry);
             if ($plot->isValid()) {
-                $plots[] = $plot;
+                # Return only evaluation plots
+                if($type == 'eval' && strpos(gettype($plot), 'For Evaluations') != false) {
+                    $plots[] = $plot;
+                }
+                # Return non-evaluation plots
+                if(strpos(gettype($plot), 'For Evaluations') === false) {
+                    $plots[] = $plot;
+                }
             }
         }
         return $plots;