career controller change type

LitusProject · Oct 22, 2023 · 041d9a8 · 041d9a8
1 parent 3e1dc84
commit 041d9a8
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 2 deletions.
diff --git a/module/BrBundle/Controller/Career/VacancyController.php b/module/BrBundle/Controller/Career/VacancyController.php
@@ -18,7 +18,7 @@ public function overviewAction()
 
         $query = $this->getEntityManager()
             ->getRepository('BrBundle\Entity\Company\Job')
-            ->findAllActiveByTypeByDateQuery('vacancy');
+            ->findAllActiveByDateQuery();
 
         if ($this->getRequest()->isPost()) {
             $formData = $this->getRequest()->getPost();
@@ -30,12 +30,13 @@ public function overviewAction()
                 $repository = $this->getEntityManager()
                     ->getRepository('BrBundle\Entity\Company\Job');
 
+                $jobType = $formData['jobType'] == 'all' ? null : $formData['sector'];
                 $sector = $formData['sector'] == 'all' ? null : $formData['sector'];
                 $location = $formData['location'] == 'all' ? null : $formData['location'];
                 $master = $formData['master'] == 'all' ? null : $formData['master'];
 
                 if ($formData['searchType'] == 'company') {
-                    $query = $repository->findAllActiveByTypeQuery('vacancy', $sector, $location, $master);
+                    $query = $repository->findAllActiveByTypeQuery($jobType, $sector, $location, $master);
                 } elseif ($formData['searchType'] == 'vacancy') {
                     $query = $repository->findAllActiveByTypeSortedByJobNameQuery('vacancy', $sector, $location, $master);
                 } elseif ($formData['searchType'] == 'mostRecent') {

diff --git a/module/BrBundle/Form/Career/Search/Vacancy.php b/module/BrBundle/Form/Career/Search/Vacancy.php
@@ -42,6 +42,17 @@ public function init()
             )
         );
 
+        $this->add(
+            array(
+                'type'       => 'select',
+                'name'       => 'jobType',
+                'required'   => true,
+                'attributes' => array(
+                    'options' => array_merge(array('all' => 'All'), Company\Job::$possibleTypes),
+                ),
+            )
+        );
+
         $this->add(
             array(
                 'type'       => 'select',

diff --git a/module/BrBundle/Repository/Company/Job.php b/module/BrBundle/Repository/Company/Job.php
@@ -112,6 +112,28 @@ public function findAllActiveByTypeByDateQuery($type)
             ->getQuery();
     }
 
+    /**
+     * @return \Doctrine\ORM\Query
+     */
+    public function findAllActiveByDateQuery()
+    {
+        $query = $this->getEntityManager()->createQueryBuilder();
+        return $query->select('v, c')
+            ->from('BrBundle\Entity\Company\Job', 'v')
+            ->innerJoin('v.company', 'c')
+            ->where(
+                $query->expr()->andx(
+                    $query->expr()->gt('v.endDate', ':now'),
+                    $query->expr()->eq('c.active', 'true'),
+                    $query->expr()->eq('v.removed', 'FALSE'),
+                    $query->expr()->eq('v.approved', 'TRUE')
+                )
+            )
+            ->setParameter('now', new DateTime())
+            ->orderBy('v.dateUpdated', 'DESC')
+            ->getQuery();
+    }
+
     /**
      * @param  CompanyEntity $company
      * @param  string        $type