Revize 4d6d7dea

Filter - rework (refs #7559)

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

@@ -500 +500 @@
 				break;
 		}
 
-		const filterValues = formData.getAll('value').map(value => parseInt(value));
+		let foundNodes = [];
 		nodeFilter.run(app.nodeList).forEach(node => {
+				foundNodes.push(node);
+		});
+
+		const filterValues = formData.getAll('value').map(value => parseInt(value));
+		app.nodeList.filter(node => foundNodes.indexOf(node) === -1).forEach(node => {
 			if(node instanceof Group) {
-				let outEdges = node.outEdgeList;
-				let inEdges = node.inEdgeList;
-				this._hideEdges(outEdges);
-				this._hideEdges(inEdges);
+			let outEdges = node.outEdgeList;
+			let inEdges = node.inEdgeList;
+			this._hideEdges(outEdges);
+			this._hideEdges(inEdges);
+			node._rootElement.style.display = 'none';
+		} else {
+			if(node._group !== null) {
+				if(baseFilter !== 'nodeType' || (filterValues[0] === 1 && operation === "NEQ") || (filterValues[0] === 0 && operation === "EQ")) {
+					node._group._rootElement.style.display = 'none';
+					this._hideEdges(node._group.outEdgeList);
+					this._hideEdges(node._group.inEdgeList);
+				}
 				node._rootElement.style.display = 'none';
 			} else {
-				if(node._group !== null) {
-					if(baseFilter !== 'nodeType' || filterValues[0] !== 1) {
-						node._group._rootElement.style.display = 'none';
-						this._hideEdges(node._group.outEdgeList);
-						this._hideEdges(node._group.inEdgeList);
-					}
-					node._rootElement.style.display = 'none';
-				} else {
-					node._rootElement.style.display = 'none';
-					app.edgeList.forEach(edge => {
-						if(edge.from.id === node.id || edge.to.id === node.id) {
+				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';
-						}
-					});
+					}
+				});
 				}
 			}
 			app.viewportComponent.removeNode(node);
@@ -561 +566 @@
 
 	_hideEdges(edges) {
 		edges.forEach(edge => {
-			edge._rootElement.style.display = 'none';
+				edge._rootElement.style.display = 'none';
 		});
 	}
 

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) < 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;
 
 			case EnumFilterOperation.NEQ:
 				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)
+					|| (node instanceof Group && filterValues.indexOf(NodeTypeFilter.GROUP) < 0);
+			};
 				break;
 
 			default:
@@ -49 +49 @@
 }
 
 NodeTypeFilter.VERTEX = 0;
-NodeTypeFilter.GROUP = 1;
+NodeTypeFilter.GROUP = 1;

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

@@ -17 +17 @@
 	run(nodeList) {
 		// prefilter
 		nodeList = nodeList.filter(node => {
-			return node instanceof Vertex;
+				return node instanceof Vertex;
 		});
 
 		// filter
@@ -34 +34 @@
 		switch (this._operation) {
 			case EnumFilterOperation.EQ:
 				filterFn = vertex => {
-					return filterValues.indexOf(vertex.archetype) < 0;
-				};
+				return filterValues.indexOf(vertex.archetype) > -1;
+			};
 				break;
 
 			case EnumFilterOperation.NEQ:
 				filterFn = vertex => {
-					return filterValues.indexOf(vertex.archetype) > -1;
-				};
+				return filterValues.indexOf(vertex.archetype) < 0;
+			};
 				break;
 
 			default:

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

@@ -1 +1 @@
 class VertexAttributeFilter extends AbstractFilter {
 	/**
 	 * @constructor
-	 * @param {string} additionalFilter 
-	 * @param {string} dataType 
+	 * @param {string} additionalFilter
+	 * @param {string} dataType
 	 * @param {string} operation Filtering operation.
 	 * @param {FormData} formData Raw, unprocessed form content.
 	 */
@@ -23 +23 @@
 		// prefilter
 		nodeList = nodeList.filter(node => {
 			return node instanceof Vertex;
-		}).filter(vertex => {
+	}).filter(vertex => {
 			return vertex.attributes.some(attribute => attribute[0] === this._filterAttributeName);
-		});
+	});
 
 		// filter
 		return nodeList.filter(this._getFilterFunction());
@@ -66 +66 @@
 		let comparatorFn;
 		switch (operation) {
 			case StringFilterOperation.EQ:
-				comparatorFn = (a, b) => a !== b;
+				comparatorFn = (a, b) => a === b;
 				break;
 
 			case StringFilterOperation.NEQ:
-				comparatorFn = (a, b) => a === b;
+				comparatorFn = (a, b) => a !== b;
 				break;
 
 			case StringFilterOperation.CONTAINS:
-				comparatorFn = (a, b) => !(a.includes(b));
+				comparatorFn = (a, b) => a.includes(b);
 				break;
 
 			case StringFilterOperation.STARTS_WITH:
-				comparatorFn = (a, b) => !(a.startsWith(b));
+				comparatorFn = (a, b) => a.startsWith(b);
 				break;
 
 			case StringFilterOperation.ENDS_WITH:
-				comparatorFn = (a, b) => !(a.endsWith(b));
+				comparatorFn = (a, b) => a.endsWith(b);
 				break;
 
 			case StringFilterOperation.REGEXP:
-				comparatorFn = (a, b) => !(a.match(new RegExp(b, 'i')));
+				comparatorFn = (a, b) => a.match(new RegExp(b, 'i'));
 				break;
 
 			default:
@@ -106 +106 @@
 		switch (operation) {
 			case EnumFilterOperation.EQ:
 				filterFn = vertex => {
-					const attribute = vertex.attributes.find(attribute => attribute[0] === filterAttributeName);
-					const attributeValues = attribute[1].split(', ');
-
-					// some (at least one) of the attribute items should be contained in the filters
-					 let count = 0;
-					 attributeValues.forEach(value => {
-						if(filterValues.indexOf(value) > -1) {
-							count++;
-						}
-					 });
-
-					 return count === 0;
-				};
+				const attribute = vertex.attributes.find(attribute => attribute[0] === filterAttributeName);
+				const attributeValues = attribute[1].split(', ');
+
+				// some (at least one) of the attribute items should be contained in the filters
+				return attributeValues.some(attributeValue => {
+					return filterValues.indexOf(attributeValue) > -1;
+			});
+			};
 				break;
 
 			case EnumFilterOperation.NEQ:
 				filterFn = vertex => {
-					const attribute = vertex.attributes.find(attribute => attribute[0] === filterAttributeName);
-					const attributeValues = attribute[1].split(', ');
-
-					// every of the attribute items should not be contained in the filters (translated: none of the items should be contained in the filters)
-					let count = 0;
-					attributeValues.forEach(value => {
-						if(filterValues.indexOf(value) > -1) {
-						count++;
-					}
-					});
-
-					return count > 0;
-				};
+				const attribute = vertex.attributes.find(attribute => attribute[0] === filterAttributeName);
+				const attributeValues = attribute[1].split(', ');
+
+				// every of the attribute items should not be contained in the filters (translated: none of the items should be contained in the filters)
+				return attributeValues.every(attributeValue => {
+					return filterValues.indexOf(attributeValue) < 0;
+			});
+			};
 				break;
 
 			default:
@@ -154 +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 {
@@ -163 +152 @@
 
 			let comparatorFn;
 			switch (operation) {
-				case DateFilterOperation.NEQ:
+				case DateFilterOperation.EQ:
 					comparatorFn = (a, b) => a.getFullYear() === b.getFullYear() && a.getMonth() === b.getMonth() && a.getDate() === b.getDate();
 					break;
 
-				case DateFilterOperation.EQ:
+				case DateFilterOperation.NEQ:
 					comparatorFn = (a, b) => a.getFullYear() !== b.getFullYear() || a.getMonth() !== b.getMonth() || a.getDate() !== b.getDate();
 					break;
 
@@ -194 +183 @@
 			filterFn = vertex => {
 				const attribute = vertex.attributes.find(attribute => attribute[0] === filterAttributeName);
 				const attributeValue = parseFloat(attribute[1]);
-				return (attributeValue < filterValueFrom) || (attributeValue > filterValueTo);
+				return (attributeValue >= filterValueFrom) && (attributeValue <= filterValueTo);
 			};
 
 		} else {