diff --git a/Classes/Domain/Collection/CategoryCollection.php b/Classes/Domain/Collection/CategoryCollection.php index 482270f..2ee79d6 100644 --- a/Classes/Domain/Collection/CategoryCollection.php +++ b/Classes/Domain/Collection/CategoryCollection.php @@ -27,10 +27,10 @@ class CategoryCollection implements Countable, Iterator, ArrayAccess * @var array */ protected array $typeSortedContainer = [ - CategoryTypes::TYPE_SYSTEM_CATEGORY => [], - CategoryTypes::TYPE_RESEARCH_TOPIC => [], + CategoryTypes::TYPE_COMPETENCE_FIELD => [], + CategoryTypes::TYPE_COOPERATION => [], CategoryTypes::TYPE_DEPARTMENT => [], - CategoryTypes::TYPE_INSTITUTE => [], + CategoryTypes::TYPE_FUNDING_PARTNER => [], ]; public function current(): AcademicCategory|false diff --git a/Classes/Domain/Enumeration/CategoryTypes.php b/Classes/Domain/Enumeration/CategoryTypes.php index ab2bed3..69004a9 100644 --- a/Classes/Domain/Enumeration/CategoryTypes.php +++ b/Classes/Domain/Enumeration/CategoryTypes.php @@ -8,11 +8,11 @@ final class CategoryTypes extends Enumeration { - public const TYPE_SYSTEM_CATEGORY = 'system_category'; + public const TYPE_COMPETENCE_FIELD = 'competence_field'; - public const TYPE_RESEARCH_TOPIC = 'research_topic'; + public const TYPE_COOPERATION = 'cooperation'; public const TYPE_DEPARTMENT = 'department'; - public const TYPE_INSTITUTE = 'institute'; + public const TYPE_FUNDING_PARTNER = 'funding_partner'; } diff --git a/Configuration/Icons.php b/Configuration/Icons.php index a4ab6eb..cf57c3a 100644 --- a/Configuration/Icons.php +++ b/Configuration/Icons.php @@ -19,20 +19,20 @@ }; return [ - $identifierString(CategoryTypes::TYPE_SYSTEM_CATEGORY) => [ + $identifierString(CategoryTypes::TYPE_COMPETENCE_FIELD) => [ 'provider' => \TYPO3\CMS\Core\Imaging\IconProvider\SvgIconProvider::class, - 'source' => $sourceString(CategoryTypes::TYPE_SYSTEM_CATEGORY), + 'source' => $sourceString(CategoryTypes::TYPE_COMPETENCE_FIELD), ], - $identifierString(CategoryTypes::TYPE_RESEARCH_TOPIC) => [ + $identifierString(CategoryTypes::TYPE_COOPERATION) => [ 'provider' => \TYPO3\CMS\Core\Imaging\IconProvider\SvgIconProvider::class, - 'source' => $sourceString(CategoryTypes::TYPE_RESEARCH_TOPIC), + 'source' => $sourceString(CategoryTypes::TYPE_COOPERATION), ], $identifierString(CategoryTypes::TYPE_DEPARTMENT) => [ 'provider' => \TYPO3\CMS\Core\Imaging\IconProvider\SvgIconProvider::class, 'source' => $sourceString(CategoryTypes::TYPE_DEPARTMENT), ], - $identifierString(CategoryTypes::TYPE_INSTITUTE) => [ + $identifierString(CategoryTypes::TYPE_FUNDING_PARTNER) => [ 'provider' => \TYPO3\CMS\Core\Imaging\IconProvider\SvgIconProvider::class, - 'source' => $sourceString(CategoryTypes::TYPE_INSTITUTE), + 'source' => $sourceString(CategoryTypes::TYPE_FUNDING_PARTNER), ], ]; diff --git a/Configuration/TCA/Overrides/sys_category.php b/Configuration/TCA/Overrides/sys_category.php index 97c00a1..835b4d5 100644 --- a/Configuration/TCA/Overrides/sys_category.php +++ b/Configuration/TCA/Overrides/sys_category.php @@ -17,28 +17,28 @@ $sysCategoryTypesTcaTypeIconOverrides = [ 'ctrl' => [ 'typeicon_classes' => [ - \FGTCLB\AcademicProjects\Domain\Enumeration\CategoryTypes::TYPE_SYSTEM_CATEGORY - => $iconType(\FGTCLB\AcademicProjects\Domain\Enumeration\CategoryTypes::TYPE_SYSTEM_CATEGORY), - \FGTCLB\AcademicProjects\Domain\Enumeration\CategoryTypes::TYPE_RESEARCH_TOPIC - => $iconType(\FGTCLB\AcademicProjects\Domain\Enumeration\CategoryTypes::TYPE_RESEARCH_TOPIC), + \FGTCLB\AcademicProjects\Domain\Enumeration\CategoryTypes::TYPE_COMPETENCE_FIELD + => $iconType(\FGTCLB\AcademicProjects\Domain\Enumeration\CategoryTypes::TYPE_COMPETENCE_FIELD), + \FGTCLB\AcademicProjects\Domain\Enumeration\CategoryTypes::TYPE_COOPERATION + => $iconType(\FGTCLB\AcademicProjects\Domain\Enumeration\CategoryTypes::TYPE_COOPERATION), \FGTCLB\AcademicProjects\Domain\Enumeration\CategoryTypes::TYPE_DEPARTMENT => $iconType(\FGTCLB\AcademicProjects\Domain\Enumeration\CategoryTypes::TYPE_DEPARTMENT), - \FGTCLB\AcademicProjects\Domain\Enumeration\CategoryTypes::TYPE_INSTITUTE - => $iconType(\FGTCLB\AcademicProjects\Domain\Enumeration\CategoryTypes::TYPE_INSTITUTE), + \FGTCLB\AcademicProjects\Domain\Enumeration\CategoryTypes::TYPE_FUNDING_PARTNER + => $iconType(\FGTCLB\AcademicProjects\Domain\Enumeration\CategoryTypes::TYPE_FUNDING_PARTNER), ], ], ]; $addItems = [ [ - $llBackendType(\FGTCLB\AcademicProjects\Domain\Enumeration\CategoryTypes::TYPE_SYSTEM_CATEGORY), - \FGTCLB\AcademicProjects\Domain\Enumeration\CategoryTypes::TYPE_SYSTEM_CATEGORY, - $iconType(\FGTCLB\AcademicProjects\Domain\Enumeration\CategoryTypes::TYPE_SYSTEM_CATEGORY), + $llBackendType(\FGTCLB\AcademicProjects\Domain\Enumeration\CategoryTypes::TYPE_COMPETENCE_FIELD), + \FGTCLB\AcademicProjects\Domain\Enumeration\CategoryTypes::TYPE_COMPETENCE_FIELD, + $iconType(\FGTCLB\AcademicProjects\Domain\Enumeration\CategoryTypes::TYPE_COMPETENCE_FIELD), 'projects', ], [ - $llBackendType(\FGTCLB\AcademicProjects\Domain\Enumeration\CategoryTypes::TYPE_RESEARCH_TOPIC), - \FGTCLB\AcademicProjects\Domain\Enumeration\CategoryTypes::TYPE_RESEARCH_TOPIC, - $iconType(\FGTCLB\AcademicProjects\Domain\Enumeration\CategoryTypes::TYPE_RESEARCH_TOPIC), + $llBackendType(\FGTCLB\AcademicProjects\Domain\Enumeration\CategoryTypes::TYPE_COOPERATION), + \FGTCLB\AcademicProjects\Domain\Enumeration\CategoryTypes::TYPE_COOPERATION, + $iconType(\FGTCLB\AcademicProjects\Domain\Enumeration\CategoryTypes::TYPE_COOPERATION), 'projects', ], [ @@ -48,9 +48,9 @@ 'projects', ], [ - $llBackendType(\FGTCLB\AcademicProjects\Domain\Enumeration\CategoryTypes::TYPE_INSTITUTE), - \FGTCLB\AcademicProjects\Domain\Enumeration\CategoryTypes::TYPE_INSTITUTE, - $iconType(\FGTCLB\AcademicProjects\Domain\Enumeration\CategoryTypes::TYPE_INSTITUTE), + $llBackendType(\FGTCLB\AcademicProjects\Domain\Enumeration\CategoryTypes::TYPE_FUNDING_PARTNER), + \FGTCLB\AcademicProjects\Domain\Enumeration\CategoryTypes::TYPE_FUNDING_PARTNER, + $iconType(\FGTCLB\AcademicProjects\Domain\Enumeration\CategoryTypes::TYPE_FUNDING_PARTNER), 'projects', ], ]; diff --git a/Resources/Private/Language/de.locallang.xlf b/Resources/Private/Language/de.locallang.xlf index 03a02a8..0b2f010 100644 --- a/Resources/Private/Language/de.locallang.xlf +++ b/Resources/Private/Language/de.locallang.xlf @@ -11,21 +11,21 @@ Academic Projekte - - System Category (17 targets) - Systemkategorie (17 Ziele) - - - Research Topic - Forschungsschwerpunkt - Department - Abteilung + Organisationseinheit + + + Competence field + Kompetenzfeld + + + Cooperation + Kooperation - - Institute - Institut + + Funding partner + Mittelgebender diff --git a/Resources/Private/Language/locallang.xlf b/Resources/Private/Language/locallang.xlf index f386603..736509b 100644 --- a/Resources/Private/Language/locallang.xlf +++ b/Resources/Private/Language/locallang.xlf @@ -10,17 +10,17 @@ Academic Projects - - System Category (17 targets) - - - Research Topic - Department - - Institute + + Competence field + + + Cooperation + + + Funding partner diff --git a/Resources/Public/Icons/competenceField.svg b/Resources/Public/Icons/competenceField.svg new file mode 100644 index 0000000..78d1065 --- /dev/null +++ b/Resources/Public/Icons/competenceField.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Resources/Public/Icons/cooperation.svg b/Resources/Public/Icons/cooperation.svg new file mode 100644 index 0000000..5fa0e98 --- /dev/null +++ b/Resources/Public/Icons/cooperation.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Resources/Public/Icons/fundingPartner.svg b/Resources/Public/Icons/fundingPartner.svg new file mode 100644 index 0000000..b03445a --- /dev/null +++ b/Resources/Public/Icons/fundingPartner.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Resources/Public/Icons/institute.svg b/Resources/Public/Icons/institute.svg deleted file mode 100644 index 17bb841..0000000 --- a/Resources/Public/Icons/institute.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/Resources/Public/Icons/researchTopic.svg b/Resources/Public/Icons/researchTopic.svg deleted file mode 100644 index a16fdf5..0000000 --- a/Resources/Public/Icons/researchTopic.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/Resources/Public/Icons/systemCategory.svg b/Resources/Public/Icons/systemCategory.svg deleted file mode 100644 index 0945b42..0000000 --- a/Resources/Public/Icons/systemCategory.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file