clear tooltip 1

Author: ioggstream

data.php

@@ -8,7 +8,7 @@
 $files = scandir("data");
 $dimensions = readYaml("data/dimensions.yaml");
 
-// reorder in-place $dimensions.
+// reorder in-place $dimensions. This should wrap readYaml(data/dimensions.yaml)
 ksort($dimensions);
 foreach ($dimensions as $dimensionName => $subDimension) {
     ksort($subDimension);
@@ -184,6 +184,9 @@ function render_risk($risk) {
     }
     return $risk;
 }
+/**
+ * Render an activity in a tooltip.
+ */
 function build_table_tooltip($array, $headerWeight = 2)
 {
     $mapKnowLedge = array("Very Low (one discipline)", "Low (one discipline)", "Medium (two disciplines)", "High (two disciplines)", "Very High (three or more disciplines)");
@@ -212,6 +215,7 @@ function build_table_tooltip($array, $headerWeight = 2)
     return $html;
 }
 
+
 function getElementByName($dimensions, $name)
 {
     foreach ($dimensions as $dimensionName => $subDimension) {

functions.php

@@ -46,7 +46,13 @@ function thead($headings){
         .'</th></tr></thead>';
 }
 
-
+function div_tooltip($title, $html_content, $html_tooltip) {
+    $tooltip =  "<div class='popoverdetails'>" .$html_tooltip . "</div>";
+    return "<div data-toggle=\"popover\" 
+        data-title=\"$title\" 
+        data-activity=\".$html_tooltip\" 
+        type=\"button\" data-html=\"true \">" . $html_content . "</div>";
+}
 function renderSamm($samm_reference){
     return "$samm_reference";
 }

mappings.php

@@ -68,59 +68,68 @@ function formCheck($reference_id, $sort) {
 
     echo '<tbody>';
 
-    foreach ($filteredDimensions as $dimension => $subdimensions) {
-        foreach ($subdimensions as $subdimension => $activity) {
-            foreach ($activity as $activityName => $content) {
-                echo "<tr>";
-                echo "<td>$dimension</td>";
-                echo "<td>$subdimension</td>";
-                $tooltip = "<div class='popoverdetails'>" . build_table_tooltip ( $content ) . "</div>";
-                $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>";
-
-                foreach($referenceLabels as $r => $rLabel){
-                    $rlist = $content["references"][$r] ?? array();
-                    echo "<td>". renderSamms($rlist) ."</td>";
-                }
+    foreach(getActions($filteredDimensions) as list($dimension, $subdimension, $activities)) {
+        foreach ($activities as $activityName => $activity) {
+            echo "<tr>";
+            echo "<td>$dimension</td>";
+            echo "<td>$subdimension</td>";
+            $activityLink = "detail.php?". 
+                http_build_query(array(
+                    "dimension" => $dimension,
+                    "subdimension"=> $subdimension,
+                    "element"=> $activityName 
+                ));
+            echo "<td><a href='$activityLink'>"
+                .div_tooltip($activityName, $activityName, build_table_tooltip ( $activity ))
+                ."</a></td>";
+
+            foreach($referenceLabels as $r => $rLabel){
+                $rlist = $activity["references"][$r] ?? array();
+                echo "<td>". renderSamms($rlist) ."</td>";
             }
         }
     }
-} else {
-    echo '<table class="table">';
-    $headings = array_merge(array("$sort"), $headings, array_keys(getReferenceLabels()));
-    thead($headings);
-
-    echo '<tbody>';
-    $mapping = array();
-
-
+} else { // sort by samm2, iso, samm
     // populate mapping:
     // mapping = value, activity, content
-    foreach ($filteredDimensions as $dimension => $subdimensions) {
-        foreach ($subdimensions as $subdimension => $activity) {
-            foreach ($activity as $activityName => $content) {
-                $content["dimension"] = $dimension;
-                $content["subdimension"] = $subdimension;
-
-                $references = $content["references"][$sort] ?? array();
-                foreach(as_list($references) as $mappingContent) {
-                    $mapping[$mappingContent][$activityName] = $content;
-                }
+    $mapping = array();
+    foreach(getActions($filteredDimensions) as list($dimension, $subdimension, $activities)) {
+        foreach ($activities as $activityName => $activity) {
+            $activity["dimension"] = $dimension;
+            $activity["subdimension"] = $subdimension;
+
+            $references = $activity["references"][$sort] ?? array();
+            foreach(as_list($references) as $mappingContent) {
+                $mapping[$mappingContent][$activityName] = $activity;
             }
         }
     }
 
-    // render
+
+    // render table
+    echo '<table class="table">';
+    $headings = array_merge(array("$sort"), $headings, array_keys(getReferenceLabels()));
+    thead($headings);
+
+    echo '<tbody>';
+
+    // render mappings.
     ksort($mapping, SORT_NUMERIC);
     foreach($mapping as $mappingName => $mappingElement) {
         foreach($mappingElement as $activityName => $activity) {
             echo "<tr>";
             echo "<td>" . $mappingName . "</td>";
             echo "<td>" . $activity['dimension'] . "</td>";
             echo "<td>" . $activity['subdimension'] . "</td>";
-            $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>";
+            $activityLink = "detail.php?". 
+                http_build_query(array(
+                    "dimension" => $dimension,
+                    "subdimension"=> $subdimension,
+                    "element"=> $activityName 
+                ));
+            echo "<td><a href='$activityLink'>"
+                .div_tooltip($activityName, $activityName, build_table_tooltip ( $activity ))
+                ."</a></td>";
 
             foreach($referenceLabels as $r => $rLabel){
                 $rlist = $activity["references"][$r] ?? array();