Commit cb84a288 authored by Stephane Bouvry's avatar Stephane Bouvry
Browse files

FIX : Les numérotations sont bien prises en charge dans la recherche textuelle...

FIX : Les numérotations sont bien prises en charge dans la recherche textuelle avec uniquement la valeur
parent 38beea20
Loading
Loading
Loading
Loading
Loading
+10 −0
Original line number Diff line number Diff line
@@ -677,6 +677,16 @@ class Activity implements ResourceInterface
        }
        return $this->numbers;
    }
    public function getNumbersValues()
    {
        $out = [];
        if( $this->numbers ){
            foreach ($this->numbers as $key=>$value) {
                $out[] = $value;
            }
        }
        return $out;
    }

    /**
     * @param string $numbers
+4 −2
Original line number Diff line number Diff line
@@ -143,14 +143,14 @@ class ActivityElasticSearch implements ActivitySearchStrategy
            $partners[] = (string)$organizationRolead->getOrganization();
        }

        return [
        $out = [
            'label' => $activity->getLabel(),
            'description' => $activity->getDescription(),
            'saic' => $activity->getCentaureId(),
            'numerotation' => $activity->getNumbers(),
            'oscar' => $activity->getOscarNum(),
            'activitytype' => $activity->getActivityType() ? (string)$activity->getActivityType() : '',
            'numbers' => $activity->getNumbers(),
            'numbers' => implode(" ", $activity->getNumbersValues()),
            'eotp' => $activity->getCodeEOTP(),
            'acronym' => $activity->getAcronym(),
            'activity_id' => $activity->getId(),
@@ -160,6 +160,8 @@ class ActivityElasticSearch implements ActivitySearchStrategy
            'project_id' => $project_id,
            'project' => $project_body,
        ];

        return $out;
    }

    public function search($search)