Merge pull request #609: Improve workflows

* pr-609: feat: job filer "my jobs" also lists job which a user is assigned to as department manager fix: enable assign department manager to jobs for all workflows
cross-solution · Dec 16, 2020 · 6be6ddf · 6be6ddf
2 parents 28f0609 + fbf579b
commit 6be6ddf
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 8 deletions.
diff --git a/module/Jobs/src/Listener/GetOrganizationManagers.php b/module/Jobs/src/Listener/GetOrganizationManagers.php
@@ -59,7 +59,7 @@ public function __invoke(AjaxEvent $event)
 
         $workflowSettings = $org->getWorkflowSettings();
 
-        if (!$workflowSettings->getAcceptApplicationByDepartmentManager()
+        if (!$workflowSettings->hasActiveWorkflow()
             || !$workflowSettings->getAssignDepartmentManagersToJobs()
         ) {
             return ['status' => 'disabled'];

diff --git a/module/Jobs/src/Repository/Filter/PaginationQuery.php b/module/Jobs/src/Repository/Filter/PaginationQuery.php
@@ -105,7 +105,11 @@ public function createQuery($params, $queryBuilder)
              * a recruiter can see his jobs and jobs from users who gave permissions to do so
              */
             if (isset($params['by']) && 'me' == $params['by']) {
-                $queryBuilder->field('user')->equals($this->user->getId());
+                $queryBuilder->addAnd(
+                    $queryBuilder->expr()
+                        ->addOr($queryBuilder->expr()->field('user')->equals($this->user->getId()))
+                        ->addOr($queryBuilder->expr()->field('metaData.organizations:managers.id')->equals($this->user->getId()))
+                );
             } else {
                 $queryBuilder->field('permissions.view')->equals($this->user->getId());
             }

diff --git a/module/Jobs/view/form/company-name-fieldset.phtml b/module/Jobs/view/form/company-name-fieldset.phtml
@@ -11,14 +11,13 @@
 if ($this->renderSummary):
     echo $this->summaryForm()->renderSummaryElement($this->element->get('companyId'));
 
-    /* @var Organizations\Entity\Organization $organization */
+    /* @var \Organizations\Entity\Organization $organization */
     $organization = $this->element->getObject()->getOrganization();
     if ($organization
-        && $organization->getWorkflowSettings()->getAcceptApplicationByDepartmentManager()
+        && $organization->getWorkflowSettings()->hasActiveWorkflow()
         && $organization->getWorkflowSettings()->getAssignDepartmentManagersToJobs()
         && ($managers = $this->element->getObject()->getMetaData('organizations:managers'))
-    ): ?>
-
+    ) : ?>
     <div class="row">
         <div class="col-md-3 yk-label">
             <label><?=$this->element->get('managers')->getLabel()?></label>
@@ -33,7 +32,6 @@ if ($this->renderSummary):
     </div>
 
     <?php endif;
-
-else:
+else :
     echo $this->formCollection($this->element);
 endif;
diff --git a/module/Organizations/src/Entity/WorkflowSettings.php b/module/Organizations/src/Entity/WorkflowSettings.php
@@ -99,4 +99,9 @@ public function getAcceptApplicationByRecruiters(): bool
     {
         return $this->acceptApplicationByRecruiters;
     }
+
+    public function hasActiveWorkflow(): bool
+    {
+        return $this->acceptApplicationByDepartmentManager || $this->acceptApplicationByRecruiters;
+    }
 }