From 74a93740fed50b5fbe12feec17ac7552929074b6 Mon Sep 17 00:00:00 2001
From: Christian Hackl <hackl.chris@googlemail.com>
Date: Mon, 24 Jun 2024 14:14:56 +0200
Subject: [PATCH] [FEATURE] added options for detail plugin

fields: layout, jobsStorage, jobsListView
---
 Classes/Controller/JobpostController.php      |  8 ++
 .../FlexForms/hhsimplejobposts_jobsdetail.xml | 76 +++++++++++++++++++
 .../FlexForms/hhsimplejobposts_jobslist.xml   | 13 +++-
 Configuration/TCA/Overrides/tt_content.php    | 11 ++-
 .../Private/Language/locallang_plugin.xlf     | 17 +++++
 Resources/Private/Templates/Jobpost/Show.html |  4 +-
 composer.json                                 |  2 +-
 ext_emconf.php                                |  2 +-
 8 files changed, 126 insertions(+), 7 deletions(-)
 create mode 100644 Configuration/FlexForms/hhsimplejobposts_jobsdetail.xml

diff --git a/Classes/Controller/JobpostController.php b/Classes/Controller/JobpostController.php
index 0beff6b..1720127 100644
--- a/Classes/Controller/JobpostController.php
+++ b/Classes/Controller/JobpostController.php
@@ -324,6 +324,14 @@ public function showAction(Jobpost $jobpost = null): ResponseInterface {
             $jobpost = $this->jobpostRepository->findByUid(intval($queryParams['tx_hhsimplejobposts_jobslist']['jobpost']));
         }
 
+        $jobPostStorageString = isset($this->settings['jobsStorage']) ? $this->settings['jobsStorage'] : '';
+        if(!empty($jobPostStorageString)) {
+            $jobPostStorageArray = \explode(',', $jobPostStorageString);
+            if(!in_array($jobpost->getPid(), $jobPostStorageArray)) {
+                $jobpost = [];
+            }
+        }
+
         if(!empty($jobpost)) {
             $contactPointEmail = null;
             $contactPointTelephone = null;
diff --git a/Configuration/FlexForms/hhsimplejobposts_jobsdetail.xml b/Configuration/FlexForms/hhsimplejobposts_jobsdetail.xml
new file mode 100644
index 0000000..bb27639
--- /dev/null
+++ b/Configuration/FlexForms/hhsimplejobposts_jobsdetail.xml
@@ -0,0 +1,76 @@
+<T3DataStructure>
+    <sheets>
+        <sDEF>
+            <ROOT>
+                <TCEforms>
+                    <sheetTitle>Jobs Detail View</sheetTitle>
+                </TCEforms>
+                <type>array</type>
+                <el>
+                    <settings.layout>
+                        <TCEforms>
+                            <exclude>1</exclude>
+                            <label>
+                                LLL:EXT:hh_simple_job_posts/Resources/Private/Language/locallang_plugin.xlf:settings.layout
+                            </label>
+                            <config>
+                                <type>select</type>
+                                <renderType>selectSingle</renderType>
+                                <items type="array">
+                                    <numIndex index="0" type="array">
+                                        <numIndex index="0">default</numIndex>
+                                        <numIndex index="1">default</numIndex>
+                                    </numIndex>
+                                </items>
+                            </config>
+                        </TCEforms>
+                    </settings.layout>
+
+                    <settings.jobsStorage>
+                        <TCEforms>
+                            <exclude>1</exclude>
+                            <label>
+                                LLL:EXT:hh_simple_job_posts/Resources/Private/Language/locallang_plugin.xlf:settings.jobsStorage
+                            </label>
+                            <description>
+                                LLL:EXT:hh_simple_job_posts/Resources/Private/Language/locallang_plugin.xlf:settings.jobsStorage.description
+                            </description>
+                            <config>
+                                <type>group</type>
+                                <internal_type>db</internal_type>
+                                <allowed>pages</allowed>
+                                <size>3</size>
+                                <maxitems>10</maxitems>
+                                <minitems>0</minitems>
+                                <show_thumbs>1</show_thumbs>
+                                <wizards>
+                                    <suggest>
+                                        <type>suggest</type>
+                                    </suggest>
+                                </wizards>
+                            </config>
+                        </TCEforms>
+                    </settings.jobsStorage>
+
+                    <settings.jobsListView>
+                        <TCEforms>
+                            <exclude>1</exclude>
+                            <label>
+                                LLL:EXT:hh_simple_job_posts/Resources/Private/Language/locallang_plugin.xlf:settings.jobsListView
+                            </label>
+                            <config>
+                                <type>group</type>
+                                <internal_type>db</internal_type>
+                                <allowed>pages</allowed>
+                                <size>1</size>
+                                <maxitems>1</maxitems>
+                                <minitems>0</minitems>
+                                <show_thumbs>1</show_thumbs>
+                            </config>
+                        </TCEforms>
+                    </settings.jobsListView>
+                </el>
+            </ROOT>
+        </sDEF>
+    </sheets>
+</T3DataStructure>
diff --git a/Configuration/FlexForms/hhsimplejobposts_jobslist.xml b/Configuration/FlexForms/hhsimplejobposts_jobslist.xml
index 4c6a83a..aef2c55 100644
--- a/Configuration/FlexForms/hhsimplejobposts_jobslist.xml
+++ b/Configuration/FlexForms/hhsimplejobposts_jobslist.xml
@@ -9,6 +9,7 @@
                 <el>
                     <!-- <settings.companiesStorage>
                         <TCEforms>
+                            <exclude>1</exclude>
                             <label>
                                 Wo sind die Companies gespeichert?
                             </label>
@@ -32,7 +33,7 @@
                     <settings.layout>
                         <TCEforms>
                             <exclude>1</exclude>
-                            <label>Layout</label>
+                            <label>LLL:EXT:hh_simple_job_posts/Resources/Private/Language/locallang_plugin.xlf:settings.layout</label>
                             <config>
                                 <type>select</type>
                                 <renderType>selectSingle</renderType>
@@ -48,6 +49,7 @@
 
                     <settings.useExternalApi>
                         <TCEforms>
+                            <exclude>1</exclude>
                             <label>
                                 Use external API?
                             </label>
@@ -67,6 +69,7 @@
 
                     <settings.orderJobsDefaultToApi>
                         <TCEforms>
+                            <exclude>1</exclude>
                             <label>Show default jobs before API-jobs (order)?</label>
                             <description>Default: first show jobs from API then jobs from TYPO3 backend (default-jobs).</description>
                             <displayCond>FIELD:settings.useExternalApi:!=:default</displayCond>
@@ -228,6 +231,7 @@
 
                     <settings.jobsStorageApi>
                         <TCEforms>
+                            <exclude>1</exclude>
                             <label>
                                 Wo sind / sollen die Jobs aus der API gespeichert werden?
                             </label>
@@ -250,9 +254,10 @@
                     </settings.jobsStorageApi>
 
                     <settings.jobsStorage>
+                        <exclude>1</exclude>
                         <TCEforms>
                             <label>
-                                Wo sind die Jobs (default) gespeichert?
+                                LLL:EXT:hh_simple_job_posts/Resources/Private/Language/locallang_plugin.xlf:settings.jobsStorage
                             </label>
                             <config>
                                 <type>group</type>
@@ -273,6 +278,7 @@
 
                     <!-- <settings.companiesDetailView>
                         <TCEforms>
+                            <exclude>1</exclude>
                             <label>Company Detail Page</label>
                             <config>
                                 <type>group</type>
@@ -288,7 +294,8 @@
 
                     <settings.jobsDetailView>
                         <TCEforms>
-                            <label>Jobs Detail Page (optional)</label>
+                            <exclude>1</exclude>
+                            <label>LLL:EXT:hh_simple_job_posts/Resources/Private/Language/locallang_plugin.xlf:settings.jobsDetailView</label>
                             <config>
                                 <type>group</type>
                                 <internal_type>db</internal_type>
diff --git a/Configuration/TCA/Overrides/tt_content.php b/Configuration/TCA/Overrides/tt_content.php
index c9a3012..600921a 100644
--- a/Configuration/TCA/Overrides/tt_content.php
+++ b/Configuration/TCA/Overrides/tt_content.php
@@ -33,9 +33,18 @@
     );
     // ---------------
 
+    $pluginName2 = 'jobsdetail';
+    $pluginSignature2 = $extensionNameLower . '_' . strtolower($pluginName2);
     ExtensionUtility::registerPlugin(
         'HhSimpleJobPosts',
-        'Jobsdetail',
+        $pluginName2,
         'Jobs Detail'
     );
+
+    $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist'][$pluginSignature2] = 'select_key,recursive,pages';
+    $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist'][$pluginSignature2] = 'pi_flexform';
+    ExtensionManagementUtility::addPiFlexFormValue(
+        $pluginSignature2,
+        'FILE:EXT:' . $extensionKey . '/Configuration/FlexForms/' . $pluginSignature2 . '.xml'
+    );
 });
diff --git a/Resources/Private/Language/locallang_plugin.xlf b/Resources/Private/Language/locallang_plugin.xlf
index b8c4da7..505f083 100644
--- a/Resources/Private/Language/locallang_plugin.xlf
+++ b/Resources/Private/Language/locallang_plugin.xlf
@@ -55,6 +55,23 @@
                 <source>Descending</source>
             </trans-unit>
 
+            <trans-unit id="settings.layout" xml:space="preserve">
+                <source>Layout</source>
+            </trans-unit>
+            <trans-unit id="settings.jobsStorage" xml:space="preserve">
+                <source>Define the pages/sysfolders which hold the job records (optional)</source>
+            </trans-unit>
+            <trans-unit id="settings.jobsStorage.description" xml:space="preserve">
+                <source>If set, the system checks whether the job is located in the selected storage locations when it is called up!</source>
+            </trans-unit>
+            <trans-unit id="settings.jobsListView" xml:space="preserve">
+                <source>Select the page which is used to return to on detail view</source>
+            </trans-unit>
+            <trans-unit id="settings.jobsDetailView" xml:space="preserve">
+                <source>PageId for single job display</source>
+            </trans-unit>
+
+
         </body>
     </file>
 </xliff>
diff --git a/Resources/Private/Templates/Jobpost/Show.html b/Resources/Private/Templates/Jobpost/Show.html
index 3dac00a..5da0a01 100644
--- a/Resources/Private/Templates/Jobpost/Show.html
+++ b/Resources/Private/Templates/Jobpost/Show.html
@@ -82,7 +82,9 @@ <h5><f:translate key="LLL:EXT:hh_simple_job_posts/Resources/Private/Language/loc
         </f:else>
     </f:if>
 
-    <f:comment><f:link.action action="list">Back to list</f:link.action></f:comment>
+    <f:comment>
+        <f:link.action action="list" pageUid="{settings.jobsListView}">Back to list</f:link.action>
+    </f:comment>
 </f:section>
 
 </html>
diff --git a/composer.json b/composer.json
index 0ed30c2..dec470f 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,7 @@
             "url": "https://www.paypal.com/paypalme/hauerheinrich"
         }
     ],
-    "version": "4.1.1",
+    "version": "4.1.2",
     "license": ["GPL-2.0-or-later"],
     "keywords": ["TYPO3 CMS", "jobs", "Extension"],
     "replace": {
diff --git a/ext_emconf.php b/ext_emconf.php
index 3b127f2..7edcb2c 100644
--- a/ext_emconf.php
+++ b/ext_emconf.php
@@ -19,7 +19,7 @@
     'state' => 'beta',
     'createDirs' => '',
     'clearCacheOnLoad' => 0,
-    'version' => '4.1.1',
+    'version' => '4.1.2',
     'constraints' => [
         'depends' => [
             'typo3' => '12.4.0-12.4.99',