$class
+ * @param string $property
+ * @param string|null $identifier
+ * @param null $value
+ * @param string $operator
+ */
+ public function __construct(?NodesListBuilder $nodesListBuilder, string $class, string $property, string $identifier = null, $value = null, string $operator = '')
+ {
+ $this->nodesListBuilder = $nodesListBuilder;
+ $this->class = $class;
+
+ if ($nodesListBuilder === null && $this->isStructural()) {
+ throw new \InvalidArgumentException('NodesListBuilder must be provided for structural entities');
+ }
+
+ parent::__construct($property, $identifier);
+ $this->value = $value;
+ $this->operator = $operator;
+ }
+
+ public function getClass(): string
+ {
+ return $this->class;
+ }
+
+ /**
+ * @return string|null
+ */
+ public function getOperator(): ?string
+ {
+ return $this->operator;
+ }
+
+ /**
+ * @param string|null $operator
+ */
+ public function setOperator(?string $operator): self
+ {
+ $this->operator = $operator;
+ return $this;
+ }
+
+ /**
+ * @return T|null
+ */
+ public function getValue(): ?AbstractDBElement
+ {
+ return $this->value;
+ }
+
+ /**
+ * @param T|null $value
+ */
+ public function setValue(?AbstractDBElement $value): void
+ {
+ if (!$value instanceof $this->class) {
+ throw new \InvalidArgumentException('The value must be an instance of ' . $this->class);
+ }
+
+ $this->value = $value;
+ }
+
+ /**
+ * Checks whether the constraints apply to a structural type or not
+ * @return bool
+ */
+ public function isStructural(): bool
+ {
+ return is_subclass_of($this->class, AbstractStructuralDBElement::class);
+ }
+
+ /**
+ * Returns a list of operators which are allowed with the given class.
+ * @return string[]
+ */
+ public function getAllowedOperatorValues(): array
+ {
+ //Base operators are allowed for everything
+ $tmp = self::ALLOWED_OPERATOR_VALUES_BASE;
+
+ if ($this->isStructural()) {
+ $tmp = array_merge($tmp, self::ALLOWED_OPERATOR_VALUES_STRUCTURAL);
+ }
+
+ return $tmp;
+ }
+
+ public function isEnabled(): bool
+ {
+ return !empty($this->operator);
+ }
+
+ public function apply(QueryBuilder $queryBuilder): void
+ {
+ //If no value is provided then we do not apply a filter
+ if (!$this->isEnabled()) {
+ return;
+ }
+
+ //Ensure we have an valid operator
+ if(!in_array($this->operator, $this->getAllowedOperatorValues(), true)) {
+ throw new \RuntimeException('Invalid operator '. $this->operator . ' provided. Valid operators are '. implode(', ', $this->getAllowedOperatorValues()));
+ }
+
+ //We need to handle null values differently, as they can not be compared with == or !=
+ if ($this->value === null) {
+ if($this->operator === '=' || $this->operator === 'INCLUDING_CHILDREN') {
+ $queryBuilder->andWhere(sprintf("%s IS NULL", $this->property));
+ return;
+ }
+
+ if ($this->operator === '!=' || $this->operator === 'EXCLUDING_CHILDREN') {
+ $queryBuilder->andWhere(sprintf("%s IS NOT NULL", $this->property));
+ return;
+ }
+
+ throw new \RuntimeException('Unknown operator '. $this->operator . ' provided. Valid operators are '. implode(', ', $this->getAllowedOperatorValues()));
+ }
+
+ if($this->operator === '=' || $this->operator === '!=') {
+ $this->addSimpleAndConstraint($queryBuilder, $this->property, $this->identifier, $this->operator, $this->value);
+ return;
+ }
+
+ //Otherwise retrieve the children list and apply the operator to it
+ if($this->isStructural()) {
+ $list = $this->nodesListBuilder->getChildrenFlatList($this->value);
+ //Add the element itself to the list
+ $list[] = $this->value;
+
+ if ($this->operator === 'INCLUDING_CHILDREN') {
+ $this->addSimpleAndConstraint($queryBuilder, $this->property, $this->identifier, 'IN', $list);
+ return;
+ }
+
+ if ($this->operator === 'EXCLUDING_CHILDREN') {
+ $this->addSimpleAndConstraint($queryBuilder, $this->property, $this->identifier, 'NOT IN', $list);
+ return;
+ }
+ } else {
+ throw new \RuntimeException('Cannot apply operator '. $this->operator . ' to non-structural type');
+ }
+
+ }
+}
\ No newline at end of file
diff --git a/src/DataTables/Filters/Constraints/FilterTrait.php b/src/DataTables/Filters/Constraints/FilterTrait.php
new file mode 100644
index 00000000..5371a48d
--- /dev/null
+++ b/src/DataTables/Filters/Constraints/FilterTrait.php
@@ -0,0 +1,65 @@
+useHaving = $value;
+ return $this;
+ }
+
+ /**
+ * Checks if the given input is an aggregateFunction like COUNT(part.partsLot) or so
+ * @return bool
+ */
+ protected function isAggregateFunctionString(string $input): bool
+ {
+ return preg_match('/^[a-zA-Z]+\(.*\)$/', $input) === 1;
+ }
+
+ /**
+ * Generates a parameter identifier that can be used for the given property. It gives random results, to be unique, so you have to cache it.
+ * @param string $property
+ * @return string
+ */
+ protected function generateParameterIdentifier(string $property): string
+ {
+ //Replace all special characters with underscores
+ $property = preg_replace('/[^a-zA-Z0-9_]/', '_', $property);
+ //Add a random number to the end of the property name for uniqueness
+ return $property . '_' . uniqid("", false);
+ }
+
+ /**
+ * Adds a simple constraint in the form of (property OPERATOR value) (e.g. "part.name = :name") to the given query builder.
+ * @param QueryBuilder $queryBuilder
+ * @param string $property
+ * @param string $comparison_operator
+ * @param mixed $value
+ * @return void
+ */
+ protected function addSimpleAndConstraint(QueryBuilder $queryBuilder, string $property, string $parameterIdentifier, string $comparison_operator, $value): void
+ {
+ if ($comparison_operator === 'IN' || $comparison_operator === 'NOT IN') {
+ $expression = sprintf("%s %s (:%s)", $property, $comparison_operator, $parameterIdentifier);
+ } else {
+ $expression = sprintf("%s %s :%s", $property, $comparison_operator, $parameterIdentifier);
+ }
+
+ if($this->useHaving || $this->isAggregateFunctionString($property)) { //If the property is an aggregate function, we have to use the "having" instead of the "where"
+ $queryBuilder->andHaving($expression);
+ } else {
+ $queryBuilder->andWhere($expression);
+ }
+
+ $queryBuilder->setParameter($parameterIdentifier, $value);
+ }
+}
\ No newline at end of file
diff --git a/src/DataTables/Filters/Constraints/InstanceOfConstraint.php b/src/DataTables/Filters/Constraints/InstanceOfConstraint.php
new file mode 100644
index 00000000..c3f11e4a
--- /dev/null
+++ b/src/DataTables/Filters/Constraints/InstanceOfConstraint.php
@@ -0,0 +1,96 @@
+value;
+ }
+
+ /**
+ * @param string[] $value
+ * @return $this
+ */
+ public function setValue(array $value): self
+ {
+ $this->value = $value;
+ return $this;
+ }
+
+ /**
+ * @return string
+ */
+ public function getOperator(): string
+ {
+ return $this->operator;
+ }
+
+ /**
+ * @param string $operator
+ * @return $this
+ */
+ public function setOperator(string $operator): self
+ {
+ $this->operator = $operator;
+ return $this;
+ }
+
+
+
+ public function isEnabled(): bool
+ {
+ return !empty($this->operator);
+ }
+
+ public function apply(QueryBuilder $queryBuilder): void
+ {
+ //If no value is provided then we do not apply a filter
+ if (!$this->isEnabled()) {
+ return;
+ }
+
+ //Ensure we have an valid operator
+ if(!in_array($this->operator, self::ALLOWED_OPERATOR_VALUES, true)) {
+ throw new \RuntimeException('Invalid operator '. $this->operator . ' provided. Valid operators are '. implode(', ', self::ALLOWED_OPERATOR_VALUES));
+ }
+
+ $expressions = [];
+
+ if ($this->operator === 'ANY' || $this->operator === 'NONE') {
+ foreach($this->value as $value) {
+ //We cannnot use an paramater here, as this is the only way to pass the FCQN to the query (via binded params, we would need to use ClassMetaData). See: https://github.com/doctrine/orm/issues/4462
+ $expressions[] = ($queryBuilder->expr()->isInstanceOf($this->property, $value));
+ }
+
+ if($this->operator === 'ANY') {
+ $queryBuilder->andWhere($queryBuilder->expr()->orX(...$expressions));
+ } else { //NONE
+ $queryBuilder->andWhere($queryBuilder->expr()->not($queryBuilder->expr()->orX(...$expressions)));
+ }
+ } else {
+ throw new \RuntimeException('Unknown operator '. $this->operator . ' provided. Valid operators are '. implode(', ', self::ALLOWED_OPERATOR_VALUES));
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/DataTables/Filters/Constraints/IntConstraint.php b/src/DataTables/Filters/Constraints/IntConstraint.php
new file mode 100644
index 00000000..2df3864e
--- /dev/null
+++ b/src/DataTables/Filters/Constraints/IntConstraint.php
@@ -0,0 +1,20 @@
+value1 !== null) {
+ $this->value1 = (int) $this->value1;
+ }
+ if($this->value2 !== null) {
+ $this->value2 = (int) $this->value2;
+ }
+
+ parent::apply($queryBuilder);
+ }
+}
\ No newline at end of file
diff --git a/src/DataTables/Filters/Constraints/NumberConstraint.php b/src/DataTables/Filters/Constraints/NumberConstraint.php
new file mode 100644
index 00000000..bacd289a
--- /dev/null
+++ b/src/DataTables/Filters/Constraints/NumberConstraint.php
@@ -0,0 +1,117 @@
+', '<=', '>=', 'BETWEEN'];
+
+
+ /**
+ * The value1 used for comparison (this is the main one used for all mono-value comparisons)
+ * @var float|null|int|\DateTimeInterface
+ */
+ protected $value1;
+
+ /**
+ * The second value used when operator is RANGE; this is the upper bound of the range
+ * @var float|null|int|\DateTimeInterface
+ */
+ protected $value2;
+
+ /**
+ * @var string The operator to use
+ */
+ protected $operator;
+
+ /**
+ * @return float|int|null|\DateTimeInterface
+ */
+ public function getValue1()
+ {
+ return $this->value1;
+ }
+
+ /**
+ * @param float|int|\DateTimeInterface|null $value1
+ */
+ public function setValue1($value1): void
+ {
+ $this->value1 = $value1;
+ }
+
+ /**
+ * @return float|int|null
+ */
+ public function getValue2()
+ {
+ return $this->value2;
+ }
+
+ /**
+ * @param float|int|null $value2
+ */
+ public function setValue2($value2): void
+ {
+ $this->value2 = $value2;
+ }
+
+ /**
+ * @return string
+ */
+ public function getOperator(): string
+ {
+ return $this->operator;
+ }
+
+ /**
+ * @param string $operator
+ */
+ public function setOperator(?string $operator): void
+ {
+ $this->operator = $operator;
+ }
+
+
+ public function __construct(string $property, string $identifier = null, $value1 = null, string $operator = null, $value2 = null)
+ {
+ parent::__construct($property, $identifier);
+ $this->value1 = $value1;
+ $this->value2 = $value2;
+ $this->operator = $operator;
+ }
+
+ public function isEnabled(): bool
+ {
+ return $this->value1 !== null
+ && !empty($this->operator);
+ }
+
+ public function apply(QueryBuilder $queryBuilder): void
+ {
+ //If no value is provided then we do not apply a filter
+ if (!$this->isEnabled()) {
+ return;
+ }
+
+ //Ensure we have an valid operator
+ if(!in_array($this->operator, self::ALLOWED_OPERATOR_VALUES, true)) {
+ throw new \RuntimeException('Invalid operator '. $this->operator . ' provided. Valid operators are '. implode(', ', self::ALLOWED_OPERATOR_VALUES));
+ }
+
+ if ($this->operator !== 'BETWEEN') {
+ $this->addSimpleAndConstraint($queryBuilder, $this->property, $this->identifier, $this->operator, $this->value1);
+ } else {
+ if ($this->value2 === null) {
+ throw new RuntimeException("Cannot use operator BETWEEN without value2!");
+ }
+
+ $this->addSimpleAndConstraint($queryBuilder, $this->property, $this->identifier . '1', '>=', $this->value1);
+ $this->addSimpleAndConstraint($queryBuilder, $this->property, $this->identifier . '2', '<=', $this->value2);
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/DataTables/Filters/Constraints/Part/ParameterConstraint.php b/src/DataTables/Filters/Constraints/Part/ParameterConstraint.php
new file mode 100644
index 00000000..58509546
--- /dev/null
+++ b/src/DataTables/Filters/Constraints/Part/ParameterConstraint.php
@@ -0,0 +1,160 @@
+alias = uniqid('param_', false);
+
+ $this->value_text = new TextConstraint($this->alias . '.value_text');
+ $this->value = new ParameterValueConstraint($this->alias );
+ }
+
+ public function isEnabled(): bool
+ {
+ return true;
+ }
+
+ public function apply(QueryBuilder $queryBuilder): void
+ {
+ //Create a new qb to build the subquery
+ $subqb = new QueryBuilder($queryBuilder->getEntityManager());
+
+
+
+ $subqb->select('COUNT(' . $this->alias . ')')
+ ->from(PartParameter::class, $this->alias)
+ ->where($this->alias . '.element = part');
+
+ if (!empty($this->name)) {
+ $paramName = $this->generateParameterIdentifier('params.name');
+ $subqb->andWhere($this->alias . '.name = :' . $paramName);
+ $queryBuilder->setParameter($paramName, $this->name);
+ }
+
+ if (!empty($this->symbol)) {
+ $paramName = $this->generateParameterIdentifier('params.symbol');
+ $subqb->andWhere($this->alias . '.symbol = :' . $paramName);
+ $queryBuilder->setParameter($paramName, $this->symbol);
+ }
+
+ if (!empty($this->unit)) {
+ $paramName = $this->generateParameterIdentifier('params.unit');
+ $subqb->andWhere($this->alias . '.unit = :' . $paramName);
+ $queryBuilder->setParameter($paramName, $this->unit);
+ }
+
+ //Apply all subfilters
+ $this->value_text->apply($subqb);
+ $this->value->apply($subqb);
+
+ //Copy all parameters from the subquery to the main query
+ //We can not use setParameters here, as this would override the exiting paramaters in queryBuilder
+ foreach ($subqb->getParameters() as $parameter) {
+ $queryBuilder->setParameter($parameter->getName(), $parameter->getValue());
+ }
+
+ $queryBuilder->andWhere('(' . $subqb->getDQL() . ') > 0');
+ }
+
+ /**
+ * @return string
+ */
+ public function getName(): string
+ {
+ return $this->name;
+ }
+
+ /**
+ * @param string $name
+ * @return ParameterConstraint
+ */
+ public function setName(string $name): ParameterConstraint
+ {
+ $this->name = $name;
+ return $this;
+ }
+
+ /**
+ * @return string
+ */
+ public function getSymbol(): string
+ {
+ return $this->symbol;
+ }
+
+ /**
+ * @param string $symbol
+ * @return ParameterConstraint
+ */
+ public function setSymbol(string $symbol): ParameterConstraint
+ {
+ $this->symbol = $symbol;
+ return $this;
+ }
+
+ /**
+ * @return string
+ */
+ public function getUnit(): string
+ {
+ return $this->unit;
+ }
+
+ /**
+ * @param string $unit
+ * @return ParameterConstraint
+ */
+ public function setUnit(string $unit): ParameterConstraint
+ {
+ $this->unit = $unit;
+ return $this;
+ }
+
+ /**
+ * @return TextConstraint
+ */
+ public function getValueText(): TextConstraint
+ {
+ return $this->value_text;
+ }
+
+ /**
+ * @return ParameterValueConstraint
+ */
+ public function getValue(): ParameterValueConstraint
+ {
+ return $this->value;
+ }
+
+
+}
\ No newline at end of file
diff --git a/src/DataTables/Filters/Constraints/Part/ParameterValueConstraint.php b/src/DataTables/Filters/Constraints/Part/ParameterValueConstraint.php
new file mode 100644
index 00000000..27b91965
--- /dev/null
+++ b/src/DataTables/Filters/Constraints/Part/ParameterValueConstraint.php
@@ -0,0 +1,130 @@
+', '<=', '>=', 'BETWEEN',
+ //Additional operators
+ 'IN_RANGE', 'NOT_IN_RANGE', 'GREATER_THAN_RANGE', 'GREATER_EQUAL_RANGE', 'LESS_THAN_RANGE', 'LESS_EQUAL_RANGE', 'RANGE_IN_RANGE', 'RANGE_INTERSECT_RANGE'];
+
+ /**
+ * @param string $alias The alias which is used in the sub query of ParameterConstraint
+ */
+ public function __construct(string $alias) {
+ $this->alias = $alias;
+
+ parent::__construct($alias . '.value_typical');
+ }
+
+ public function apply(QueryBuilder $queryBuilder): void
+ {
+ //Skip if not enabled
+ if(!$this->isEnabled()) {
+ return;
+ }
+
+ $paramName1 = $this->generateParameterIdentifier('value1');
+ $paramName2 = $this->generateParameterIdentifier('value2');
+
+ if ($this->operator === 'IN_RANGE') {
+
+ $queryBuilder->andWhere(
+ "({$this->alias}.value_min <= :{$paramName1} AND {$this->alias}.value_max >= :{$paramName1}) OR
+ ({$this->alias}.value_typical = :{$paramName1})"
+ );
+
+ $queryBuilder->setParameter($paramName1, $this->value1);
+
+ return;
+ }
+
+ if ($this->operator === 'NOT_IN_RANGE') {
+
+ $queryBuilder->andWhere(
+ "({$this->alias}.value_min > :{$paramName1} OR {$this->alias}.value_max < :{$paramName1}) AND
+ ({$this->alias}.value_typical IS NULL OR {$this->alias}.value_typical != :{$paramName1})"
+ );
+
+ $queryBuilder->setParameter($paramName1, $this->value1);
+
+ return;
+ }
+
+ if ($this->operator === 'GREATER_THAN_RANGE') {
+ $queryBuilder->andWhere(
+ "{$this->alias}.value_max < :{$paramName1} OR {$this->alias}.value_typical < :{$paramName1}"
+ );
+
+ $queryBuilder->setParameter($paramName1, $this->value1);
+
+ return;
+ }
+
+ if ($this->operator === 'GREATER_EQUAL_RANGE') {
+ $queryBuilder->andWhere(
+ "{$this->alias}.value_max <= :{$paramName1} OR {$this->alias}.value_typical <= :{$paramName1}"
+ );
+
+ $queryBuilder->setParameter($paramName1, $this->value1);
+
+ return;
+ }
+
+ if ($this->operator === 'LESS_THAN_RANGE') {
+ $queryBuilder->andWhere(
+ "{$this->alias}.value_min > :{$paramName1} OR {$this->alias}.value_typical > :{$paramName1}"
+ );
+
+ $queryBuilder->setParameter($paramName1, $this->value1);
+
+ return;
+ }
+
+ if ($this->operator === 'LESS_EQUAL_RANGE') {
+ $queryBuilder->andWhere(
+ "{$this->alias}.value_min >= :{$paramName1} OR {$this->alias}.value_typical >= :{$paramName1}"
+ );
+
+ $queryBuilder->setParameter($paramName1, $this->value1);
+
+ return;
+ }
+
+ // This operator means the constraint range must lie completely within the parameter value range
+ if ($this->operator === 'RANGE_IN_RANGE') {
+ $queryBuilder->andWhere(
+ "({$this->alias}.value_min <= :{$paramName1} AND {$this->alias}.value_max >= :{$paramName2}) OR
+ ({$this->alias}.value_typical >= :{$paramName1} AND {$this->alias}.value_typical <= :{$paramName2})"
+ );
+
+ $queryBuilder->setParameter($paramName1, $this->value1);
+ $queryBuilder->setParameter($paramName2, $this->value2);
+
+ return;
+ }
+
+ if ($this->operator === 'RANGE_INTERSECT_RANGE') {
+ $queryBuilder->andWhere(
+ //The ORs are important here!!
+ "({$this->alias}.value_min <= :{$paramName1} OR {$this->alias}.value_min <= :{$paramName2}) OR
+ ({$this->alias}.value_max >= :{$paramName1} OR {$this->alias}.value_max >= :{$paramName2}) OR
+ ({$this->alias}.value_typical >= :{$paramName1} AND {$this->alias}.value_typical <= :{$paramName2})"
+ );
+
+ $queryBuilder->setParameter($paramName1, $this->value1);
+ $queryBuilder->setParameter($paramName2, $this->value2);
+
+ return;
+ }
+
+
+ //For all other cases use the default implementation
+ parent::apply($queryBuilder);
+ }
+}
\ No newline at end of file
diff --git a/src/DataTables/Filters/Constraints/Part/TagsConstraint.php b/src/DataTables/Filters/Constraints/Part/TagsConstraint.php
new file mode 100644
index 00000000..ecfb6274
--- /dev/null
+++ b/src/DataTables/Filters/Constraints/Part/TagsConstraint.php
@@ -0,0 +1,137 @@
+value = $value;
+ $this->operator = $operator;
+ }
+
+ /**
+ * @return string
+ */
+ public function getOperator(): ?string
+ {
+ return $this->operator;
+ }
+
+ /**
+ * @param string $operator
+ */
+ public function setOperator(?string $operator): self
+ {
+ $this->operator = $operator;
+ return $this;
+ }
+
+ /**
+ * @return string
+ */
+ public function getValue(): string
+ {
+ return $this->value;
+ }
+
+ /**
+ * @param string $value
+ */
+ public function setValue(string $value): self
+ {
+ $this->value = $value;
+ return $this;
+ }
+
+ public function isEnabled(): bool
+ {
+ return $this->value !== null
+ && !empty($this->operator);
+ }
+
+ /**
+ * Returns a list of tags based on the comma separated tags list
+ * @return string[]
+ */
+ public function getTags(): array
+ {
+ return explode(',', trim($this->value, ','));
+ }
+
+ /**
+ * Builds an expression to query for a single tag
+ * @param QueryBuilder $queryBuilder
+ * @param string $tag
+ * @return Expr\Orx
+ */
+ protected function getExpressionForTag(QueryBuilder $queryBuilder, string $tag): Expr\Orx
+ {
+ $tag_identifier_prefix = uniqid($this->identifier . '_', false);
+
+ $expr = $queryBuilder->expr();
+
+ $tmp = $expr->orX(
+ $expr->like($this->property, ':' . $tag_identifier_prefix . '_1'),
+ $expr->like($this->property, ':' . $tag_identifier_prefix . '_2'),
+ $expr->like($this->property, ':' . $tag_identifier_prefix . '_3'),
+ $expr->eq($this->property, ':' . $tag_identifier_prefix . '_4'),
+ );
+
+ //Set the parameters for the LIKE expression, in each variation of the tag (so with a comma, at the end, at the beginning, and on both ends, and equaling the tag)
+ $queryBuilder->setParameter($tag_identifier_prefix . '_1', '%,' . $tag . ',%');
+ $queryBuilder->setParameter($tag_identifier_prefix . '_2', '%,' . $tag);
+ $queryBuilder->setParameter($tag_identifier_prefix . '_3', $tag . ',%');
+ $queryBuilder->setParameter($tag_identifier_prefix . '_4', $tag);
+
+ return $tmp;
+ }
+
+ public function apply(QueryBuilder $queryBuilder): void
+ {
+ if(!$this->isEnabled()) {
+ return;
+ }
+
+ if(!in_array($this->operator, self::ALLOWED_OPERATOR_VALUES, true)) {
+ throw new \RuntimeException('Invalid operator '. $this->operator . ' provided. Valid operators are '. implode(', ', self::ALLOWED_OPERATOR_VALUES));
+ }
+
+ $tagsExpressions = [];
+ foreach ($this->getTags() as $tag) {
+ $tagsExpressions[] = $this->getExpressionForTag($queryBuilder, $tag);
+ }
+
+ if ($this->operator === 'ANY') {
+ $queryBuilder->andWhere($queryBuilder->expr()->orX(...$tagsExpressions));
+ return;
+ }
+
+ if ($this->operator === 'ALL') {
+ $queryBuilder->andWhere($queryBuilder->expr()->andX(...$tagsExpressions));
+ return;
+ }
+
+ if ($this->operator === 'NONE') {
+ $queryBuilder->andWhere($queryBuilder->expr()->not($queryBuilder->expr()->orX(...$tagsExpressions)));
+ return;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/DataTables/Filters/Constraints/TextConstraint.php b/src/DataTables/Filters/Constraints/TextConstraint.php
new file mode 100644
index 00000000..3ce5c7eb
--- /dev/null
+++ b/src/DataTables/Filters/Constraints/TextConstraint.php
@@ -0,0 +1,109 @@
+value = $value;
+ $this->operator = $operator;
+ }
+
+ /**
+ * @return string
+ */
+ public function getOperator(): ?string
+ {
+ return $this->operator;
+ }
+
+ /**
+ * @param string $operator
+ */
+ public function setOperator(?string $operator): self
+ {
+ $this->operator = $operator;
+ return $this;
+ }
+
+ /**
+ * @return string
+ */
+ public function getValue(): string
+ {
+ return $this->value;
+ }
+
+ /**
+ * @param string $value
+ */
+ public function setValue(string $value): self
+ {
+ $this->value = $value;
+ return $this;
+ }
+
+ public function isEnabled(): bool
+ {
+ return $this->value !== null
+ && !empty($this->operator);
+ }
+
+ public function apply(QueryBuilder $queryBuilder): void
+ {
+ if(!$this->isEnabled()) {
+ return;
+ }
+
+ if(!in_array($this->operator, self::ALLOWED_OPERATOR_VALUES, true)) {
+ throw new \RuntimeException('Invalid operator '. $this->operator . ' provided. Valid operators are '. implode(', ', self::ALLOWED_OPERATOR_VALUES));
+ }
+
+ //Equal and not equal can be handled easily
+ if($this->operator === '=' || $this->operator === '!=') {
+
+ $this->addSimpleAndConstraint($queryBuilder, $this->property, $this->identifier, $this->operator, $this->value);
+ return;
+ }
+
+ //The CONTAINS, LIKE, STARTS and ENDS operators use the LIKE operator but we have to build the value string differently
+ $like_value = null;
+ if ($this->operator === 'LIKE') {
+ $like_value = $this->value;
+ } else if ($this->operator === 'STARTS') {
+ $like_value = $this->value . '%';
+ } else if ($this->operator === 'ENDS') {
+ $like_value = '%' . $this->value;
+ } else if ($this->operator === 'CONTAINS') {
+ $like_value = '%' . $this->value . '%';
+ }
+
+ if ($like_value !== null) {
+ $this->addSimpleAndConstraint($queryBuilder, $this->property, $this->identifier, 'LIKE', $like_value);
+ return;
+ }
+
+ //Regex is only supported on MySQL and needs a special function
+ if ($this->operator === 'REGEX') {
+ $queryBuilder->andWhere(sprintf('REGEXP(%s, :%s) = 1', $this->property, $this->identifier));
+ $queryBuilder->setParameter($this->identifier, $this->value);
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/DataTables/Filters/FilterInterface.php b/src/DataTables/Filters/FilterInterface.php
new file mode 100644
index 00000000..0a13a4aa
--- /dev/null
+++ b/src/DataTables/Filters/FilterInterface.php
@@ -0,0 +1,16 @@
+timestamp = new DateTimeConstraint('log.timestamp');
+ $this->dbId = new IntConstraint('log.id');
+ $this->level = new ChoiceConstraint('log.level');
+ $this->eventType = new InstanceOfConstraint('log');
+ $this->user = new EntityConstraint(null, User::class, 'log.user');
+
+ $this->targetType = new ChoiceConstraint('log.target_type');
+ $this->targetId = new IntConstraint('log.target_id');
+ }
+
+ public function apply(QueryBuilder $queryBuilder): void
+ {
+ $this->applyAllChildFilters($queryBuilder);
+ }
+
+ /**
+ * @return DateTimeConstraint
+ */
+ public function getTimestamp(): DateTimeConstraint
+ {
+ return $this->timestamp;
+ }
+
+ /**
+ * @return IntConstraint|NumberConstraint
+ */
+ public function getDbId()
+ {
+ return $this->dbId;
+ }
+
+ /**
+ * @return ChoiceConstraint
+ */
+ public function getLevel(): ChoiceConstraint
+ {
+ return $this->level;
+ }
+
+ /**
+ * @return InstanceOfConstraint
+ */
+ public function getEventType(): InstanceOfConstraint
+ {
+ return $this->eventType;
+ }
+
+ /**
+ * @return ChoiceConstraint
+ */
+ public function getTargetType(): ChoiceConstraint
+ {
+ return $this->targetType;
+ }
+
+ /**
+ * @return IntConstraint
+ */
+ public function getTargetId(): IntConstraint
+ {
+ return $this->targetId;
+ }
+
+ public function getUser(): EntityConstraint
+ {
+ return $this->user;
+ }
+
+
+}
\ No newline at end of file
diff --git a/src/DataTables/Filters/PartFilter.php b/src/DataTables/Filters/PartFilter.php
new file mode 100644
index 00000000..2d3e6087
--- /dev/null
+++ b/src/DataTables/Filters/PartFilter.php
@@ -0,0 +1,427 @@
+ */
+ protected $parameters;
+
+ /** @var IntConstraint */
+ protected $parametersCount;
+
+ public function __construct(NodesListBuilder $nodesListBuilder)
+ {
+ $this->name = new TextConstraint('part.name');
+ $this->description = new TextConstraint('part.description');
+ $this->comment = new TextConstraint('part.comment');
+ $this->category = new EntityConstraint($nodesListBuilder, Category::class, 'part.category');
+ $this->footprint = new EntityConstraint($nodesListBuilder, Footprint::class, 'part.footprint');
+ $this->tags = new TagsConstraint('part.tags');
+
+ $this->favorite = new BooleanConstraint('part.favorite');
+ $this->needsReview = new BooleanConstraint('part.needs_review');
+ $this->measurementUnit = new EntityConstraint($nodesListBuilder, MeasurementUnit::class, 'part.partUnit');
+ $this->mass = new NumberConstraint('part.mass');
+ $this->dbId = new IntConstraint('part.id');
+ $this->addedDate = new DateTimeConstraint('part.addedDate');
+ $this->lastModified = new DateTimeConstraint('part.lastModified');
+
+ $this->minAmount = new NumberConstraint('part.minamount');
+ /* We have to use an IntConstraint here because otherwise we get just an empty result list when applying the filter
+ This seems to be related to the fact, that PDO does not have an float parameter type and using string type does not work in this situation (at least in SQLite)
+ TODO: Find a better solution here
+ */
+ $this->amountSum = new IntConstraint('amountSum');
+ $this->lotCount = new IntConstraint('COUNT(partLots)');
+
+ $this->storelocation = new EntityConstraint($nodesListBuilder, Storelocation::class, 'partLots.storage_location');
+ $this->lotNeedsRefill = new BooleanConstraint('partLots.needs_refill');
+ $this->lotUnknownAmount = new BooleanConstraint('partLots.instock_unknown');
+ $this->lotExpirationDate = new DateTimeConstraint('partLots.expiration_date');
+ $this->lotDescription = new TextConstraint('partLots.description');
+
+ $this->manufacturer = new EntityConstraint($nodesListBuilder, Manufacturer::class, 'part.manufacturer');
+ $this->manufacturer_product_number = new TextConstraint('part.manufacturer_product_number');
+ $this->manufacturer_product_url = new TextConstraint('part.manufacturer_product_url');
+ $this->manufacturing_status = new ChoiceConstraint('part.manufacturing_status');
+
+ $this->attachmentsCount = new IntConstraint('COUNT(attachments)');
+ $this->attachmentType = new EntityConstraint($nodesListBuilder, AttachmentType::class, 'attachments.attachment_type');
+ $this->attachmentName = new TextConstraint('attachments.name');
+
+ $this->supplier = new EntityConstraint($nodesListBuilder, Supplier::class, 'orderdetails.supplier');
+ $this->orderdetailsCount = new IntConstraint('COUNT(orderdetails)');
+ $this->obsolete = new BooleanConstraint('orderdetails.obsolete');
+
+ $this->parameters = new ArrayCollection();
+ $this->parametersCount = new IntConstraint('COUNT(parameters)');
+ }
+
+ public function apply(QueryBuilder $queryBuilder): void
+ {
+ $this->applyAllChildFilters($queryBuilder);
+ }
+
+
+ /**
+ * @return BooleanConstraint|false
+ */
+ public function getFavorite()
+ {
+ return $this->favorite;
+ }
+
+ /**
+ * @return BooleanConstraint
+ */
+ public function getNeedsReview(): BooleanConstraint
+ {
+ return $this->needsReview;
+ }
+
+ public function getMass(): NumberConstraint
+ {
+ return $this->mass;
+ }
+
+ public function getName(): TextConstraint
+ {
+ return $this->name;
+ }
+
+ public function getDescription(): TextConstraint
+ {
+ return $this->description;
+ }
+
+ /**
+ * @return DateTimeConstraint
+ */
+ public function getLastModified(): DateTimeConstraint
+ {
+ return $this->lastModified;
+ }
+
+ /**
+ * @return DateTimeConstraint
+ */
+ public function getAddedDate(): DateTimeConstraint
+ {
+ return $this->addedDate;
+ }
+
+ public function getCategory(): EntityConstraint
+ {
+ return $this->category;
+ }
+
+ /**
+ * @return EntityConstraint
+ */
+ public function getFootprint(): EntityConstraint
+ {
+ return $this->footprint;
+ }
+
+ /**
+ * @return EntityConstraint
+ */
+ public function getManufacturer(): EntityConstraint
+ {
+ return $this->manufacturer;
+ }
+
+ /**
+ * @return EntityConstraint
+ */
+ public function getSupplier(): EntityConstraint
+ {
+ return $this->supplier;
+ }
+
+ /**
+ * @return EntityConstraint
+ */
+ public function getStorelocation(): EntityConstraint
+ {
+ return $this->storelocation;
+ }
+
+ /**
+ * @return EntityConstraint
+ */
+ public function getMeasurementUnit(): EntityConstraint
+ {
+ return $this->measurementUnit;
+ }
+
+ /**
+ * @return NumberConstraint
+ */
+ public function getDbId(): NumberConstraint
+ {
+ return $this->dbId;
+ }
+
+ /**
+ * @return TextConstraint
+ */
+ public function getComment(): TextConstraint
+ {
+ return $this->comment;
+ }
+
+ /**
+ * @return NumberConstraint
+ */
+ public function getMinAmount(): NumberConstraint
+ {
+ return $this->minAmount;
+ }
+
+ /**
+ * @return TextConstraint
+ */
+ public function getManufacturerProductUrl(): TextConstraint
+ {
+ return $this->manufacturer_product_url;
+ }
+
+ /**
+ * @return TextConstraint
+ */
+ public function getManufacturerProductNumber(): TextConstraint
+ {
+ return $this->manufacturer_product_number;
+ }
+
+ public function getLotCount(): NumberConstraint
+ {
+ return $this->lotCount;
+ }
+
+ /**
+ * @return TagsConstraint
+ */
+ public function getTags(): TagsConstraint
+ {
+ return $this->tags;
+ }
+
+ /**
+ * @return IntConstraint
+ */
+ public function getOrderdetailsCount(): IntConstraint
+ {
+ return $this->orderdetailsCount;
+ }
+
+ /**
+ * @return IntConstraint
+ */
+ public function getAttachmentsCount(): IntConstraint
+ {
+ return $this->attachmentsCount;
+ }
+
+ /**
+ * @return BooleanConstraint
+ */
+ public function getLotNeedsRefill(): BooleanConstraint
+ {
+ return $this->lotNeedsRefill;
+ }
+
+ /**
+ * @return BooleanConstraint
+ */
+ public function getLotUnknownAmount(): BooleanConstraint
+ {
+ return $this->lotUnknownAmount;
+ }
+
+ /**
+ * @return DateTimeConstraint
+ */
+ public function getLotExpirationDate(): DateTimeConstraint
+ {
+ return $this->lotExpirationDate;
+ }
+
+ /**
+ * @return EntityConstraint
+ */
+ public function getAttachmentType(): EntityConstraint
+ {
+ return $this->attachmentType;
+ }
+
+ /**
+ * @return TextConstraint
+ */
+ public function getAttachmentName(): TextConstraint
+ {
+ return $this->attachmentName;
+ }
+
+ public function getManufacturingStatus(): ChoiceConstraint
+ {
+ return $this->manufacturing_status;
+ }
+
+ public function getAmountSum(): NumberConstraint
+ {
+ return $this->amountSum;
+ }
+
+ /**
+ * @return ArrayCollection
+ */
+ public function getParameters(): ArrayCollection
+ {
+ return $this->parameters;
+ }
+
+ public function getParametersCount(): IntConstraint
+ {
+ return $this->parametersCount;
+ }
+
+ /**
+ * @return TextConstraint
+ */
+ public function getLotDescription(): TextConstraint
+ {
+ return $this->lotDescription;
+ }
+
+ /**
+ * @return BooleanConstraint
+ */
+ public function getObsolete(): BooleanConstraint
+ {
+ return $this->obsolete;
+ }
+
+
+
+
+}
diff --git a/src/DataTables/Filters/PartSearchFilter.php b/src/DataTables/Filters/PartSearchFilter.php
new file mode 100644
index 00000000..01538a16
--- /dev/null
+++ b/src/DataTables/Filters/PartSearchFilter.php
@@ -0,0 +1,359 @@
+keyword = $query;
+ }
+
+ protected function getFieldsToSearch(): array
+ {
+ $fields_to_search = [];
+
+ if($this->name) {
+ $fields_to_search[] = 'part.name';
+ }
+ if($this->category) {
+ $fields_to_search[] = 'category.name';
+ }
+ if($this->description) {
+ $fields_to_search[] = 'part.description';
+ }
+ if($this->tags) {
+ $fields_to_search[] = 'part.tags';
+ }
+ if($this->storelocation) {
+ $fields_to_search[] = 'storelocations.name';
+ }
+ if($this->ordernr) {
+ $fields_to_search[] = 'orderdetails.supplierpartnr';
+ }
+ if($this->mpn) {
+ $fields_to_search[] = 'part.manufacturer_product_url';
+ }
+ if($this->supplier) {
+ $fields_to_search[] = 'suppliers.name';
+ }
+ if($this->manufacturer) {
+ $fields_to_search[] = 'manufacturer.name';
+ }
+ if($this->footprint) {
+ $fields_to_search[] = 'footprint.name';
+ }
+
+ return $fields_to_search;
+ }
+
+ public function apply(QueryBuilder $queryBuilder): void
+ {
+ $fields_to_search = $this->getFieldsToSearch();
+
+ //If we have nothing to search for, do nothing
+ if (empty($fields_to_search) || empty($this->keyword)) {
+ return;
+ }
+
+ //Convert the fields to search to a list of expressions
+ $expressions = array_map(function (string $field) {
+ if ($this->regex) {
+ return sprintf("REGEXP(%s, :search_query) = 1", $field);
+ }
+
+ return sprintf("%s LIKE :search_query", $field);
+ }, $fields_to_search);
+
+ //Add Or concatation of the expressions to our query
+ $queryBuilder->andWhere(
+ $queryBuilder->expr()->orX(...$expressions)
+ );
+
+ //For regex we pass the query as is, for like we add % to the start and end as wildcards
+ if ($this->regex) {
+ $queryBuilder->setParameter('search_query', $this->keyword);
+ } else {
+ $queryBuilder->setParameter('search_query', '%' . $this->keyword . '%');
+ }
+ }
+
+ /**
+ * @return string
+ */
+ public function getKeyword(): string
+ {
+ return $this->keyword;
+ }
+
+ /**
+ * @param string $keyword
+ * @return PartSearchFilter
+ */
+ public function setKeyword(string $keyword): PartSearchFilter
+ {
+ $this->keyword = $keyword;
+ return $this;
+ }
+
+ /**
+ * @return bool
+ */
+ public function isRegex(): bool
+ {
+ return $this->regex;
+ }
+
+ /**
+ * @param bool $regex
+ * @return PartSearchFilter
+ */
+ public function setRegex(bool $regex): PartSearchFilter
+ {
+ $this->regex = $regex;
+ return $this;
+ }
+
+ /**
+ * @return bool
+ */
+ public function isName(): bool
+ {
+ return $this->name;
+ }
+
+ /**
+ * @param bool $name
+ * @return PartSearchFilter
+ */
+ public function setName(bool $name): PartSearchFilter
+ {
+ $this->name = $name;
+ return $this;
+ }
+
+ /**
+ * @return bool
+ */
+ public function isCategory(): bool
+ {
+ return $this->category;
+ }
+
+ /**
+ * @param bool $category
+ * @return PartSearchFilter
+ */
+ public function setCategory(bool $category): PartSearchFilter
+ {
+ $this->category = $category;
+ return $this;
+ }
+
+ /**
+ * @return bool
+ */
+ public function isDescription(): bool
+ {
+ return $this->description;
+ }
+
+ /**
+ * @param bool $description
+ * @return PartSearchFilter
+ */
+ public function setDescription(bool $description): PartSearchFilter
+ {
+ $this->description = $description;
+ return $this;
+ }
+
+ /**
+ * @return bool
+ */
+ public function isTags(): bool
+ {
+ return $this->tags;
+ }
+
+ /**
+ * @param bool $tags
+ * @return PartSearchFilter
+ */
+ public function setTags(bool $tags): PartSearchFilter
+ {
+ $this->tags = $tags;
+ return $this;
+ }
+
+ /**
+ * @return bool
+ */
+ public function isStorelocation(): bool
+ {
+ return $this->storelocation;
+ }
+
+ /**
+ * @param bool $storelocation
+ * @return PartSearchFilter
+ */
+ public function setStorelocation(bool $storelocation): PartSearchFilter
+ {
+ $this->storelocation = $storelocation;
+ return $this;
+ }
+
+ /**
+ * @return bool
+ */
+ public function isOrdernr(): bool
+ {
+ return $this->ordernr;
+ }
+
+ /**
+ * @param bool $ordernr
+ * @return PartSearchFilter
+ */
+ public function setOrdernr(bool $ordernr): PartSearchFilter
+ {
+ $this->ordernr = $ordernr;
+ return $this;
+ }
+
+ /**
+ * @return bool
+ */
+ public function isMpn(): bool
+ {
+ return $this->mpn;
+ }
+
+ /**
+ * @param bool $mpn
+ * @return PartSearchFilter
+ */
+ public function setMpn(bool $mpn): PartSearchFilter
+ {
+ $this->mpn = $mpn;
+ return $this;
+ }
+
+ /**
+ * @return bool
+ */
+ public function isSupplier(): bool
+ {
+ return $this->supplier;
+ }
+
+ /**
+ * @param bool $supplier
+ * @return PartSearchFilter
+ */
+ public function setSupplier(bool $supplier): PartSearchFilter
+ {
+ $this->supplier = $supplier;
+ return $this;
+ }
+
+ /**
+ * @return bool
+ */
+ public function isManufacturer(): bool
+ {
+ return $this->manufacturer;
+ }
+
+ /**
+ * @param bool $manufacturer
+ * @return PartSearchFilter
+ */
+ public function setManufacturer(bool $manufacturer): PartSearchFilter
+ {
+ $this->manufacturer = $manufacturer;
+ return $this;
+ }
+
+ /**
+ * @return bool
+ */
+ public function isFootprint(): bool
+ {
+ return $this->footprint;
+ }
+
+ /**
+ * @param bool $footprint
+ * @return PartSearchFilter
+ */
+ public function setFootprint(bool $footprint): PartSearchFilter
+ {
+ $this->footprint = $footprint;
+ return $this;
+ }
+
+ /**
+ * @return bool
+ */
+ public function isComment(): bool
+ {
+ return $this->comment;
+ }
+
+ /**
+ * @param bool $comment
+ * @return PartSearchFilter
+ */
+ public function setComment(bool $comment): PartSearchFilter
+ {
+ $this->comment = $comment;
+ return $this;
+ }
+
+
+}
\ No newline at end of file
diff --git a/src/DataTables/LogDataTable.php b/src/DataTables/LogDataTable.php
index 3b91c5f2..e675d681 100644
--- a/src/DataTables/LogDataTable.php
+++ b/src/DataTables/LogDataTable.php
@@ -47,6 +47,8 @@ use App\DataTables\Column\LocaleDateTimeColumn;
use App\DataTables\Column\LogEntryExtraColumn;
use App\DataTables\Column\LogEntryTargetColumn;
use App\DataTables\Column\RevertLogColumn;
+use App\DataTables\Filters\AttachmentFilter;
+use App\DataTables\Filters\LogFilter;
use App\Entity\Base\AbstractDBElement;
use App\Entity\Contracts\TimeTravelInterface;
use App\Entity\LogSystem\AbstractLogEntry;
@@ -61,6 +63,7 @@ use App\Services\ElementTypeNameGenerator;
use App\Services\EntityURLGenerator;
use Doctrine\ORM\EntityManagerInterface;
use Doctrine\ORM\QueryBuilder;
+use Omines\DataTablesBundle\Adapter\Doctrine\ORM\SearchCriteriaProvider;
use Omines\DataTablesBundle\Adapter\Doctrine\ORMAdapter;
use Omines\DataTablesBundle\Column\TextColumn;
use Omines\DataTablesBundle\DataTable;
@@ -97,10 +100,12 @@ class LogDataTable implements DataTableTypeInterface
$optionsResolver->setDefaults([
'mode' => 'system_log',
'filter_elements' => [],
+ 'filter' => null,
]);
$optionsResolver->setAllowedTypes('filter_elements', ['array', 'object']);
$optionsResolver->setAllowedTypes('mode', 'string');
+ $optionsResolver->setAllowedTypes('filter', ['null', LogFilter::class]);
$optionsResolver->setNormalizer('filter_elements', static function (Options $options, $value) {
if (!is_array($value)) {
@@ -121,6 +126,7 @@ class LogDataTable implements DataTableTypeInterface
$dataTable->add('symbol', TextColumn::class, [
'label' => '',
+ 'className' => 'no-colvis',
'render' => static function ($value, AbstractLogEntry $context) {
switch ($context->getLevelString()) {
case LogLevel::DEBUG:
@@ -191,8 +197,8 @@ class LogDataTable implements DataTableTypeInterface
'label' => $this->translator->trans('log.level'),
'visible' => 'system_log' === $options['mode'],
'propertyPath' => 'levelString',
- 'render' => static function (string $value, AbstractLogEntry $context) {
- return $value;
+ 'render' => function (string $value, AbstractLogEntry $context) {
+ return $this->translator->trans('log.level.'.$value);
},
]);
@@ -270,9 +276,24 @@ class LogDataTable implements DataTableTypeInterface
'query' => function (QueryBuilder $builder) use ($options): void {
$this->getQuery($builder, $options);
},
+ 'criteria' => [
+ function (QueryBuilder $builder) use ($options): void {
+ $this->buildCriteria($builder, $options);
+ },
+ new SearchCriteriaProvider(),
+ ],
]);
}
+ private function buildCriteria(QueryBuilder $builder, array $options): void
+ {
+ if (!empty($options['filter'])) {
+ $filter = $options['filter'];
+ $filter->apply($builder);
+ }
+
+ }
+
protected function getQuery(QueryBuilder $builder, array $options): void
{
$builder->distinct()->select('log')
@@ -280,6 +301,7 @@ class LogDataTable implements DataTableTypeInterface
->from(AbstractLogEntry::class, 'log')
->leftJoin('log.user', 'user');
+ /* Do this here as we don't want to show up the global count of all log entries in the footer line, with these modes */
if ('last_activity' === $options['mode']) {
$builder->where('log INSTANCE OF '.ElementCreatedLogEntry::class)
->orWhere('log INSTANCE OF '.ElementDeletedLogEntry::class)
diff --git a/src/DataTables/PartsDataTable.php b/src/DataTables/PartsDataTable.php
index db81b348..e9be7f6a 100644
--- a/src/DataTables/PartsDataTable.php
+++ b/src/DataTables/PartsDataTable.php
@@ -47,11 +47,17 @@ use App\DataTables\Column\IconLinkColumn;
use App\DataTables\Column\LocaleDateTimeColumn;
use App\DataTables\Column\MarkdownColumn;
use App\DataTables\Column\PartAttachmentsColumn;
+use App\DataTables\Column\PrettyBoolColumn;
+use App\DataTables\Column\SelectColumn;
+use App\DataTables\Column\SIUnitNumberColumn;
use App\DataTables\Column\TagsColumn;
+use App\DataTables\Filters\PartFilter;
+use App\DataTables\Filters\PartSearchFilter;
use App\Entity\Parts\Category;
use App\Entity\Parts\Footprint;
use App\Entity\Parts\Manufacturer;
use App\Entity\Parts\Part;
+use App\Entity\Parts\PartLot;
use App\Entity\Parts\Storelocation;
use App\Entity\Parts\Supplier;
use App\Services\AmountFormatter;
@@ -101,48 +107,12 @@ final class PartsDataTable implements DataTableTypeInterface
public function configureOptions(OptionsResolver $optionsResolver): void
{
$optionsResolver->setDefaults([
- 'category' => null,
- 'footprint' => null,
- 'manufacturer' => null,
- 'storelocation' => null,
- 'supplier' => null,
- 'tag' => null,
- 'search' => null,
+ 'filter' => null,
+ 'search' => null
]);
- $optionsResolver->setAllowedTypes('category', ['null', Category::class]);
- $optionsResolver->setAllowedTypes('footprint', ['null', Footprint::class]);
- $optionsResolver->setAllowedTypes('manufacturer', ['null', Manufacturer::class]);
- $optionsResolver->setAllowedTypes('supplier', ['null', Supplier::class]);
- $optionsResolver->setAllowedTypes('tag', ['null', 'string']);
- $optionsResolver->setAllowedTypes('search', ['null', 'string']);
-
- //Configure search options
- $optionsResolver->setDefault('search_options', static function (OptionsResolver $resolver): void {
- $resolver->setDefaults([
- 'name' => true,
- 'category' => true,
- 'description' => true,
- 'store_location' => true,
- 'comment' => true,
- 'ordernr' => true,
- 'supplier' => false,
- 'manufacturer' => false,
- 'footprint' => false,
- 'tags' => false,
- 'regex' => false,
- ]);
- $resolver->setAllowedTypes('name', 'bool');
- $resolver->setAllowedTypes('category', 'bool');
- $resolver->setAllowedTypes('description', 'bool');
- $resolver->setAllowedTypes('store_location', 'bool');
- $resolver->setAllowedTypes('comment', 'bool');
- $resolver->setAllowedTypes('supplier', 'bool');
- $resolver->setAllowedTypes('manufacturer', 'bool');
- $resolver->setAllowedTypes('footprint', 'bool');
- $resolver->setAllowedTypes('tags', 'bool');
- $resolver->setAllowedTypes('regex', 'bool');
- });
+ $optionsResolver->setAllowedTypes('filter', [PartFilter::class, 'null']);
+ $optionsResolver->setAllowedTypes('search', [PartSearchFilter::class, 'null']);
}
public function configure(DataTable $dataTable, array $options): void
@@ -152,8 +122,10 @@ final class PartsDataTable implements DataTableTypeInterface
$options = $resolver->resolve($options);
$dataTable
+ ->add('select', SelectColumn::class)
->add('picture', TextColumn::class, [
'label' => '',
+ 'className' => 'no-colvis',
'render' => function ($value, Part $context) {
$preview_attachment = $this->previewGenerator->getTablePreviewAttachment($context);
if (null === $preview_attachment) {
@@ -230,6 +202,7 @@ final class PartsDataTable implements DataTableTypeInterface
return $this->amountFormatter->format($amount, $context->getPartUnit());
},
+ 'orderField' => 'amountSum'
])
->add('minamount', TextColumn::class, [
'label' => $this->translator->trans('part.table.minamount'),
@@ -251,18 +224,12 @@ final class PartsDataTable implements DataTableTypeInterface
'label' => $this->translator->trans('part.table.lastModified'),
'visible' => false,
])
- ->add('needs_review', BoolColumn::class, [
+ ->add('needs_review', PrettyBoolColumn::class, [
'label' => $this->translator->trans('part.table.needsReview'),
- 'trueValue' => $this->translator->trans('true'),
- 'falseValue' => $this->translator->trans('false'),
- 'nullValue' => '',
'visible' => false,
])
- ->add('favorite', BoolColumn::class, [
+ ->add('favorite', PrettyBoolColumn::class, [
'label' => $this->translator->trans('part.table.favorite'),
- 'trueValue' => $this->translator->trans('true'),
- 'falseValue' => $this->translator->trans('false'),
- 'nullValue' => '',
'visible' => false,
])
->add('manufacturing_status', MapColumn::class, [
@@ -282,9 +249,10 @@ final class PartsDataTable implements DataTableTypeInterface
'label' => $this->translator->trans('part.table.mpn'),
'visible' => false,
])
- ->add('mass', TextColumn::class, [
+ ->add('mass', SIUnitNumberColumn::class, [
'label' => $this->translator->trans('part.table.mass'),
'visible' => false,
+ 'unit' => 'g'
])
->add('tags', TagsColumn::class, [
'label' => $this->translator->trans('part.table.tags'),
@@ -324,6 +292,7 @@ final class PartsDataTable implements DataTableTypeInterface
private function getQuery(QueryBuilder $builder): void
{
+
$builder->distinct()->select('part')
->addSelect('category')
->addSelect('footprint')
@@ -335,6 +304,16 @@ final class PartsDataTable implements DataTableTypeInterface
->addSelect('orderdetails')
->addSelect('attachments')
->addSelect('storelocations')
+ //Calculate amount sum using a subquery, so we can filter and sort by it
+ ->addSelect(
+ '(
+ SELECT IFNULL(SUM(partLot.amount), 0.0)
+ FROM '. PartLot::class. ' partLot
+ WHERE partLot.part = part.id
+ AND partLot.instock_unknown = false
+ AND (partLot.expiration_date IS NULL OR partLot.expiration_date > CURRENT_DATE())
+ ) AS HIDDEN amountSum'
+ )
->from(Part::class, 'part')
->leftJoin('part.category', 'category')
->leftJoin('part.master_picture_attachment', 'master_picture_attachment')
@@ -346,144 +325,26 @@ final class PartsDataTable implements DataTableTypeInterface
->leftJoin('part.orderdetails', 'orderdetails')
->leftJoin('orderdetails.supplier', 'suppliers')
->leftJoin('part.attachments', 'attachments')
- ->leftJoin('part.partUnit', 'partUnit');
+ ->leftJoin('part.partUnit', 'partUnit')
+ ->leftJoin('part.parameters', 'parameters')
+
+ ->groupBy('part')
+ ;
}
private function buildCriteria(QueryBuilder $builder, array $options): void
{
- if (isset($options['category'])) {
- $category = $options['category'];
- $list = $this->treeBuilder->typeToNodesList(Category::class, $category);
- $list[] = $category;
-
- $builder->andWhere('part.category IN (:cid)')->setParameter('cid', $list);
+ //Apply the search criterias first
+ if ($options['search'] instanceof PartSearchFilter) {
+ $search = $options['search'];
+ $search->apply($builder);
}
- if (isset($options['footprint'])) {
- $category = $options['footprint'];
- $list = $this->treeBuilder->typeToNodesList(Footprint::class, $category);
- $list[] = $category;
-
- $builder->andWhere('part.footprint IN (:cid)')->setParameter('cid', $list);
+ //We do the most stuff here in the filter class
+ if ($options['filter'] instanceof PartFilter) {
+ $filter = $options['filter'];
+ $filter->apply($builder);
}
- if (isset($options['manufacturer'])) {
- $category = $options['manufacturer'];
- $list = $this->treeBuilder->typeToNodesList(Manufacturer::class, $category);
- $list[] = $category;
-
- $builder->andWhere('part.manufacturer IN (:cid)')->setParameter('cid', $list);
- }
-
- if (isset($options['storelocation'])) {
- $location = $options['storelocation'];
- $list = $this->treeBuilder->typeToNodesList(Storelocation::class, $location);
- $list[] = $location;
-
- $builder->andWhere('partLots.storage_location IN (:cid)')->setParameter('cid', $list);
- }
-
- if (isset($options['supplier'])) {
- $supplier = $options['supplier'];
- $list = $this->treeBuilder->typeToNodesList(Supplier::class, $supplier);
- $list[] = $supplier;
-
- $builder->andWhere('orderdetails.supplier IN (:cid)')->setParameter('cid', $list);
- }
-
- if (isset($options['tag'])) {
- $builder->andWhere('part.tags LIKE :tag')->setParameter('tag', $options['tag']);
- }
-
- if (!empty($options['search'])) {
- if (!$options['search_options']['regex']) {
- //Dont show results, if no things are selected
- $builder->andWhere('0=1');
- $defined = false;
- if ($options['search_options']['name']) {
- $builder->orWhere('part.name LIKE :search');
- $defined = true;
- }
- if ($options['search_options']['description']) {
- $builder->orWhere('part.description LIKE :search');
- $defined = true;
- }
- if ($options['search_options']['comment']) {
- $builder->orWhere('part.comment LIKE :search');
- $defined = true;
- }
- if ($options['search_options']['category']) {
- $builder->orWhere('category.name LIKE :search');
- $defined = true;
- }
- if ($options['search_options']['manufacturer']) {
- $builder->orWhere('manufacturer.name LIKE :search');
- $defined = true;
- }
- if ($options['search_options']['footprint']) {
- $builder->orWhere('footprint.name LIKE :search');
- $defined = true;
- }
- if ($options['search_options']['tags']) {
- $builder->orWhere('part.tags LIKE :search');
- $defined = true;
- }
- if ($options['search_options']['store_location']) {
- $builder->orWhere('storelocations.name LIKE :search');
- $defined = true;
- }
- if ($options['search_options']['supplier']) {
- $builder->orWhere('suppliers.name LIKE :search');
- $defined = true;
- }
-
- if ($defined) {
- $builder->setParameter('search', '%'.$options['search'].'%');
- }
- } else { //Use REGEX
- $builder->andWhere('0=1');
- $defined = false;
- if ($options['search_options']['name']) {
- $builder->orWhere('REGEXP(part.name, :search) = 1');
- $defined = true;
- }
- if ($options['search_options']['description']) {
- $builder->orWhere('REGEXP(part.description, :search) = 1');
- $defined = true;
- }
- if ($options['search_options']['comment']) {
- $builder->orWhere('REGEXP(part.comment, :search) = 1');
- $defined = true;
- }
- if ($options['search_options']['category']) {
- $builder->orWhere('REGEXP(category.name, :search) = 1');
- $defined = true;
- }
- if ($options['search_options']['manufacturer']) {
- $builder->orWhere('REGEXP(manufacturer.name, :search) = 1');
- $defined = true;
- }
- if ($options['search_options']['footprint']) {
- $builder->orWhere('REGEXP(footprint.name, :search) = 1');
- $defined = true;
- }
- if ($options['search_options']['tags']) {
- $builder->orWhere('REGEXP(part.tags, :search) = 1');
- $defined = true;
- }
- if ($options['search_options']['store_location']) {
- $builder->orWhere('REGEXP(storelocations.name, :search) = 1');
- $defined = true;
- }
- if ($options['search_options']['supplier']) {
- $builder->orWhere('REGEXP(suppliers.name, :search) = 1');
- $defined = true;
- }
-
- if ($defined) {
- $builder->setParameter('search', $options['search']);
- }
- }
- }
}
}
diff --git a/src/Doctrine/SQLiteRegexExtension.php b/src/Doctrine/SQLiteRegexExtension.php
new file mode 100644
index 00000000..fe24ae9a
--- /dev/null
+++ b/src/Doctrine/SQLiteRegexExtension.php
@@ -0,0 +1,40 @@
+getConnection();
+
+ //We only execute this on SQLite databases
+ if ($connection->getDatabasePlatform() instanceof SqlitePlatform) {
+ $native_connection = $connection->getNativeConnection();
+
+ //Ensure that the function really exists on the connection, as it is marked as experimental according to PHP documentation
+ if($native_connection instanceof \PDO && method_exists($native_connection, 'sqliteCreateFunction' )) {
+ $native_connection->sqliteCreateFunction('REGEXP', function ($pattern, $value) {
+ return (false !== mb_ereg($pattern, $value)) ? 1 : 0;
+ });
+ }
+ }
+ }
+
+ public function getSubscribedEvents()
+ {
+ return[
+ Events::postConnect
+ ];
+ }
+}
\ No newline at end of file
diff --git a/src/Doctrine/SetSQLMode/SetSQLModeMiddlewareDriver.php b/src/Doctrine/SetSQLMode/SetSQLModeMiddlewareDriver.php
new file mode 100644
index 00000000..ac36827c
--- /dev/null
+++ b/src/Doctrine/SetSQLMode/SetSQLModeMiddlewareDriver.php
@@ -0,0 +1,24 @@
+getDatabasePlatform() instanceof AbstractMySQLPlatform) {
+ //1002 is \PDO::MYSQL_ATTR_INIT_COMMAND constant value
+ $params['driverOptions'][1002] = 'SET SESSION sql_mode=(SELECT REPLACE(@@sql_mode, \'ONLY_FULL_GROUP_BY\', \'\'))';
+ }
+
+ return parent::connect($params);
+ }
+}
\ No newline at end of file
diff --git a/src/Doctrine/SetSQLMode/SetSQLModeMiddlewareWrapper.php b/src/Doctrine/SetSQLMode/SetSQLModeMiddlewareWrapper.php
new file mode 100644
index 00000000..4dd32875
--- /dev/null
+++ b/src/Doctrine/SetSQLMode/SetSQLModeMiddlewareWrapper.php
@@ -0,0 +1,18 @@
+orderdetails;
- foreach ($orderdetails as $key => $details) {
- if ($details->getObsolete()) {
- unset($orderdetails[$key]);
- }
- }
-
- return $orderdetails;
+ return $this->orderdetails->filter(function (Orderdetail $orderdetail) {
+ return ! $orderdetail->getObsolete();
+ });
}
return $this->orderdetails;
diff --git a/src/Form/Filters/AttachmentFilterType.php b/src/Form/Filters/AttachmentFilterType.php
new file mode 100644
index 00000000..788e57b5
--- /dev/null
+++ b/src/Form/Filters/AttachmentFilterType.php
@@ -0,0 +1,102 @@
+setDefaults([
+ 'compound' => true,
+ 'data_class' => AttachmentFilter::class,
+ 'csrf_protection' => false,
+ ]);
+ }
+
+ public function buildForm(FormBuilderInterface $builder, array $options)
+ {
+ $builder->add('dbId', NumberConstraintType::class, [
+ 'label' => 'part.filter.dbId',
+ 'min' => 1,
+ 'step' => 1,
+ ]);
+
+ $builder->add('name', TextConstraintType::class, [
+ 'label' => 'attachment.edit.name',
+ ]);
+
+ $builder->add('targetType', InstanceOfConstraintType::class, [
+ 'label' => 'attachment.table.element_type',
+ 'choices' => [
+ 'part.label' => PartAttachment::class,
+ 'attachment_type.label' => AttachmentTypeAttachment::class,
+ 'category.label' => CategoryAttachment::class,
+ 'currency.label' => CurrencyAttachment::class,
+ 'device.label' => DeviceAttachment::class,
+ 'footprint.label' => FootprintAttachment::class,
+ 'group.label' => GroupAttachment::class,
+ 'label_profile.label' => LabelAttachment::class,
+ 'manufacturer.label' => Manufacturer::class,
+ 'measurement_unit.label' => MeasurementUnit::class,
+ 'storelocation.label' => StorelocationAttachment::class,
+ 'supplier.label' => SupplierAttachment::class,
+ 'user.label' => UserAttachment::class,
+ ]
+ ]);
+
+ $builder->add('attachmentType', StructuralEntityConstraintType::class, [
+ 'label' => 'attachment.attachment_type',
+ 'entity_class' => AttachmentType::class
+ ]);
+
+ $builder->add('showInTable', BooleanConstraintType::class, [
+ 'label' => 'attachment.edit.show_in_table'
+ ]);
+
+ $builder->add('lastModified', DateTimeConstraintType::class, [
+ 'label' => 'lastModified'
+ ]);
+
+ $builder->add('addedDate', DateTimeConstraintType::class, [
+ 'label' => 'createdAt'
+ ]);
+
+ $builder->add('submit', SubmitType::class, [
+ 'label' => 'filter.submit',
+ ]);
+
+ $builder->add('discard', ResetType::class, [
+ 'label' => 'filter.discard',
+ ]);
+ }
+}
\ No newline at end of file
diff --git a/src/Form/Filters/Constraints/BooleanConstraintType.php b/src/Form/Filters/Constraints/BooleanConstraintType.php
new file mode 100644
index 00000000..0ad27372
--- /dev/null
+++ b/src/Form/Filters/Constraints/BooleanConstraintType.php
@@ -0,0 +1,28 @@
+setDefaults([
+ 'compound' => true,
+ 'data_class' => BooleanConstraint::class,
+ ]);
+ }
+
+ public function buildForm(FormBuilderInterface $builder, array $options): void
+ {
+ $builder->add('value', TriStateCheckboxType::class, [
+ 'label' => $options['label'],
+ 'required' => false,
+ ]);
+ }
+}
\ No newline at end of file
diff --git a/src/Form/Filters/Constraints/ChoiceConstraintType.php b/src/Form/Filters/Constraints/ChoiceConstraintType.php
new file mode 100644
index 00000000..c9e3320b
--- /dev/null
+++ b/src/Form/Filters/Constraints/ChoiceConstraintType.php
@@ -0,0 +1,48 @@
+setRequired('choices');
+ $resolver->setAllowedTypes('choices', 'array');
+
+ $resolver->setDefaults([
+ 'compound' => true,
+ 'data_class' => ChoiceConstraint::class,
+ ]);
+
+ }
+
+ public function buildForm(FormBuilderInterface $builder, array $options): void
+ {
+ $choices = [
+ '' => '',
+ 'filter.choice_constraint.operator.ANY' => 'ANY',
+ 'filter.choice_constraint.operator.NONE' => 'NONE',
+ ];
+
+ $builder->add('operator', ChoiceType::class, [
+ 'choices' => $choices,
+ 'required' => false,
+ ]);
+
+ $builder->add('value', ChoiceType::class, [
+ 'choices' => $options['choices'],
+ 'required' => false,
+ 'multiple' => true,
+ 'attr' => [
+ 'data-controller' => 'elements--select-multiple',
+ ]
+ ]);
+ }
+
+}
\ No newline at end of file
diff --git a/src/Form/Filters/Constraints/DateTimeConstraintType.php b/src/Form/Filters/Constraints/DateTimeConstraintType.php
new file mode 100644
index 00000000..96a3b940
--- /dev/null
+++ b/src/Form/Filters/Constraints/DateTimeConstraintType.php
@@ -0,0 +1,77 @@
+setDefaults([
+ 'compound' => true,
+ 'data_class' => DateTimeConstraint::class,
+ 'text_suffix' => '', // An suffix which is attached as text-append to the input group. This can for example be used for units
+
+ 'value1_options' => [], // Options for the first value input
+ 'value2_options' => [], // Options for the second value input
+ 'input_type' => DateTimeType::class,
+ ]);
+ }
+
+ public function buildForm(FormBuilderInterface $builder, array $options): void
+ {
+ $choices = [
+ '' => '',
+ '=' => '=',
+ '!=' => '!=',
+ '<' => '<',
+ '>' => '>',
+ '<=' => '<=',
+ '>=' => '>=',
+ 'filter.number_constraint.value.operator.BETWEEN' => 'BETWEEN',
+ ];
+
+ $builder->add('value1', $options['input_type'], array_merge_recursive([
+ 'label' => 'filter.datetime_constraint.value1',
+ 'attr' => [
+ 'placeholder' => 'filter.datetime_constraint.value1',
+ ],
+ 'required' => false,
+ 'html5' => true,
+ 'widget' => 'single_text',
+ ], $options['value1_options']));
+
+ $builder->add('value2', $options['input_type'], array_merge_recursive([
+ 'label' => 'filter.datetime_constraint.value2',
+ 'attr' => [
+ 'placeholder' => 'filter.datetime_constraint.value2',
+ ],
+ 'required' => false,
+ 'html5' => true,
+ 'widget' => 'single_text',
+ ], $options['value2_options']));
+
+ $builder->add('operator', ChoiceType::class, [
+ 'label' => 'filter.datetime_constraint.operator',
+ 'choices' => $choices,
+ 'required' => false,
+ ]);
+ }
+
+ public function buildView(FormView $view, FormInterface $form, array $options)
+ {
+ parent::buildView($view, $form, $options);
+
+ $view->vars['text_suffix'] = $options['text_suffix'];
+ }
+}
\ No newline at end of file
diff --git a/src/Form/Filters/Constraints/InstanceOfConstraintType.php b/src/Form/Filters/Constraints/InstanceOfConstraintType.php
new file mode 100644
index 00000000..666ae563
--- /dev/null
+++ b/src/Form/Filters/Constraints/InstanceOfConstraintType.php
@@ -0,0 +1,30 @@
+em = $entityManager;
+ }
+
+ public function configureOptions(OptionsResolver $resolver)
+ {
+ $resolver->setDefault('data_class', InstanceOfConstraint::class);
+ }
+
+ public function getParent()
+ {
+ return ChoiceConstraintType::class;
+ }
+}
\ No newline at end of file
diff --git a/src/Form/Filters/Constraints/NumberConstraintType.php b/src/Form/Filters/Constraints/NumberConstraintType.php
new file mode 100644
index 00000000..8a76d01c
--- /dev/null
+++ b/src/Form/Filters/Constraints/NumberConstraintType.php
@@ -0,0 +1,82 @@
+ '',
+ '=' => '=',
+ '!=' => '!=',
+ '<' => '<',
+ '>' => '>',
+ '<=' => '<=',
+ '>=' => '>=',
+ 'filter.number_constraint.value.operator.BETWEEN' => 'BETWEEN',
+ ];
+
+ public function configureOptions(OptionsResolver $resolver): void
+ {
+ $resolver->setDefaults([
+ 'compound' => true,
+ 'data_class' => NumberConstraint::class,
+ 'text_suffix' => '', // An suffix which is attached as text-append to the input group. This can for example be used for units
+
+ 'min' => null,
+ 'max' => null,
+ 'step' => 'any',
+
+ 'value1_options' => [], // Options for the first value input
+ 'value2_options' => [], // Options for the second value input
+ ]);
+ }
+
+ public function buildForm(FormBuilderInterface $builder, array $options): void
+ {
+ $builder->add('value1', NumberType::class, array_merge_recursive([
+ 'label' => 'filter.number_constraint.value1',
+ 'attr' => [
+ 'placeholder' => 'filter.number_constraint.value1',
+ 'max' => $options['max'],
+ 'min' => $options['min'],
+ 'step' => $options['step'],
+ ],
+ 'required' => false,
+ 'html5' => true,
+ ], $options['value1_options']));
+
+ $builder->add('value2', NumberType::class, array_merge_recursive([
+ 'label' => 'filter.number_constraint.value2',
+ 'attr' => [
+ 'placeholder' => 'filter.number_constraint.value2',
+ 'max' => $options['max'],
+ 'min' => $options['min'],
+ 'step' => $options['step'],
+ ],
+ 'required' => false,
+ 'html5' => true,
+ ], $options['value2_options']));
+
+ $builder->add('operator', ChoiceType::class, [
+ 'label' => 'filter.number_constraint.operator',
+ 'choices' => static::CHOICES,
+ 'required' => false,
+ ]);
+ }
+
+ public function buildView(FormView $view, FormInterface $form, array $options)
+ {
+ parent::buildView($view, $form, $options);
+
+ $view->vars['text_suffix'] = $options['text_suffix'];
+ }
+}
\ No newline at end of file
diff --git a/src/Form/Filters/Constraints/ParameterConstraintType.php b/src/Form/Filters/Constraints/ParameterConstraintType.php
new file mode 100644
index 00000000..1a4507a6
--- /dev/null
+++ b/src/Form/Filters/Constraints/ParameterConstraintType.php
@@ -0,0 +1,62 @@
+setDefaults([
+ 'compound' => true,
+ 'data_class' => ParameterConstraint::class,
+ 'empty_data' => new ParameterConstraint(),
+ ]);
+ }
+
+ public function buildForm(FormBuilderInterface $builder, array $options): void
+ {
+ $builder->add('name', TextType::class, [
+ 'required' => false,
+ ]);
+
+ $builder->add('unit', SearchType::class, [
+ 'required' => false,
+ ]);
+
+ $builder->add('symbol', SearchType::class, [
+ 'required' => false
+ ]);
+
+ $builder->add('value_text', TextConstraintType::class, [
+ //'required' => false,
+ ] );
+
+ $builder->add('value', ParameterValueConstraintType::class, [
+ ]);
+
+ /*
+ * I am not quite sure why this is needed, but somehow symfony tries to create a new instance of TextConstraint
+ * instead of using the existing one for the prototype (or the one from empty data). This fails as the constructor of TextConstraint requires
+ * arguments.
+ * Ensure that the data is never null, but use an empty ParameterConstraint instead
+ */
+ $builder->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) {
+ $form = $event->getForm();
+ $data = $event->getData();
+
+ if ($data === null) {
+ $event->setData(new ParameterConstraint());
+ }
+ });
+ }
+}
\ No newline at end of file
diff --git a/src/Form/Filters/Constraints/ParameterValueConstraintType.php b/src/Form/Filters/Constraints/ParameterValueConstraintType.php
new file mode 100644
index 00000000..571ff9ae
--- /dev/null
+++ b/src/Form/Filters/Constraints/ParameterValueConstraintType.php
@@ -0,0 +1,33 @@
+ '',
+ 'filter.parameter_value_constraint.operator.=' => '=',
+ 'filter.parameter_value_constraint.operator.!=' => '!=',
+ 'filter.parameter_value_constraint.operator.<' => '<',
+ 'filter.parameter_value_constraint.operator.>' => '>',
+ 'filter.parameter_value_constraint.operator.<=' => '<=',
+ 'filter.parameter_value_constraint.operator.>=' => '>=',
+ 'filter.parameter_value_constraint.operator.BETWEEN' => 'BETWEEN',
+
+ //Extensions by ParameterValueConstraint
+ 'filter.parameter_value_constraint.operator.IN_RANGE' => 'IN_RANGE',
+ 'filter.parameter_value_constraint.operator.NOT_IN_RANGE' => 'NOT_IN_RANGE',
+ 'filter.parameter_value_constraint.operator.GREATER_THAN_RANGE' => 'GREATER_THAN_RANGE',
+ 'filter.parameter_value_constraint.operator.GREATER_EQUAL_RANGE' => 'GREATER_EQUAL_RANGE',
+ 'filter.parameter_value_constraint.operator.LESS_THAN_RANGE' => 'LESS_THAN_RANGE',
+ 'filter.parameter_value_constraint.operator.LESS_EQUAL_RANGE' => 'LESS_EQUAL_RANGE',
+
+ 'filter.parameter_value_constraint.operator.RANGE_IN_RANGE' => 'RANGE_IN_RANGE',
+ 'filter.parameter_value_constraint.operator.RANGE_INTERSECT_RANGE' => 'RANGE_INTERSECT_RANGE'
+ ];
+
+ public function getParent(): string
+ {
+ return NumberConstraintType::class;
+ }
+}
\ No newline at end of file
diff --git a/src/Form/Filters/Constraints/StructuralEntityConstraintType.php b/src/Form/Filters/Constraints/StructuralEntityConstraintType.php
new file mode 100644
index 00000000..4730caec
--- /dev/null
+++ b/src/Form/Filters/Constraints/StructuralEntityConstraintType.php
@@ -0,0 +1,55 @@
+setDefaults([
+ 'compound' => true,
+ 'data_class' => EntityConstraint::class,
+ 'text_suffix' => '', // An suffix which is attached as text-append to the input group. This can for example be used for units
+ ]);
+
+ $resolver->setRequired('entity_class');
+ }
+
+ public function buildForm(FormBuilderInterface $builder, array $options): void
+ {
+ $choices = [
+ '' => '',
+ 'filter.entity_constraint.operator.EQ' => '=',
+ 'filter.entity_constraint.operator.NEQ' => '!=',
+ 'filter.entity_constraint.operator.INCLUDING_CHILDREN' => 'INCLUDING_CHILDREN',
+ 'filter.entity_constraint.operator.EXCLUDING_CHILDREN' => 'EXCLUDING_CHILDREN',
+ ];
+
+ $builder->add('value', StructuralEntityType::class, [
+ 'class' => $options['entity_class'],
+ 'required' => false,
+ ]);
+
+
+ $builder->add('operator', ChoiceType::class, [
+ 'label' => 'filter.text_constraint.operator',
+ 'choices' => $choices,
+ 'required' => false,
+ ]);
+ }
+
+ public function buildView(FormView $view, FormInterface $form, array $options)
+ {
+ parent::buildView($view, $form, $options);
+ $view->vars['text_suffix'] = $options['text_suffix'];
+ }
+}
\ No newline at end of file
diff --git a/src/Form/Filters/Constraints/TagsConstraintType.php b/src/Form/Filters/Constraints/TagsConstraintType.php
new file mode 100644
index 00000000..c5c9d043
--- /dev/null
+++ b/src/Form/Filters/Constraints/TagsConstraintType.php
@@ -0,0 +1,56 @@
+urlGenerator = $urlGenerator;
+ }
+
+ public function configureOptions(OptionsResolver $resolver): void
+ {
+ $resolver->setDefaults([
+ 'compound' => true,
+ 'data_class' => TagsConstraint::class,
+ ]);
+ }
+
+ public function buildForm(FormBuilderInterface $builder, array $options): void
+ {
+ $choices = [
+ '' => '',
+ 'filter.tags_constraint.operator.ANY' => 'ANY',
+ 'filter.tags_constraint.operator.ALL' => 'ALL',
+ 'filter.tags_constraint.operator.NONE' => 'NONE'
+ ];
+
+ $builder->add('value', SearchType::class, [
+ 'attr' => [
+ 'class' => 'tagsinput',
+ 'data-controller' => 'elements--tagsinput',
+ 'data-autocomplete' => $this->urlGenerator->generate('typeahead_tags', ['query' => '__QUERY__']),
+ ],
+ 'required' => false,
+ 'empty_data' => '',
+ ]);
+
+
+ $builder->add('operator', ChoiceType::class, [
+ 'label' => 'filter.text_constraint.operator',
+ 'choices' => $choices,
+ 'required' => false,
+ ]);
+ }
+}
\ No newline at end of file
diff --git a/src/Form/Filters/Constraints/TextConstraintType.php b/src/Form/Filters/Constraints/TextConstraintType.php
new file mode 100644
index 00000000..c4b16d51
--- /dev/null
+++ b/src/Form/Filters/Constraints/TextConstraintType.php
@@ -0,0 +1,61 @@
+setDefaults([
+ 'compound' => true,
+ 'data_class' => TextConstraint::class,
+ 'text_suffix' => '', // An suffix which is attached as text-append to the input group. This can for example be used for units
+ ]);
+ }
+
+ public function buildForm(FormBuilderInterface $builder, array $options): void
+ {
+ $choices = [
+ '' => '',
+ 'filter.text_constraint.value.operator.EQ' => '=',
+ 'filter.text_constraint.value.operator.NEQ' => '!=',
+ 'filter.text_constraint.value.operator.STARTS' => 'STARTS',
+ 'filter.text_constraint.value.operator.ENDS' => 'ENDS',
+ 'filter.text_constraint.value.operator.CONTAINS' => 'CONTAINS',
+ 'filter.text_constraint.value.operator.LIKE' => 'LIKE',
+ 'filter.text_constraint.value.operator.REGEX' => 'REGEX',
+ ];
+
+ $builder->add('value', SearchType::class, [
+ 'attr' => [
+ 'placeholder' => 'filter.text_constraint.value',
+ ],
+ 'required' => false,
+ 'empty_data' => '',
+ ]);
+
+
+ $builder->add('operator', ChoiceType::class, [
+ 'label' => 'filter.text_constraint.operator',
+ 'choices' => $choices,
+ 'required' => false,
+ ]);
+ }
+
+ public function buildView(FormView $view, FormInterface $form, array $options)
+ {
+ parent::buildView($view, $form, $options);
+
+ $view->vars['text_suffix'] = $options['text_suffix'];
+ }
+}
\ No newline at end of file
diff --git a/src/Form/Filters/Constraints/UserEntityConstraintType.php b/src/Form/Filters/Constraints/UserEntityConstraintType.php
new file mode 100644
index 00000000..048204ad
--- /dev/null
+++ b/src/Form/Filters/Constraints/UserEntityConstraintType.php
@@ -0,0 +1,59 @@
+setDefaults([
+ 'compound' => true,
+ 'data_class' => EntityConstraint::class,
+ 'text_suffix' => '', // An suffix which is attached as text-append to the input group. This can for example be used for units
+ ]);
+ }
+
+ public function buildForm(FormBuilderInterface $builder, array $options): void
+ {
+ $choices = [
+ '' => '',
+ 'filter.entity_constraint.operator.EQ' => '=',
+ 'filter.entity_constraint.operator.NEQ' => '!=',
+ ];
+
+ $builder->add('value', EntityType::class, [
+ 'class' => User::class,
+ 'required' => false,
+ 'attr' => [
+ 'data-controller' => 'elements--selectpicker',
+ 'data-live-search' => true,
+ 'title' => 'selectpicker.nothing_selected',
+ ]
+ ]);
+
+
+ $builder->add('operator', ChoiceType::class, [
+ 'label' => 'filter.text_constraint.operator',
+ 'choices' => $choices,
+ 'required' => false,
+ ]);
+ }
+
+ public function buildView(FormView $view, FormInterface $form, array $options)
+ {
+ parent::buildView($view, $form, $options);
+ $view->vars['text_suffix'] = $options['text_suffix'];
+ }
+}
\ No newline at end of file
diff --git a/src/Form/Filters/LogFilterType.php b/src/Form/Filters/LogFilterType.php
new file mode 100644
index 00000000..60371a38
--- /dev/null
+++ b/src/Form/Filters/LogFilterType.php
@@ -0,0 +1,152 @@
+ AbstractLogEntry::LEVEL_DEBUG,
+ 'log.level.info' => AbstractLogEntry::LEVEL_INFO,
+ 'log.level.notice' => AbstractLogEntry::LEVEL_NOTICE,
+ 'log.level.warning' => AbstractLogEntry::LEVEL_WARNING,
+ 'log.level.error' => AbstractLogEntry::LEVEL_ERROR,
+ 'log.level.critical' => AbstractLogEntry::LEVEL_CRITICAL,
+ 'log.level.alert' => AbstractLogEntry::LEVEL_ALERT,
+ 'log.level.emergency' => AbstractLogEntry::LEVEL_EMERGENCY,
+ ];
+
+ protected const TARGET_TYPE_CHOICES = [
+ 'log.type.collection_element_deleted' => CollectionElementDeleted::class,
+ 'log.type.database_updated' => DatabaseUpdatedLogEntry::class,
+ 'log.type.element_created' => ElementCreatedLogEntry::class,
+ 'log.type.element_deleted' => ElementDeletedLogEntry::class,
+ 'log.type.element_edited' => ElementEditedLogEntry::class,
+ 'log.type.security' => SecurityEventLogEntry::class,
+ 'log.type.user_login' => UserLoginLogEntry::class,
+ 'log.type.user_logout' => UserLogoutLogEntry::class,
+ 'log.type.user_not_allowed' => UserNotAllowedLogEntry::class,
+
+ //Legacy entries
+ 'log.type.instock_changed' => InstockChangedLogEntry::class,
+ ];
+
+ public function configureOptions(OptionsResolver $resolver): void
+ {
+ $resolver->setDefaults([
+ 'compound' => true,
+ 'data_class' => LogFilter::class,
+ 'csrf_protection' => false,
+ ]);
+ }
+
+ public function buildForm(FormBuilderInterface $builder, array $options)
+ {
+ $builder->add('dbId', NumberConstraintType::class, [
+ 'label' => 'part.filter.dbId',
+ 'min' => 1,
+ 'step' => 1,
+ ]);
+
+ $builder->add('timestamp', DateTimeConstraintType::class, [
+ 'label' => 'log.timestamp',
+ ]);
+
+
+
+ $builder->add('level', ChoiceConstraintType::class, [
+ 'label' => 'log.level',
+ 'choices' => self::LEVEL_CHOICES,
+ ]);
+
+ $builder->add('eventType', InstanceOfConstraintType::class, [
+ 'label' => 'log.type',
+ 'choices' => self::TARGET_TYPE_CHOICES
+ ]);
+
+ $builder->add('user', UserEntityConstraintType::class, [
+ 'label' => 'log.user',
+ ]);
+
+ $builder->add('targetType', ChoiceConstraintType::class, [
+ 'label' => 'log.target_type',
+ 'choices' => [
+ 'user.label' => AbstractLogEntry::targetTypeClassToID(User::class),
+ 'attachment.label' => AbstractLogEntry::targetTypeClassToID(Attachment::class),
+ 'attachment_type.label' => AbstractLogEntry::targetTypeClassToID(AttachmentType::class),
+ 'category.label' => AbstractLogEntry::targetTypeClassToID(Category::class),
+ 'device.label' => AbstractLogEntry::targetTypeClassToID(Device::class),
+ 'device_part.label' => AbstractLogEntry::targetTypeClassToID(DevicePart::class),
+ 'footprint.label' => AbstractLogEntry::targetTypeClassToID(Footprint::class),
+ 'group.label' => AbstractLogEntry::targetTypeClassToID(Group::class),
+ 'manufacturer.label' => AbstractLogEntry::targetTypeClassToID(Manufacturer::class),
+ 'part.label' => AbstractLogEntry::targetTypeClassToID(Part::class),
+ 'storelocation.label' => AbstractLogEntry::targetTypeClassToID(Storelocation::class),
+ 'supplier.label' => AbstractLogEntry::targetTypeClassToID(Supplier::class),
+ 'part_lot.label' => AbstractLogEntry::targetTypeClassToID(PartLot::class),
+ 'currency.label' => AbstractLogEntry::targetTypeClassToID(Currency::class),
+ 'orderdetail.label' => AbstractLogEntry::targetTypeClassToID(Orderdetail::class),
+ 'pricedetail.label' => AbstractLogEntry::targetTypeClassToID(Pricedetail::class),
+ 'measurement_unit.label' => AbstractLogEntry::targetTypeClassToID(MeasurementUnit::class),
+ 'parameter.label' => AbstractLogEntry::targetTypeClassToID(AbstractParameter::class),
+ 'label_profile.label' => AbstractLogEntry::targetTypeClassToID(LabelProfile::class),
+ ]
+ ]);
+
+ $builder->add('targetId', NumberConstraintType::class, [
+ 'label' => 'log.target_id',
+ 'min' => 1,
+ 'step' => 1,
+ ]);
+
+ $builder->add('submit', SubmitType::class, [
+ 'label' => 'filter.submit',
+ ]);
+
+ $builder->add('discard', ResetType::class, [
+ 'label' => 'filter.discard',
+ ]);
+ }
+}
\ No newline at end of file
diff --git a/src/Form/Filters/PartFilterType.php b/src/Form/Filters/PartFilterType.php
new file mode 100644
index 00000000..99948355
--- /dev/null
+++ b/src/Form/Filters/PartFilterType.php
@@ -0,0 +1,249 @@
+setDefaults([
+ 'compound' => true,
+ 'data_class' => PartFilter::class,
+ 'csrf_protection' => false,
+ ]);
+ }
+
+ public function buildForm(FormBuilderInterface $builder, array $options)
+ {
+ /*
+ * Common tab
+ */
+
+ $builder->add('name', TextConstraintType::class, [
+ 'label' => 'part.edit.name',
+ ]);
+
+ $builder->add('description', TextConstraintType::class, [
+ 'label' => 'part.edit.description',
+ ]);
+
+ $builder->add('category', StructuralEntityConstraintType::class, [
+ 'label' => 'part.edit.category',
+ 'entity_class' => Category::class
+ ]);
+
+ $builder->add('footprint', StructuralEntityConstraintType::class, [
+ 'label' => 'part.edit.footprint',
+ 'entity_class' => Footprint::class
+ ]);
+
+ $builder->add('tags', TagsConstraintType::class, [
+ 'label' => 'part.edit.tags'
+ ]);
+
+ $builder->add('comment', TextConstraintType::class, [
+ 'label' => 'part.edit.comment'
+ ]);
+
+ /*
+ * Advanced tab
+ */
+
+ $builder->add('dbId', NumberConstraintType::class, [
+ 'label' => 'part.filter.dbId',
+ 'min' => 1,
+ 'step' => 1,
+ ]);
+
+ $builder->add('favorite', BooleanConstraintType::class, [
+ 'label' => 'part.edit.is_favorite'
+ ]);
+
+ $builder->add('needsReview', BooleanConstraintType::class, [
+ 'label' => 'part.edit.needs_review'
+ ]);
+
+ $builder->add('mass', NumberConstraintType::class, [
+ 'label' => 'part.edit.mass',
+ 'text_suffix' => 'g',
+ 'min' => 0,
+ ]);
+
+ $builder->add('measurementUnit', StructuralEntityConstraintType::class, [
+ 'label' => 'part.edit.partUnit',
+ 'entity_class' => MeasurementUnit::class
+ ]);
+
+ $builder->add('lastModified', DateTimeConstraintType::class, [
+ 'label' => 'lastModified'
+ ]);
+
+ $builder->add('addedDate', DateTimeConstraintType::class, [
+ 'label' => 'createdAt'
+ ]);
+
+
+ /*
+ * Manufacturer tab
+ */
+
+ $builder->add('manufacturer', StructuralEntityConstraintType::class, [
+ 'label' => 'part.edit.manufacturer.label',
+ 'entity_class' => Manufacturer::class
+ ]);
+
+ $builder->add('manufacturer_product_url', TextConstraintType::class, [
+ 'label' => 'part.edit.manufacturer_url.label'
+ ]);
+
+ $builder->add('manufacturer_product_number', TextConstraintType::class, [
+ 'label' => 'part.edit.mpn'
+ ]);
+
+ $status_choices = [
+ 'm_status.unknown' => '',
+ 'm_status.announced' => 'announced',
+ 'm_status.active' => 'active',
+ 'm_status.nrfnd' => 'nrfnd',
+ 'm_status.eol' => 'eol',
+ 'm_status.discontinued' => 'discontinued',
+ ];
+
+ $builder->add('manufacturing_status', ChoiceConstraintType::class, [
+ 'label' => 'part.edit.manufacturing_status',
+ 'choices' => $status_choices,
+ ]);
+
+ /*
+ * Purchasee informations
+ */
+
+ $builder->add('supplier', StructuralEntityConstraintType::class, [
+ 'label' => 'supplier.label',
+ 'entity_class' => Manufacturer::class
+ ]);
+
+ $builder->add('orderdetailsCount', NumberConstraintType::class, [
+ 'label' => 'part.filter.orderdetails_count',
+ 'step' => 1,
+ 'min' => 0,
+ ]);
+
+ $builder->add('obsolete', BooleanConstraintType::class, [
+ 'label' => 'orderdetails.edit.obsolete'
+ ]);
+
+ /*
+ * Stocks tabs
+ */
+ $builder->add('storelocation', StructuralEntityConstraintType::class, [
+ 'label' => 'storelocation.label',
+ 'entity_class' => Storelocation::class
+ ]);
+
+ $builder->add('minAmount', NumberConstraintType::class, [
+ 'label' => 'part.edit.mininstock',
+ 'min' => 0,
+ ]);
+
+ $builder->add('lotCount', NumberConstraintType::class, [
+ 'label' => 'part.filter.lot_count',
+ 'min' => 0,
+ 'step' => 1,
+ ]);
+
+ $builder->add('amountSum', NumberConstraintType::class, [
+ 'label' => 'part.filter.amount_sum',
+ 'min' => 0,
+ ]);
+
+ $builder->add('lotNeedsRefill', BooleanConstraintType::class, [
+ 'label' => 'part.filter.lotNeedsRefill'
+ ]);
+
+ $builder->add('lotUnknownAmount', BooleanConstraintType::class, [
+ 'label' => 'part.filter.lotUnknwonAmount'
+ ]);
+
+ $builder->add('lotExpirationDate', DateTimeConstraintType::class, [
+ 'label' => 'part.filter.lotExpirationDate',
+ 'input_type' => DateType::class,
+ ]);
+
+ $builder->add('lotDescription', TextConstraintType::class, [
+ 'label' => 'part.filter.lotDescription',
+ ]);
+
+ /**
+ * Attachments count
+ */
+ $builder->add('attachmentsCount', NumberConstraintType::class, [
+ 'label' => 'part.filter.attachments_count',
+ 'step' => 1,
+ 'min' => 0,
+ ]);
+
+ $builder->add('attachmentType', StructuralEntityConstraintType::class, [
+ 'label' => 'attachment.attachment_type',
+ 'entity_class' => AttachmentType::class
+ ]);
+
+ $builder->add('attachmentName', TextConstraintType::class, [
+ 'label' => 'part.filter.attachmentName',
+ ]);
+
+ $constraint_prototype = new ParameterConstraint();
+
+ $builder->add('parameters', CollectionType::class, [
+ 'label' => false,
+ 'entry_type' => ParameterConstraintType::class,
+ 'allow_delete' => true,
+ 'allow_add' => true,
+ 'reindex_enable' => false,
+ 'prototype_data' => $constraint_prototype,
+ 'empty_data' => $constraint_prototype,
+ ]);
+
+ $builder->add('parametersCount', NumberConstraintType::class, [
+ 'label' => 'part.filter.parameters_count',
+ 'step' => 1,
+ 'min' => 0,
+ ]);
+
+ $builder->add('submit', SubmitType::class, [
+ 'label' => 'filter.submit',
+ ]);
+
+ $builder->add('discard', ResetType::class, [
+ 'label' => 'filter.discard',
+ ]);
+
+ }
+}
\ No newline at end of file
diff --git a/src/Form/ParameterType.php b/src/Form/ParameterType.php
index 413df3e4..e8e6db1c 100644
--- a/src/Form/ParameterType.php
+++ b/src/Form/ParameterType.php
@@ -24,10 +24,23 @@ declare(strict_types=1);
namespace App\Form;
use App\Entity\Parameters\AbstractParameter;
+use App\Entity\Parameters\AttachmentTypeParameter;
+use App\Entity\Parameters\CategoryParameter;
+use App\Entity\Parameters\CurrencyParameter;
+use App\Entity\Parameters\DeviceParameter;
+use App\Entity\Parameters\FootprintParameter;
+use App\Entity\Parameters\GroupParameter;
+use App\Entity\Parameters\ManufacturerParameter;
+use App\Entity\Parameters\PartParameter;
+use App\Entity\Parameters\StorelocationParameter;
+use App\Entity\Parameters\SupplierParameter;
+use App\Entity\Parts\MeasurementUnit;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\Type\NumberType;
use Symfony\Component\Form\Extension\Core\Type\TextType;
use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Form\FormView;
use Symfony\Component\OptionsResolver\OptionsResolver;
class ParameterType extends AbstractType
@@ -117,6 +130,32 @@ class ParameterType extends AbstractType
]);
}
+ public function finishView(FormView $view, FormInterface $form, array $options)
+ {
+ //By default use part parameters for autocomplete
+ $view->vars['type'] = 'part';
+
+ $map = [
+ PartParameter::class => 'part',
+ AttachmentTypeParameter::class => 'attachment_type',
+ CategoryParameter::class => 'category',
+ CurrencyParameter::class => 'currency',
+ DeviceParameter::class => 'device',
+ FootprintParameter::class => 'footprint',
+ GroupParameter::class => 'group',
+ ManufacturerParameter::class => 'manufacturer',
+ MeasurementUnit::class => 'measurement_unit',
+ StorelocationParameter::class => 'storelocation',
+ SupplierParameter::class => 'supplier',
+ ];
+
+ if (isset($map[$options['data_class']])) {
+ $view->vars['type'] = $map[$options['data_class']];
+ }
+
+ parent::finishView($view, $form, $options); // TODO: Change the autogenerated stub
+ }
+
public function configureOptions(OptionsResolver $resolver): void
{
$resolver->setDefaults([
diff --git a/src/Form/Type/TriStateCheckboxType.php b/src/Form/Type/TriStateCheckboxType.php
index 87bdc473..9b3b2514 100644
--- a/src/Form/Type/TriStateCheckboxType.php
+++ b/src/Form/Type/TriStateCheckboxType.php
@@ -171,10 +171,10 @@ final class TriStateCheckboxType extends AbstractType implements DataTransformer
case 'true':
return true;
case 'false':
- case '':
return false;
case 'indeterminate':
case 'null':
+ case '':
return null;
default:
throw new InvalidArgumentException('Invalid value encountered!: '.$value);
diff --git a/src/Repository/AbstractPartsContainingRepository.php b/src/Repository/AbstractPartsContainingRepository.php
index adb7c828..88b9d021 100644
--- a/src/Repository/AbstractPartsContainingRepository.php
+++ b/src/Repository/AbstractPartsContainingRepository.php
@@ -33,7 +33,7 @@ abstract class AbstractPartsContainingRepository extends StructuralDBElementRepo
* @param object $element the element for which the parts should be determined
* @param array $order_by The order of the parts. Format ['name' => 'ASC']
*
- * @return Part
+ * @return Part[]
*/
abstract public function getParts(object $element, array $order_by = ['name' => 'ASC']): array;
diff --git a/src/Repository/ParameterRepository.php b/src/Repository/ParameterRepository.php
new file mode 100644
index 00000000..36ee2ff8
--- /dev/null
+++ b/src/Repository/ParameterRepository.php
@@ -0,0 +1,33 @@
+createQueryBuilder('parameter');
+
+ $qb->distinct()
+ ->select('parameter.name')
+ ->addSelect('parameter.symbol')
+ ->addSelect('parameter.unit')
+ ->where('parameter.name LIKE :name');
+ if ($exact) {
+ $qb->setParameter('name', $name);
+ } else {
+ $qb->setParameter('name', '%'.$name.'%');
+ }
+
+ $qb->setMaxResults($max_results);
+
+ return $qb->getQuery()->getArrayResult();
+ }
+}
\ No newline at end of file
diff --git a/src/Services/Trees/NodesListBuilder.php b/src/Services/Trees/NodesListBuilder.php
index 3bb13486..0af0341c 100644
--- a/src/Services/Trees/NodesListBuilder.php
+++ b/src/Services/Trees/NodesListBuilder.php
@@ -84,10 +84,20 @@ class NodesListBuilder
return $this->cache->get($key, function (ItemInterface $item) use ($class_name, $parent, $secure_class_name) {
// Invalidate when groups, a element with the class or the user changes
$item->tag(['groups', 'tree_list', $this->keyGenerator->generateKey(), $secure_class_name]);
- /** @var StructuralDBElementRepository */
- $repo = $this->em->getRepository($class_name);
-
- return $repo->toNodesList($parent);
+ return $this->em->getRepository($class_name)->toNodesList($parent);
});
}
+
+ /**
+ * Returns a flattened list of all (recursive) children elements of the given AbstractStructuralDBElement.
+ * The value is cached for performance reasons.
+ *
+ * @template T of AbstractStructuralDBElement
+ * @param T $element
+ * @return T[]
+ */
+ public function getChildrenFlatList(AbstractStructuralDBElement $element): array
+ {
+ return $this->typeToNodesList(get_class($element), $element);
+ }
}
diff --git a/src/Twig/AppExtension.php b/src/Twig/AppExtension.php
index 578984f4..3e399e91 100644
--- a/src/Twig/AppExtension.php
+++ b/src/Twig/AppExtension.php
@@ -42,9 +42,20 @@ declare(strict_types=1);
namespace App\Twig;
+use App\Entity\Attachments\Attachment;
use App\Entity\Base\AbstractDBElement;
+use App\Entity\Devices\Device;
+use App\Entity\LabelSystem\LabelProfile;
+use App\Entity\Parts\Category;
+use App\Entity\Parts\Footprint;
+use App\Entity\Parts\Manufacturer;
use App\Entity\Parts\MeasurementUnit;
+use App\Entity\Parts\Part;
+use App\Entity\Parts\Storelocation;
+use App\Entity\Parts\Supplier;
use App\Entity\PriceInformations\Currency;
+use App\Entity\UserSystem\Group;
+use App\Entity\UserSystem\User;
use App\Services\AmountFormatter;
use App\Services\Attachments\AttachmentURLGenerator;
use App\Services\EntityURLGenerator;
@@ -54,6 +65,7 @@ use App\Services\MoneyFormatter;
use App\Services\SIFormatter;
use App\Services\Trees\TreeViewGenerator;
use Brick\Math\BigDecimal;
+use Symfony\Component\Serializer\Normalizer\ObjectNormalizer;
use Symfony\Component\Serializer\SerializerInterface;
use Symfony\Contracts\Translation\TranslatorInterface;
use Twig\Extension\AbstractExtension;
@@ -76,12 +88,14 @@ class AppExtension extends AbstractExtension
protected $FAIconGenerator;
protected $translator;
+ protected $objectNormalizer;
+
public function __construct(EntityURLGenerator $entityURLGenerator, MarkdownParser $markdownParser,
SerializerInterface $serializer, TreeViewGenerator $treeBuilder,
MoneyFormatter $moneyFormatter,
SIFormatter $SIFormatter, AmountFormatter $amountFormatter,
AttachmentURLGenerator $attachmentURLGenerator,
- FAIconGenerator $FAIconGenerator, TranslatorInterface $translator)
+ FAIconGenerator $FAIconGenerator, TranslatorInterface $translator, ObjectNormalizer $objectNormalizer)
{
$this->entityURLGenerator = $entityURLGenerator;
$this->markdownParser = $markdownParser;
@@ -93,6 +107,8 @@ class AppExtension extends AbstractExtension
$this->attachmentURLGenerator = $attachmentURLGenerator;
$this->FAIconGenerator = $FAIconGenerator;
$this->translator = $translator;
+
+ $this->objectNormalizer = $objectNormalizer;
}
public function getFilters(): array
@@ -107,6 +123,8 @@ class AppExtension extends AbstractExtension
new TwigFilter('siFormat', [$this, 'siFormat']),
new TwigFilter('amountFormat', [$this, 'amountFormat']),
new TwigFilter('loginPath', [$this, 'loginPath']),
+
+ new TwigFilter('toArray', [$this, 'toArray'])
];
}
@@ -116,6 +134,12 @@ class AppExtension extends AbstractExtension
new TwigTest('instanceof', static function ($var, $instance) {
return $var instanceof $instance;
}),
+ new TwigTest('entity', static function ($var) {
+ return $var instanceof AbstractDBElement;
+ }),
+ new TwigTest('object', static function ($var) {
+ return is_object($var);
+ }),
];
}
@@ -125,9 +149,31 @@ class AppExtension extends AbstractExtension
new TwigFunction('generateTreeData', [$this, 'treeData']),
new TwigFunction('attachment_thumbnail', [$this->attachmentURLGenerator, 'getThumbnailURL']),
new TwigFunction('ext_to_fa_icon', [$this->FAIconGenerator, 'fileExtensionToFAType']),
+ new TwigFunction('entity_type', [$this, 'getEntityType']),
];
}
+ public function getEntityType($entity): ?string
+ {
+ $map = [
+ Part::class => 'part',
+ Footprint::class => 'footprint',
+ Storelocation::class => 'storelocation',
+ Manufacturer::class => 'manufacturer',
+ Category::class => 'category',
+ Device::class => 'device',
+ Attachment::class => 'attachment',
+ Supplier::class => 'supplier',
+ User::class => 'user',
+ Group::class => 'group',
+ Currency::class => 'currency',
+ MeasurementUnit::class => 'measurement_unit',
+ LabelProfile::class => 'label_profile',
+ ];
+
+ return $map[get_class($entity)] ?? null;
+ }
+
public function treeData(AbstractDBElement $element, string $type = 'newEdit'): string
{
$tree = $this->treeBuilder->getTreeView(get_class($element), null, $type, $element);
@@ -135,6 +181,11 @@ class AppExtension extends AbstractExtension
return json_encode($tree, JSON_THROW_ON_ERROR);
}
+ public function toArray($object): array
+ {
+ return $this->objectNormalizer->normalize($object, null);
+ }
+
/**
* This function/filter generates an path.
*/
diff --git a/templates/Form/FilterTypesLayout.html.twig b/templates/Form/FilterTypesLayout.html.twig
new file mode 100644
index 00000000..2be7e55c
--- /dev/null
+++ b/templates/Form/FilterTypesLayout.html.twig
@@ -0,0 +1,62 @@
+{% block number_constraint_widget %}
+
+ {{ form_widget(form.operator, {"attr": {
+ "class": "form-select",
+ "data-filters--number-constraint-target": "operator",
+ "data-action": "change->filters--number-constraint#update"
+ }}) }}
+ {{ form_widget(form.value1) }}
+ {% trans %}filter.number_constraint.AND{% endtrans %}
+ {{ form_widget(form.value2, {"attr": {"class": "d-none", "data-filters--number-constraint-target": "thingsToHide"}}) }}
+ {% if form.vars["text_suffix"] %}
+ {{ form.vars["text_suffix"] }}
+ {% endif %}
+
+{% endblock %}
+
+{% block text_constraint_widget %}
+
+ {{ form_widget(form.operator, {"attr": {"class": "form-select"}}) }}
+ {{ form_widget(form.value) }}
+ {% if form.vars["text_suffix"] is defined and form.vars["text_suffix"] %}
+ {{ form.vars["text_suffix"] }}
+ {% endif %}
+
+{% endblock %}
+
+{% block structural_entity_constraint_widget %}
+ {{ block('text_constraint_widget') }}
+{% endblock %}
+
+{% block user_entity_constraint_widget %}
+ {{ block('text_constraint_widget') }}
+{% endblock %}
+
+{% block date_time_constraint_widget %}
+ {{ block('number_constraint_widget') }}
+{% endblock %}
+
+{% block tags_constraint_widget %}
+ {{ block('text_constraint_widget') }}
+{% endblock %}
+
+{% block choice_constraint_widget %}
+ {{ block('text_constraint_widget') }}
+{% endblock %}
+
+{% block parameter_constraint_widget %}
+ {% import 'components/collection_type.macro.html.twig' as collection %}
+
+ {{ form_widget(form.name, {"attr": {"data-pages--parameters-autocomplete-target": "name"}}) }}
+ {{ form_widget(form.symbol, {"attr": {"data-pages--parameters-autocomplete-target": "symbol", "data-pages--latex-preview-target": "input"}}) }}
+ {{ form_widget(form.value) }}
+ {{ form_widget(form.unit, {"attr": {"data-pages--parameters-autocomplete-target": "unit", "data-pages--latex-preview-target": "input"}}) }}
+ {{ form_widget(form.value_text) }}
+
+
+
+ {{ form_errors(form) }}
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/templates/LogSystem/log_list.html.twig b/templates/LogSystem/log_list.html.twig
index 5ad1d7a3..9bacfa0c 100644
--- a/templates/LogSystem/log_list.html.twig
+++ b/templates/LogSystem/log_list.html.twig
@@ -3,5 +3,53 @@
{% block title %}{% trans %}log.list.title{% endtrans %}{% endblock %}
{% block content %}
+
+
{% include "LogSystem/_log_table.html.twig" %}
{% endblock %}
\ No newline at end of file
diff --git a/templates/Parts/edit/edit_form_styles.html.twig b/templates/Parts/edit/edit_form_styles.html.twig
index 8fef44b4..47b66476 100644
--- a/templates/Parts/edit/edit_form_styles.html.twig
+++ b/templates/Parts/edit/edit_form_styles.html.twig
@@ -68,13 +68,13 @@
{% block parameter_widget %}
{% import 'components/collection_type.macro.html.twig' as collection %}
-
- {{ form_widget(form.name) }}{{ form_errors(form.name) }}
- {{ form_widget(form.symbol) }}{{ form_errors(form.symbol) }}
+
+ {{ form_widget(form.name, {"attr": {"data-pages--parameters-autocomplete-target": "name"}}) }}{{ form_errors(form.name) }}
+ {{ form_widget(form.symbol, {"attr": {"data-pages--parameters-autocomplete-target": "symbol", "data-pages--latex-preview-target": "input"}}) }}{{ form_errors(form.symbol) }}
{{ form_widget(form.value_min) }}{{ form_errors(form.value_min) }}
{{ form_widget(form.value_typical) }}{{ form_errors(form.value_typical) }}
{{ form_widget(form.value_max) }}{{ form_errors(form.value_max) }}
- {{ form_widget(form.unit) }}{{ form_errors(form.unit) }}
+ {{ form_widget(form.unit, {"attr": {"data-pages--parameters-autocomplete-target": "unit", "data-pages--latex-preview-target": "input"}}) }}{{ form_errors(form.unit) }}
{{ form_widget(form.value_text) }}{{ form_errors(form.value_text) }}
{{ form_widget(form.group) }}{{ form_errors(form.group) }}
diff --git a/templates/Parts/info/_picture.html.twig b/templates/Parts/info/_picture.html.twig
index 590e3b89..532d0f8f 100644
--- a/templates/Parts/info/_picture.html.twig
+++ b/templates/Parts/info/_picture.html.twig
@@ -1,7 +1,12 @@
{% if not pictures is empty %}
{#
+
diff --git a/templates/Parts/lists/_filter.html.twig b/templates/Parts/lists/_filter.html.twig
new file mode 100644
index 00000000..efdb238f
--- /dev/null
+++ b/templates/Parts/lists/_filter.html.twig
@@ -0,0 +1,137 @@
+
\ No newline at end of file
diff --git a/templates/Parts/lists/_info_card.html.twig b/templates/Parts/lists/_info_card.html.twig
index 33879611..1874b1be 100644
--- a/templates/Parts/lists/_info_card.html.twig
+++ b/templates/Parts/lists/_info_card.html.twig
@@ -3,131 +3,137 @@
{{ helper.breadcrumb_entity_link(entity) }}
-