fix scutter.php

Author: ioggstream

data.php

@@ -11,6 +11,8 @@
 foreach ($dimensions as $dimensionName => $subDimension) {
     ksort($subDimension);
     foreach ($subDimension as $subDimensionName => $elements) {
+        if (substr($subDimensionName, 0, 1) == "_")
+            continue;
         $newElements = $elements;
         ksort($newElements);
         $dimensions[$dimensionName][$subDimensionName] = $newElements;
@@ -36,6 +38,8 @@
 foreach ($dimensions as $dimensionName => $subDimension) {
     ksort($subDimension);
     foreach ($subDimension as $subDimensionName => $elements) {
+        if (substr($subDimensionName, 0, 1) == "_")
+            continue;
         $newElements = $elements;
         ksort($newElements);
         foreach ($newElements as $activityName => $activity) {

functions.php

@@ -18,9 +18,12 @@ function readYaml($file) {
 }
 
 function getActions($dimensions) {
+    ksort($dimensions);
     foreach ($dimensions as $dimension => $subdimensions) {
+        ksort($subdimensions);
+
         foreach ($subdimensions as $subdimension => $element) {
-            if ($subdimension == "_meta")
+            if (substr($subdimension, 0, 1) == "_")
                 continue;
             yield array($dimension, $subdimension, $element);
         }

scutter.php

@@ -8,13 +8,15 @@
 
 <?php
 include_once "data.php";
+include_once "functions.php";
+
+
 function getJson($dimensions)
 {
     $json = array();
     $shapes = array('circle', 'cross', 'triangle-up', 'triangle-down', 'diamond', 'square');
     $shape = 0;
-    foreach ($dimensions as $dimension => $subdimensions) {
-        foreach ($subdimensions as $subdimension => $element) {
+    foreach(getActions($dimensions) as list($dimension, $subdimension, $element)) {
             $values = array();
             foreach ($element as $activityName => $content) {
                 $values[] = array(
@@ -31,7 +33,6 @@ function getJson($dimensions)
                 "values" => $values
             );
             $shape++;
-        }
     }
     return json_encode($json);
 }