add filter options

Author: wurstbrot

data.php

@@ -27,6 +27,42 @@ function readYaml($file) {
     }
 }
 
+if(array_key_exists("performed", $_GET)) {
+    $showPerformed = $_GET['performed'];
+ 
+    if($showPerformed != "true") $showPerformed = false;
+}else {
+    $showPerformed = false;
+}
+
+if(array_key_exists("planned", $_GET)) {
+    $showPlanned = $_GET['planned'];
+
+    if($showPlanned != "true") $showPlanned = false;
+}else {
+    $showPlanned = false;
+}
+$filteredDimensions = array();
+foreach ($dimensions as $dimensionName => $subDimension) {
+    ksort($subDimension);
+    foreach ($subDimension as $subDimensionName => $elements) {
+        $newElements = $elements;
+        ksort($newElements);
+        foreach($newElements as $activityName => $activity) {
+            if(elementIsSelected($activityName) && !$showPerformed) {
+                continue;
+            }
+
+            if(!elementIsSelected($activityName) && !$showPlanned) {
+                continue;
+            } 
+            $filteredDimensions[$dimensionName][$subDimensionName][$activityName] = $activity;
+        }
+        
+    }
+}
+
+
 function getDifficultyOfImplementationWithDependencies($dimensions, $elementImplementation, &$allElements)
 {
     if($elementImplementation == null) {

mappings.php

@@ -21,24 +21,32 @@
 ?>
 
 <form method="get">
-<div class="form-check">
-<input class="form-check-input" type="radio" name="sort" id="exampleRadios1" value="activity" checked>
-  <label class="form-check-label" for="exampleRadios1">
-    Activity
-  </label>
-</div>
-<div class="form-check">
-  <input class="form-check-input" type="radio" name="sort" id="exampleRadios2" value="samm2">
-  <label class="form-check-label" for="exampleRadios2">
-    SAMM 2
-  </label>
-</div>
-<div class="form-check">
-  <input class="form-check-input" type="radio" name="sort" id="exampleRadios3" value="iso27001-2017">
-  <label class="form-check-label" for="exampleRadios3">
-    ISO27001:27001
-  </label>
-</div>
+    <div class="form-check">
+        <input class="form-check-input" type="radio" name="sort" id="exampleRadios1" value="activity" <?php if($_GET['sort'] == "activity") echo "checked"; ?>>
+        <label class="form-check-label" for="exampleRadios1">
+            Activity
+        </label>
+        </div>
+        <div class="form-check">
+        <input class="form-check-input" type="radio" name="sort" id="exampleRadios2" value="samm2" <?php if($_GET['sort'] == "samm2") echo "checked"; ?>>
+        <label class="form-check-label" for="exampleRadios2">
+            SAMM 2
+        </label>
+        </div>
+        <div class="form-check">
+        <input class="form-check-input" type="radio" name="sort" id="exampleRadios3" value="iso27001-2017" <?php if($_GET['sort'] == "iso27001-2017") echo "checked"; ?>>
+        <label class="form-check-label" for="exampleRadios3">
+            ISO27001:27001
+        </label>
+    </div>
+    <div class="form-check">
+        <input type="checkbox" class="form-check-input" name="performed" id="exampleCheck1" value="true" <?php if($showPerformed) {echo " checked=checked";}?>>
+        <label class="form-check-label" for="exampleCheck1">Show performed activities</label>
+  </div>
+  <div class="form-check">
+        <input type="checkbox" class="form-check-input" name="planned" id="exampleCheck2" value="true" <?php if($showPlanned) {echo " checked=checked";} ?>>
+        <label class="form-check-label" for="exampleCheck2">Show planned activities</label>
+  </div>  
   <button type="submit" class="btn btn-primary">Submit</button>
 </form>
 
@@ -58,7 +66,7 @@
     </thead>
     <tbody>
 <?php
-    foreach ($dimensions as $dimension => $subdimensions) {
+    foreach ($filteredDimensions as $dimension => $subdimensions) {
         foreach ($subdimensions as $subdimension => $activity) {
         foreach ($activity as $activityName => $content) {
             echo "<tr>";
@@ -94,7 +102,7 @@
     <tbody>
 <?php    
     $mapping = array();
-    foreach ($dimensions as $dimension => $subdimensions) {
+    foreach ($filteredDimensions as $dimension => $subdimensions) {
         foreach ($subdimensions as $subdimension => $activity) {
             foreach ($activity as $activityName => $content) {
                 $content["dimension"] = $dimension;
@@ -110,7 +118,7 @@
             }
         }
     }
-    ksort($mapping);
+    ksort($mapping, SORT_NUMERIC);
 
     foreach($mapping as $mappingName => $mappingElement) {
         foreach($mappingElement as $activityName => $activity) {

navi.php

@@ -5,7 +5,7 @@
     "index.php" => "Matrix",
     "spiderweb.php" => "Implementation Levels",
     "scutter.php" => "Ease and Value",
-    "mappings.php" => "Mappings",
+    "mappings.php?performed=true&planned=true" => "Mappings",
     "graph.php" => "Dependencies",
     "report.php?performed=true&planned=true" => "Full Report",
     //"usefulnessHardness.php" => "Heatmap",