From 877a0522df29826e481c6bece7719c02be6ea320 Mon Sep 17 00:00:00 2001
From: baigner <benedikt.aigner@rwth-aachen.de>
Date: Wed, 15 Aug 2018 17:56:05 +0200
Subject: [PATCH] VISTOMS bug fix: Fixed some small issues with list and tree
view
Former-commit-id: edbfd508c4986e61c1031d78b1371f2c4807493b
---
kadmos/vistoms/templates/VISTOMS.html | 22 ++++++----------------
1 file changed, 6 insertions(+), 16 deletions(-)
diff --git a/kadmos/vistoms/templates/VISTOMS.html b/kadmos/vistoms/templates/VISTOMS.html
index 43a1e33c9..88d6dc2f3 100644
--- a/kadmos/vistoms/templates/VISTOMS.html
+++ b/kadmos/vistoms/templates/VISTOMS.html
@@ -260,15 +260,7 @@
}
//##############################################################
-
-
- function createNewGraph(theData,aNewGraphID)
- {
-
-
- }
-
-
+
function makeKadmosMenu(data, initial=false)
{
//First of all, clear everything if it is already there
@@ -19229,9 +19221,7 @@
if(result){
theVariableData.nominalValue = $('#nominalValue').submit()[0].value;
theVariableData.operator = $('#operator').submit()[0].value;
-
- console.log(parseInt(theVariableData.nominalValue))
-
+
if(theVariableData.operator != "<"
&& theVariableData.operator != "<="
&& theVariableData.operator != "="
@@ -19849,7 +19839,7 @@
inputChildrenitemsList.push({title: 'according to ' + varCategories[j].description,
varCategory: varCategories[j].name,
description: varCategories[j].description,
- onMouseClick: function(elm, data, i) {showIOList(data.varCategory,data.description,elm.__data__,"out")},
+ onMouseClick: function(elm, data, i) {showIOList(data.varCategory,data.description,elm.__data__,"in")},
onMouseOver: function(elm,data,i){}});
outputChildrenitemsList.push({title: 'according to ' + varCategories[j].description,
varCategory: varCategories[j].name,
@@ -20766,7 +20756,6 @@
{
if (contact.attrib.uID == contact_uid)
{
- console.log(currentGraph.organization)
if (typeof currentGraph.organization.organigram=="undefined")
{
currentGraph.organization.organigram = {architects: [], integrators: [], toolSpecialists: []};
@@ -23178,7 +23167,8 @@
if (pipeData)
{
prune_tree(pipeData, treeData);
- }
+ }
+ if (pipeData == ""){treeData = {}}
//build tree layout for vistoms
var newTree = {};
buildTree(newTree, treeData)
@@ -27699,7 +27689,7 @@
}
})
- var title = "List view of all outputs from " + elm.__data_.id + "; Categorization: " + data.description
+ var title = "List view of all outputs from " + elm.__data__.id + "; Categorization: " + data.description
var variables = JSON.parse(JSON.stringify(currentGraph.variableSchemes[data.varCategory]))
prune_tree(pipeData,variables)
variables.forEach(function(variable)
--
GitLab