Fix rendering issues. Separate data access from rendering.

Author: ioggstream

assets/css/common.css

@@ -2,3 +2,7 @@
 html {
   overflow-y: scroll;
 }
+
+.form-radio {
+  display: inline-block;
+}

data.php

@@ -1,39 +1,46 @@
 <?php
 require_once("functions.php");
 
-$dimensions = array();
+$showPerformed = ($_GET['performed'] ?? false) == "true" ? "true" : false;
+$showPlanned = ($_GET['planned'] ?? false) == "true" ? "true" : false;
 
+$dimensions = array();
 $files = scandir("data");
-
 $dimensions = readYaml("data/dimensions.yaml");
 
+// reorder in-place $dimensions.
 ksort($dimensions);
 foreach ($dimensions as $dimensionName => $subDimension) {
     ksort($subDimension);
     foreach ($subDimension as $subDimensionName => $elements) {
+
+        // Q: should I retain this?
         if (substr($subDimensionName, 0, 1) == "_")
             continue;
+
+        // Upgrade old configuration to `references:`
+        //   this code can be modified to other models.
+        foreach ($elements as $activityName => $content) {
+            
+            if ($content["references"] ?? null) // ignore new lines
+                continue;
+
+            $content["references"]["samm2"] = $content["samm2"] ?? array();
+            unset($content["samm2"]);
+            $content["references"]["iso27001-2017"] = $content["iso27001-2017"] ?? array();
+            unset($content["iso27001-2017"]);
+            //echo var_dump($elements[$activityName]);
+            //echo "<hr>";
+            $elements[$activityName] = $content;
+            
+        }
         $newElements = $elements;
         ksort($newElements);
         $dimensions[$dimensionName][$subDimensionName] = $newElements;
     }
 }
 
-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);
@@ -208,10 +215,10 @@ function build_table_tooltip($array, $headerWeight = 2)
 function getElementByName($dimensions, $name)
 {
     foreach ($dimensions as $dimensionName => $subDimension) {
-        foreach ($subDimension as $subDimensionName => $elements) {
-            foreach ($elements as $activityName => $element) {
+        foreach ($subDimension as $subDimensionName => $activities) {
+            foreach ($activities as $activityName => $content) {
                 if ($activityName == $name) {
-                    return $element;
+                    return $content;
                 }
             }
         }

functions.php

@@ -40,6 +40,12 @@ function getReferenceLabel($reference_id) {
     return $referenceLabels[$reference_id]["label"] ?? $reference_id;
 }
 
+function thead($headings){
+    echo '<thead><tr><th scope="col">'
+        .implode('</th><th scope="col">', $headings)
+        .'</th></tr></thead>';
+}
+
 
 function renderSamm($samm_reference){
     return "$samm_reference";

mappings.php

@@ -5,8 +5,9 @@
 <?php
 include_once "navi.php";
 ?>
+
 <?php
-include_once "data.php";
+include_once "data.php";  // set showPlanned, showPerformed, filteredDimensions
 include_once "detail.php";
 include_once "functions.php";
 
@@ -22,7 +23,7 @@ function formCheck($reference_id, $sort) {
         $checked = ($sort == $reference_id) ? "checked": "";
         $reference_label = getReferenceLabel($reference_id);
         return '
-        <div class="form-check">
+        <div class="form-radio">
         <input class="form-check-input" type="radio" name="sort"
             id="radio'.$reference_id.'" 
             value="'.$reference_id.'"
@@ -31,25 +32,19 @@ function formCheck($reference_id, $sort) {
         </div>
         ';
 }
-function thead($headings){
-    echo '<thead><tr><th scope="col">'
-        .implode('</th><th scope="col">', $headings)
-        .'</th></tr></thead>';
-}
-
 
 ?>
 <form method="get">
-    <?php
-
-    // Print form headers
-    echo formCheck("activity", $sort);
-    foreach ($referenceLabels as $r => $metadata) {
-        echo formCheck($r, $sort);
-    }
-    ?>
-
-    </div>
+    <div class="sort-by">
+        Sort by:
+        <?php
+        // Print form headers
+        echo formCheck("activity", $sort);
+        foreach ($referenceLabels as $r => $metadata) {
+            echo formCheck($r, $sort);
+        }
+        ?>
+    </div>  
     <div class="form-check">
         <input type="checkbox" class="form-check-input" name="performed" id="exampleCheck1" value="true"
          <?php if($showPerformed) {echo " checked=checked";}?>>
@@ -83,12 +78,6 @@ function thead($headings){
                 $activityLink = "detail.php?dimension=" . urlencode ( $dimension ) . "&subdimension=" . urlencode ( $subdimension ) . "&element=" . urlencode ( $activityName );
                 echo "<td><a href='$activityLink'><div data-toggle=\"popover\" data-title=\"$activityName\" data-content=\"$tooltip\" type=\"button\" data-html=\"true \">" . $activityName . "</div></a></td>";
 
-                // uniform old content.                
-                if (!($content["references"] ?? NULL)){
-                    $content["references"]["samm2"] = $content["samm2"] ?? array();
-                    $content["references"]["iso27001-2017"] = $content["iso27001-2017"] ?? array();
-                }
-
                 foreach($referenceLabels as $r => $rLabel){
                     $rlist = $content["references"][$r] ?? array();
                     echo "<td>". renderSamms($rlist) ."</td>";
@@ -113,21 +102,8 @@ function thead($headings){
                 $content["dimension"] = $dimension;
                 $content["subdimension"] = $subdimension;
 
-                if (! ($content["references"] ?? null)) {
-                    // default.
-                    if (!($content[$sort] ?? null)){
-                        error_log("No $sort mapping for $activityName");
-                        continue;
-                    }
-
-                    foreach(as_list($content[$sort]) as $mappingContent) {
-                        $mapping[$mappingContent][$activityName] = $content;
-                    }
-                    continue;
-                }
-
-                foreach($content["references"] as $mappingContent => $rlist) {
-                    echo var_dump("$mappingContent");
+                $references = $content["references"][$sort] ?? array();
+                foreach(as_list($references) as $mappingContent) {
                     $mapping[$mappingContent][$activityName] = $content;
                 }
             }
@@ -145,12 +121,6 @@ function thead($headings){
             $tooltip = "<div class='popoverdetails'>" . build_table_tooltip ( $activity ) . "</div>";
             $activityLink = "detail.php?dimension=" . urlencode ( $activity['dimension'] ) . "&subdimension=" . urlencode ( $activity['subdimension'] ) . "&element=" . urlencode ( $activityName );
             echo "<td><a href='$activityLink'><div data-toggle=\"popover\" data-title=\"$activityName\" data-content=\"$tooltip\" type=\"button\" data-html=\"true \">" . $activityName . "</div></></td>";
-            
-                            // uniform old content.                
-            if (!($activity["references"] ?? NULL)){
-                $activity["references"]["samm2"] = $activity["samm2"] ?? array();
-                $activity["references"]["iso27001-2017"] = $activity["iso27001-2017"] ?? array();
-            }
 
             foreach($referenceLabels as $r => $rLabel){
                 $rlist = $activity["references"][$r] ?? array();