Time slide affects nodes in cliusters as well (b121fa3f) · Commits · born / ri-visualization

client/js/controllers/vis-general.js

+25 −1

Original line number	Diff line number	Diff line
		@@ -943,6 +943,24 @@ angular
		}
		});
		nodes.update(nodes.get());
		if( $scope.vissettings.addEventYears ){
		angular.forEach($scope.clustering.containedNodes, function(connVal, connKey){
		var matchingEvents = [];
		angular.forEach(connVal.events, function(value, key){
		angular.forEach(value.attributes.date, function(dateArr, keyDate){
		angular.forEach(dateArr, function(valueDate, someKey){
		var date = new Date(valueDate);
		if( date.getTime() >= $scope.yearslider.minValue && date.getTime() <= $scope.yearslider.maxValue ){
		if( matchingEvents.indexOf(value) == -1 ){
		matchingEvents.push(value);
		}
		}
		});
		});
		});
		connVal.events = matchingEvents;
		});
		}
		}

		$scope.setConnectedEvents = function(pers){
		@@ -1152,7 +1170,13 @@ angular
		if( $scope.hidden.groups.indexOf(value2.group) == -1 ){
		var edgeIDsOfSelectedPerson = network.getConnectedEdges(value2.id);
		var edgesOfSelectedPerson = edges.get(edgeIDsOfSelectedPerson);
		var hiddenStatuses = edgesOfSelectedPerson.map(a => a.hidden);
		//var hiddenStatuses = edgesOfSelectedPerson.map(a => a.hidden);
		var hiddenStatuses = edgesOfSelectedPerson.reduce((arr, el) => {
		if( el !== null ){
		arr.push(el.hidden);
		}
		return arr;
		}, []);
		if( hiddenStatuses.indexOf(false) == -1 ){
		value2['hidden'] = true;
		}