Revize d2def281

Improved filtering (hide filtered nodes) (refs #7519)

sources/imiger-core/src/main/webapp/js/components/filterModalWindow.js

@@ -233 +233 @@
 				"dateSlider.noUiSlider.on('update', function (values, handle) {" +
 				"	var date = new Date(+values[handle]);" +
 				"   dateValues[handle].innerHTML = date.toLocaleDateString('cs-CZ');" +
+				"});" +
+				"var filterValues = [" +
+				"    document.getElementById('value-from')," +
+				"    document.getElementById('value-to')" +
+				"];" +
+				"dateSlider.noUiSlider.on('update', function (values, handle) {" +
+				"	var date = new Date(+values[handle]);" +
+				"   filterValues[handle].value = date;" +
 				"});")
 		]);
 
@@ -395 +403 @@
 	_onFilterFormReset() {
 		this._onBaseFilterChange('nodeType');
 
-		app.nodeList.forEach(node => {
-			node.isFound = false;
-		});
+		let nodeList = app.nodeList;
+		let edgeList = app.edgeList;
+		nodeList.filter(node => node._rootElement.style.display === 'none').forEach(node => node._rootElement.style.display = '');
+		edgeList.filter(edge => edge._rootElement.style.display === 'none').forEach(edge => edge._rootElement.style.display = '');
 	}
 
 	_displayFilter(formData) {
@@ -474 +483 @@
 		}
 
 		nodeFilter.run(app.nodeList).forEach(node => {
-			node.isFound = true;
+			//node.isFound = true;
+			node._rootElement.style.display = 'none';
+			app.edgeList.forEach(edge => {
+				if(edge.from.id === node.id || edge.to.id === node.id) {
+					edge._rootElement.style.display = 'none';
+				}
+			});
 		});
 	}
 
@@ -507 +522 @@
 					"dateSlider.noUiSlider.on('update', function (values, handle) {" +
 					"	var date = new Date(+values[handle]);" +
 					"   dateValues[handle].innerHTML = date.toLocaleDateString('cs-CZ');" +
+					"});" +
+					"var filterValues = [" +
+					"    document.getElementById('value-from')," +
+					"    document.getElementById('value-to')" +
+					"];" +
+					"dateSlider.noUiSlider.on('update', function (values, handle) {" +
+					"	var date = new Date(+values[handle]);" +
+					"   filterValues[handle].value = date;" +
 					"});")
 			]);
 		}

sources/imiger-core/src/main/webapp/js/components/navbar.js

@@ -187 +187 @@
 
 		function resetSearch() {
 			let nodeList = app.nodeList;
-			nodeList.filter(node => node.isFound === true).forEach(node => node.isFound = false);
+			let edgeList = app.edgeList;
+			nodeList.filter(node => node._rootElement.style.display === 'none').forEach(node => node._rootElement.style.display = '');
+			edgeList.filter(edge => edge._rootElement.style.display === 'none').forEach(edge => edge._rootElement.style.display = '');
 
 			searchInput.value = '';
 			searchCounter.innerText = 0;

sources/imiger-core/src/main/webapp/js/services/filters/NodeTypeFilter.js

@@ -28 +28 @@
 		switch (this._operation) {
 			case EnumFilterOperation.EQ:
 				filterFn = node => {
-					return (node instanceof Vertex && filterValues.indexOf(NodeTypeFilter.VERTEX) > -1)
-						|| (node instanceof Group && filterValues.indexOf(NodeTypeFilter.GROUP) > -1);
+					return (node instanceof Vertex && filterValues.indexOf(NodeTypeFilter.VERTEX) < 0) //> -1
+						|| (node instanceof Group && filterValues.indexOf(NodeTypeFilter.GROUP) < 0); //> -1
 				};
 				break;
 
 			case EnumFilterOperation.NEQ:
 				filterFn = node => {
-					return (node instanceof Vertex && filterValues.indexOf(NodeTypeFilter.VERTEX) < 0)
-						|| (node instanceof Group && filterValues.indexOf(NodeTypeFilter.GROUP) < 0);
+					return (node instanceof Vertex && filterValues.indexOf(NodeTypeFilter.VERTEX) > -1)
+						|| (node instanceof Group && filterValues.indexOf(NodeTypeFilter.GROUP) > -1);
 				};
 				break;
 

sources/imiger-core/src/main/webapp/js/services/filters/VertexArchetypeFilter.js

@@ -34 +34 @@
 		switch (this._operation) {
 			case EnumFilterOperation.EQ:
 				filterFn = vertex => {
-					return filterValues.indexOf(vertex.archetype) > -1;
+					return filterValues.indexOf(vertex.archetype) < 0; //> -1
 				};
 				break;
 
 			case EnumFilterOperation.NEQ:
 				filterFn = vertex => {
-					return filterValues.indexOf(vertex.archetype) < 0;
+					return filterValues.indexOf(vertex.archetype) > -1; //< 0
 				};
 				break;
 

sources/imiger-core/src/main/webapp/js/services/filters/VertexAttributeFilter.js

@@ -144 +144 @@
 			filterFn = vertex => {
 				const attribute = vertex.attributes.find(attribute => attribute[0] === filterAttributeName);
 				const attributeValue = parseInt(attribute[1]);
-				return (attributeValue >= filterValueFrom) && (attributeValue <= filterValueTo);
+
+				return (attributeValue < filterValueFrom) || (attributeValue > filterValueTo);
 			};
 
 		} else {