Skip to content

Adjustable report & Beautify on behalf of SDA SE #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wurstbrot merged 1 commit into from
Sep 9, 2020
Merged

Adjustable report & Beautify on behalf of SDA SE #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions bib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ function readCSV($filename, $delimiter)
return $data;
}

function elementIsSelected($elementName)
function elementIsSelected($activityName)
{
foreach (getCsv() as $element) {
if ($elementName == $element["element"]) {
if ($activityName == $element["element"]) {
return true;
}
}
Expand Down
4 changes: 2 additions & 2 deletions data-yml.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@ function getElementByName($dimensions, $name)
{
foreach ($dimensions as $dimensionName => $subDimension) {
foreach ($subDimension as $subDimensionName => $elements) {
foreach ($elements as $elementName => $element) {
if ($elementName == $name) {
foreach ($elements as $activityName => $element) {
if ($activityName == $name) {
return $element;
}
}
Expand Down
4 changes: 2 additions & 2 deletions data.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@ function getElementByName($dimensions, $name)
{
foreach ($dimensions as $dimensionName => $subDimension) {
foreach ($subDimension as $subDimensionName => $elements) {
foreach ($elements as $elementName => $element) {
if ($elementName == $name) {
foreach ($elements as $activityName => $element) {
if ($activityName == $name) {
return $element;
}
}
Expand Down
12 changes: 6 additions & 6 deletions detail.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@

$dimension = $_GET['dimension'];
$subdimension = $_GET['subdimension'];
$elementName = $_GET['element'];
$activityName = $_GET['element'];

function printDetail($dimension, $subdimension, $elementName, $dimensions, $report = false)
function printDetail($dimension, $subdimension, $activityName, $dimensions, $report = false)
{
$element = $dimensions[$dimension][$subdimension][$elementName];
$element = $dimensions[$dimension][$subdimension][$activityName];

if ($element == null) { //Whitelist approach for security reasons (deny XSS)
//echo "Sorry, we could not found the element";
Expand All @@ -34,9 +34,9 @@ function printDetail($dimension, $subdimension, $elementName, $dimensions, $repo

$pageH1 .= " -> $subdimension";
}
$pageH1 .= ": $elementName";
$pageH1 .= ": $activityName";
} else {
$pageH1 .= "$elementName";
$pageH1 .= "$activityName";
}

echo "<h$headerWeight>$pageH1</h$headerWeight>";
Expand Down Expand Up @@ -101,4 +101,4 @@ function printDetail($dimension, $subdimension, $elementName, $dimensions, $repo
}
}

printDetail($dimension, $subdimension, $elementName, $dimensions);
printDetail($dimension, $subdimension, $activityName, $dimensions);
12 changes: 6 additions & 6 deletions graph.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
include_once "data.php";
function hasElementChildren($element) {
$hasContent = false;
foreach ($element as $elementName => $content) {
foreach ($element as $activityName => $content) {
if (!array_key_exists("dependsOn", $content)) {
continue;
}
Expand Down Expand Up @@ -62,9 +62,9 @@ function hasElementChildren($element) {
}
</style>
<?php
function getSourceAndParent($elementName, $subdimension, $parent = "")
function getSourceAndParent($activityName, $subdimension, $parent = "")
{
return "{source: \"$elementName\", target: \"$parent\", type: \"" . base64_encode($subdimension) . "\"}";
return "{source: \"$activityName\", target: \"$parent\", type: \"" . base64_encode($subdimension) . "\"}";
}


Expand All @@ -83,7 +83,7 @@ function getSourceAndParent($elementName, $subdimension, $parent = "")
$first = true;

//if($subdimension != "Erzeugung") continue;
foreach ($element as $elementName => $content) {
foreach ($element as $activityName => $content) {
if (!array_key_exists("dependsOn", $content)) {
continue;
}
Expand All @@ -98,14 +98,14 @@ function getSourceAndParent($elementName, $subdimension, $parent = "")
echo ",";
}
$first = false;
echo getSourceAndParent($elementName, $subdimension, $dependsOn);
echo getSourceAndParent($activityName, $subdimension, $dependsOn);
}
} else {
if (!$first) {
echo ",";
}
$first = false;
echo getSourceAndParent($elementName, $subdimension, $parent);
echo getSourceAndParent($activityName, $subdimension, $parent);
}

}
Expand Down
14 changes: 7 additions & 7 deletions head.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,12 +121,12 @@ function getTable($dimensions) {

for($i = 1; $i <= NUMBER_LEVELS; $i ++) {
$tableContent .= "<td><ul>";
foreach ( $element as $elementName => $content ) {
$content = getContentForLevelFromSubdimensions ( $i, $content, $elementName );
foreach ( $element as $activityName => $content ) {
$content = getContentForLevelFromSubdimensions ( $i, $content, $activityName );
if ($content != "") {
$elementLink = "detail.php?dimension=" . urlencode ( $dimension ) . "&subdimension=" . urlencode ( $subdimension ) . "&element=" . urlencode ( $elementName );
$tableContent .= "<a href='$elementLink' data-dimension='$dimension' data-subdimension='$subdimension' data-element='$elementName'";
if (elementIsSelected ( $elementName )) {
$elementLink = "detail.php?dimension=" . urlencode ( $dimension ) . "&subdimension=" . urlencode ( $subdimension ) . "&element=" . urlencode ( $activityName );
$tableContent .= "<a href='$elementLink' data-dimension='$dimension' data-subdimension='$subdimension' data-element='$activityName'";
if (elementIsSelected ( $activityName )) {
$tableContent .= "class='selected'";
}
$tableContent .= "><li>" . $content . "</li></a>";
Expand All @@ -143,11 +143,11 @@ function getTable($dimensions) {
$table .= "</table>";
return $table;
}
function getContentForLevelFromSubdimensions($level, $subdimension, $elementName) {
function getContentForLevelFromSubdimensions($level, $subdimension, $activityName) {
if ($level != $subdimension ["level"]) {
return "";
}
$tooltip = "<div class='popoverdetails'>" . build_table_tooltip ( $subdimension ) . "</div>";
return "<div data-toggle=\"popover\" data-title=\"$elementName\" data-content=\"$tooltip\" type=\"button\" data-html=\"true \">" . $elementName . "</div>";
return "<div data-toggle=\"popover\" data-title=\"$activityName\" data-content=\"$tooltip\" type=\"button\" data-html=\"true \">" . $activityName . "</div>";
}

14 changes: 7 additions & 7 deletions mappings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
?>
<table class="table">
<thead>
<tr>
<th scope="col">Dimension</th>
<th scope="col">Subdimension</th>
<th scope="col">Actvity</th>
<th scope="col">SAMM 2</th>
<th scope="col">ISO 27001</th>
</tr>
<tr>
<th scope="col">Dimension</th>
<th scope="col">Subdimension</th>
<th scope="col">Actvity</th>
<th scope="col">SAMM 2</th>
<th scope="col">ISO 27001</th>
</tr>
</thead>
<tbody>
<?php
Expand Down
22 changes: 11 additions & 11 deletions report-samm.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
echo "<h3 style='color:green;'>With SAMM2 Mapping</h3>";
for ($i = 1; $i <= 4; $i++) {
$tableContent .= "<td><ul>";
foreach ($element as $elementName => $content) {
foreach ($element as $activityName => $content) {
if(array_key_exists("samm2", $content) && !preg_match("/TODO/i", $content["samm2"])) {
$content2 = getContentForLevelFromSubdimensions($i, $content, $elementName);
$content2 = getContentForLevelFromSubdimensions($i, $content, $activityName);

if ($content2 != "") {
printDetail($dimension, $subdimension, $elementName, $dimensions, true);
$mappingExists[$subdimension][$content["samm2"]][$elementName] = $content;
printDetail($dimension, $subdimension, $activityName, $dimensions, true);
$mappingExists[$subdimension][$content["samm2"]][$activityName] = $content;
}
}
}
Expand All @@ -36,14 +36,14 @@
echo "<h3 style='color:red;'>Without SAMM2 Mapping</h3>";
for ($i = 1; $i <= 4; $i++) {
$tableContent .= "<td><ul>";
foreach ($element as $elementName => $content) {
foreach ($element as $activityName => $content) {
if(!array_key_exists("samm2", $content) || preg_match("/TODO/i", $content["samm2"])) {
$content2 = getContentForLevelFromSubdimensions($i, $content, $elementName);
$content2 = getContentForLevelFromSubdimensions($i, $content, $activityName);

if ($content2 != "") {
printDetail($dimension, $subdimension, $elementName, $dimensions, true);
$content["name"] = $elementName;
$noMappingExists[$subdimension][$content["samm2"]][$elementName] = $content;
printDetail($dimension, $subdimension, $activityName, $dimensions, true);
$content["name"] = $activityName;
$noMappingExists[$subdimension][$content["samm2"]][$activityName] = $content;
}
}
}
Expand All @@ -56,8 +56,8 @@
foreach($category as $category => $content) {
//var_dump($content);exit;
echo $category . " ".count($content) . " ";
foreach($content as $elementName => $content2){
echo "$elementName" . " /"; }
foreach($content as $activityName => $content2){
echo "$activityName" . " /"; }
echo "<br>";
}
}
Expand Down
46 changes: 42 additions & 4 deletions report.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,62 @@
<body>
<?php
include_once "navi.php";

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;
}

?>

<form method="get">
<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>

<?php
include_once "data.php";
include_once "detail.php";



foreach ($dimensions as $dimension => $subdimensions) {
echo "<h1>Dimension $dimension</h1>";
foreach ($subdimensions as $subdimension => $element) {
foreach ($subdimensions as $subdimension => $activity) {
echo "<h2>Sub-Dimension $subdimension</h2>";

for ($i = 1; $i <= 4; $i++) {
$tableContent .= "<td><ul>";
foreach ($element as $elementName => $content) {
$content = getContentForLevelFromSubdimensions($i, $content, $elementName);
foreach ($activity as $activityName => $content) {
if(elementIsSelected($activityName) && !$showPerformed) {
continue;
}

if(!elementIsSelected($activityName) && !$showPlanned) {
continue;
}
$content = getContentForLevelFromSubdimensions($i, $content, $activityName);

if ($content != "") {
printDetail($dimension, $subdimension, $elementName, $dimensions, true);
printDetail($dimension, $subdimension, $activityName, $dimensions, true);
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions scutter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ function getJson($dimensions)
foreach ($dimensions as $dimension => $subdimensions) {
foreach ($subdimensions as $subdimension => $element) {
$values = array();
foreach ($element as $elementName => $content) {
foreach ($element as $activityName => $content) {
$values[] = array(
"series" => 0,
"shape" => $shapes[$shape],
"size" => 3000,
"x" => getDifficultyOfImplementation($dimensions, $content),
"y" => $content["usefulness"],
"key" => $elementName
"key" => $activityName
);
}
$json[] = array(
Expand Down
12 changes: 6 additions & 6 deletions spiderwebData.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ function getSpiderWebData($dimensions)
$data[$level][$dimension][$subdimension]['count'] = 0;
$data[$level][$dimension][$subdimension]['selected'] = 0;
}
foreach ($element as $elementName => $content) {
foreach ($element as $activityName => $content) {
if ($level == $content["level"]) {
$data[$level][$dimension][$subdimension]['count']++;
if (elementIsSelected($elementName)) {
if (elementIsSelected($activityName)) {
$data[$level][$dimension][$subdimension]['selected']++;
}
}
Expand Down Expand Up @@ -75,11 +75,11 @@ function fwritecsv2($filePointer, $dataArray, $delimiter = ",", $enclosure = "\"

//var_dump( getSpiderWebData($dimensions));exit;

function deleteElement(&$data, $elementName)
function deleteElement(&$data, $activityName)
{
$count = 0;
foreach ($data as $element) {
if ($elementName == $element["element"]) {
if ($activityName == $element["element"]) {
unset($data[$count]);
}
$count++;
Expand All @@ -90,8 +90,8 @@ function isElementExisting($dimensions, $givenElementName)
{
foreach ($dimensions as $dimension => $subdimensions) {
foreach ($subdimensions as $subdimension => $element) {
foreach ($element as $elementName => $content) {
if ($elementName == $givenElementName) {
foreach ($element as $activityName => $content) {
if ($activityName == $givenElementName) {
return true;
}
}
Expand Down
2 changes: 1 addition & 1 deletion usefulnessHardness.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ function printDimensionUsefull($dimensions, $colors)
$all[$subdimension][$i]['usefulness'] = array();
$all[$subdimension][$i]['difficultyOfImplementation'] = array();
}
foreach ($element as $elementName => $elementImplementation) {
foreach ($element as $activityName => $elementImplementation) {
if ($elementImplementation['level'] != $i) continue;
$all[$subdimension][$i]['usefulness'][] = $elementImplementation['usefulness'];

Expand Down