diff --git a/Classes/ViewHelpers/SkillGroupingViewHelper.php b/Classes/ViewHelpers/SkillGroupingViewHelper.php index a5540c2..b2b5873 100644 --- a/Classes/ViewHelpers/SkillGroupingViewHelper.php +++ b/Classes/ViewHelpers/SkillGroupingViewHelper.php @@ -84,21 +84,30 @@ class SkillGroupingViewHelper extends AbstractViewHelper */ protected static function group(array $skills): array { - $domainTags = []; + $domainTagsWithId = []; foreach ($skills as $skill) { - $domainTags[] = isset($skill->toArray()['domainTag']) ? $skill->toArray()['domainTag']['title'] : "none"; + if (!isset($skill->toArray()['domainTag'])) { + $domainTagsWithId[] = [ + 'uid' => 0, + 'title' => 'none' + ]; + continue; + } + $domainTagsWithId[] = $skill->toArray()['domainTag']; } - $domainTags = array_unique($domainTags); + //remove items with duplicate title + $domainTagsWithId = array_map('unserialize', array_unique(array_map('serialize', $domainTagsWithId))); $result = []; - foreach ($domainTags as $domainTag) { + foreach ($domainTagsWithId as $domainTag) { $result[] = [ - 'title' => $domainTag, - 'skills' => array_filter($skills, function (Skill $skill) use ($domainTag) { + 'title' => $domainTag['title'], + 'uid' => $domainTag['uid'], + 'skills' => array_filter($skills, function ($skill) use ($domainTag) { if (!isset($skill->toArray()['domainTag'])) { - return $domainTag === "none"; + return $domainTag['title'] === 'none'; } - return $skill->toArray()['domainTag']['title'] === $domainTag; + return $skill->toArray()['domainTag']['title'] === $domainTag['title']; }) ]; } diff --git a/Resources/Private/Templates/ContentElements/SkillDisplaySkillSet.html b/Resources/Private/Templates/ContentElements/SkillDisplaySkillSet.html index 28d1736..56e7b50 100644 --- a/Resources/Private/Templates/ContentElements/SkillDisplaySkillSet.html +++ b/Resources/Private/Templates/ContentElements/SkillDisplaySkillSet.html @@ -1,14 +1,86 @@ - - - {domainGroup.title}
- - {skill.title}
+ + +
+ + +
+ + + +
+
+
+ +
+ + {settings.responsiveimages.contentelements.accordion.{domainGroup.uid}} + + + +
+ +
+
    + +
  • + {skill.title}
    + + {skill.description->f:format.html()} + + +
    +
    +

    + +

    +
    +
    + {skill.goals->f:format.html()} +
    +
    +
    +
    +
    • +     +
+
+
+
+
+
+ - - +