diff --git a/src/Entity/LabelSystem/LabelProfile.php b/src/Entity/LabelSystem/LabelProfile.php index 441518a4..41c0703f 100644 --- a/src/Entity/LabelSystem/LabelProfile.php +++ b/src/Entity/LabelSystem/LabelProfile.php @@ -28,7 +28,7 @@ use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity; use Symfony\Component\Validator\Constraints as Assert; /** - * @ORM\Entity(repositoryClass="App\Repository\NamedDBElementRepository") + * @ORM\Entity(repositoryClass="App\Repository\LabelProfileRepository") * @ORM\Table(name="label_profiles") * @ORM\EntityListeners({"App\EntityListeners\TreeCacheInvalidationListener"}) * @UniqueEntity({"name", "options.supported_element"}) diff --git a/src/Repository/LabelProfileRepository.php b/src/Repository/LabelProfileRepository.php new file mode 100644 index 00000000..864eaba4 --- /dev/null +++ b/src/Repository/LabelProfileRepository.php @@ -0,0 +1,74 @@ +. + */ + +namespace App\Repository; + +use App\Entity\LabelSystem\LabelOptions; +use App\Entity\LabelSystem\LabelProfile; +use App\Helpers\Trees\TreeViewNode; +use Symfony\Contracts\Translation\TranslatorInterface; + +class LabelProfileRepository extends NamedDBElementRepository +{ + /** + * Gets a tree of TreeViewNode elements. The root elements has $parent as parent. + * The treeview is generic, that means the href are null and ID values are set. + * + * @return TreeViewNode[] + */ + public function getGenericNodeTree(): array + { + $result = []; + + foreach (LabelOptions::SUPPORTED_ELEMENTS as $type) { + $type_children = []; + $entities = $this->findForSupportedElement($type); + foreach ($entities as $entity) { + /** @var LabelProfile $entity */ + $node = new TreeViewNode($entity->getName(), null, null); + $node->setId($entity->getID()); + $type_children[] = $node; + } + + if (!empty($type_children)) { + //Use default label e.g. 'part_label'. $$ marks that it will be translated in TreeViewGenerator + $tmp = new TreeViewNode('$$' . $type . '.label', null, $type_children); + + $result[] = $tmp; + } + } + + return $result; + } + + /** + * Find all LabelProfiles that can be used with the given type + * @param string $type See LabelOptions::SUPPORTED_ELEMENTS for valid values. + * @param array $order_by The way the results should be sorted. By default ordered by + * @return array + */ + public function findForSupportedElement(string $type, array $order_by = ['name' => 'ASC']): array + { + if (!in_array($type, LabelOptions::SUPPORTED_ELEMENTS)) { + throw new \InvalidArgumentException('Invalid supported_element type given.'); + } + return $this->findBy(['options.supported_element' => $type], $order_by); + } +} \ No newline at end of file diff --git a/src/Services/Trees/TreeViewGenerator.php b/src/Services/Trees/TreeViewGenerator.php index 44334cf9..1aff2ab4 100644 --- a/src/Services/Trees/TreeViewGenerator.php +++ b/src/Services/Trees/TreeViewGenerator.php @@ -118,10 +118,15 @@ class TreeViewGenerator $item->addTag((string) \count($item->getNodes())); } - if (! empty($href_type)) { + if (! empty($href_type) && $item->getId() !== null) { $entity = $this->em->getPartialReference($class, $item->getId()); $item->setHref($this->urlGenerator->getURL($entity, $href_type)); } + + //Translate text if text starts with $$ + if (substr($item->getText(), 0, 2) === '$$') { + $item->setText($this->translator->trans(substr($item->getText(), 2))); + } } return array_merge($head, $generic);