Commit be6cd4f7 authored by Fintan Mc Gee's avatar Fintan Mc Gee

updated node infor controlelr to show detal of all selected nodes, and removed...

updated node infor controlelr to show detal of all selected nodes, and removed posiotning nodes form the data set
parent 6d89e85d
......@@ -179,7 +179,7 @@ angular.module('blizaarModule.controllers')
//check if a valid name has been selected
var nameSearch = binarySearchTextArray($scope.model.inputName,$scope.model.availableNames),
//first label must be the type of the entity we are querying on
otherTargetLabels = [$scope.model.inputType,"audio","collection","comment","create","date","diagram",,"epublication","inquiry","institution","location","map","observation","organization","person","photo","place","positioning","resource","social_group","table","text","type"],
otherTargetLabels = [$scope.model.inputType,"audio","collection","comment","create","date","diagram","epublication","inquiry","institution","location","map","observation","organization","person","photo","place","resource","social_group","table","text","type"],
targetLabels = [],
relationshipTypes = [],
merge = false;
......
......@@ -19,15 +19,27 @@ angular.module('blizaarModule.controllers')
$scope.initNodeInfo = function() {
// get the curretnly Selected node From the application controller;
$scope.model.selectedNodeData = "";
$scope.model.nodeHyperlinkData = "";
$scope.model.nodeHyperlinks = [];
if($scope.getSelectedNodeList) {
$scope.model.selectedNodes = $scope.getSelectedNodeList()
$scope.model.selectedNodes = $scope.getSelectedNodeList();
if( $scope.model.selectedNodes.length > 0){
$scope.model.selectedNode = $scope.model.selectedNodes[0];
$scope.model.selectedNodes.forEach(function(sNode) {
$scope.model.selectedNode = sNode;
$scope.getNodeInfo();
});
}
else {
if($scope.model.selectedNode) {
$scope.getNodeInfo()
}
}
}
if($scope.model.selectedNode) {
$scope.getNodeInfo()
}
};
......@@ -52,9 +64,11 @@ angular.module('blizaarModule.controllers')
}
dataFields.sort();
$scope.model.selectedNodeData = "";
$scope.model.nodeHyperlinkData = "";
$scope.model.nodeHyperlinks = [];
$scope.model.selectedNodeData += "===================\n<b>"
$scope.model.selectedNodeData += $scope.model.selectedNode["BLZ_label"];
$scope.model.selectedNodeData += "</b>\n===================\n"
dataFields.forEach(function(d){
$scope.model.selectedNodeData += d + ": " + multiLayerGraphService.getNodePropertyValue($scope.model.selectedNode["uid"],d,$scope.model.selectedNode["BLZ_layer"]) + "\n\n";
if(typeof($scope.model.selectedNode[d])=== "string") {
......@@ -64,6 +78,7 @@ angular.module('blizaarModule.controllers')
}
}
});
$scope.model.selectedNodeData += "\n\n"
};
$scope.convertIdsToActualNodes = function(idArray) {
......@@ -83,9 +98,12 @@ angular.module('blizaarModule.controllers')
});
$scope.$on('graphDataChanged', function(){
$scope.initNodeInfo();
// createChart();
});
$scope.$on('selectionChanged', function(){
$scope.initNodeInfo();
// createChart();
});
}]);
\ No newline at end of file
......@@ -272,6 +272,7 @@ angular.module('blizaarModule.directives')
var currentLayerIDs=[], neighbourLayerNodes=[], secondNeighbourLayerNodes = [];
if (d3.event.ctrlKey) {
scope.addOrRemoveNodeFromSelection(n, false, true);
} else {
var clickHighlightData = scope.getListHighlightData(n,layer.name,displayLayerNames); ;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment