- Ajout des champs DUNS, RNSR, Labintel et TVAIntra à l'index de recherche et dans les résultats (6f7e53dd) · Commits · open-source / oscar

module/Oscar/src/Oscar/Strategy/Search/OrganizationElasticSearch.php

+19 −9

Changes for module/Oscar/src/Oscar/Strategy/Search/OrganizationElasticSearch.php: 19 added lines, 9 removed lines.
Original line number	Diff line number	Diff line
		@@ -35,6 +35,10 @@ class OrganizationElasticSearch extends ElasticSearchEngine implements IOrganiza
		return $this->addItem($entity);
		}

		/**
		* @param Organization $object
		* @return array
		*/
		public function getIndexableDatas(mixed $object): array
		{
		$projects = [];
		@@ -78,6 +82,10 @@ class OrganizationElasticSearch extends ElasticSearchEngine implements IOrganiza
		'zipcode' => $object->getZipCode(),
		'description' => $object->getDescription(),
		'siret' => $object->getSiret(),
		'duns' => $object->getDuns(),
		'rnsr' => $object->getRnsr(),
		'tvaintra' => $object->getTvaintra(),
		'labintel' => $object->getLabintel(),
		'persons' => $persons,
		'activities' => $activities,
		'connectors' => $connectors
		@@ -154,15 +162,17 @@ class OrganizationElasticSearch extends ElasticSearchEngine implements IOrganiza
		]
		]
		],
		[
		"match" => [
		"connectors" => [
		"query" => $search,
		//'fuzziness' => "AUTO", // "Tolérance" aux fautes,
		"boost" => 9
		]
		]
		],
		/**
		* 'duns' => $object->getDuns(),
		* 'rnsr' => $object->getRnsr(),
		* 'tvaintra' => $object->getTvaintra(),
		* 'labintel' => $object->getLabintel(),
		*/
		["match" => [ "connectors" => [ "query" => $search, "boost" => 9]]],
		["match" => [ "duns" => [ "query" => $search, "boost" => 9]]],
		["match" => [ "rnsr" => [ "query" => $search, "boost" => 9]]],
		["match" => [ "tvaintra" => [ "query" => $search, "boost" => 9]]],
		["match" => [ "labintel" => [ "query" => $search, "boost" => 9]]],
		[
		"match" => [
		"zipcode" => [

module/Oscar/view/oscar/organization/show.phtml

+31 −6

Changes for module/Oscar/view/oscar/organization/show.phtml: 31 added lines, 6 removed lines.
Original line number	Diff line number	Diff line
		@@ -31,30 +31,55 @@
		</h1>
		<div class="details row">
		<dl class="col-xs-8">

		<dt>Code interne</dt>
		<dd><?= $organization->getCode() ? $organization->getCode() : '<i class="missing-data">Aucun</i>' ?></dd>

		<dt>Nom d'usage (nom court)</dt>
		<dd><?= $organization->getShortName() ? $organization->getShortName() : '<i class="missing-data">Aucun</i>' ?></dd>

		<dt>Nom complet</dt>
		<dd><?= $organization->getFullname() ? $organization->getFullname() : '<i class="missing-data">Aucun</i>' ?></dd>

		<?php if($organization->getLabintel()): ?>
		<dt title="N° Labintel CNRS">Labintel</dt>
		<dd><?= $organization->getLabintel() ? $organization->getLabintel() : '<i class="missing-data">Aucun</i>' ?></dd>
		<?php endif; ?>

		<?php if($organization->getSiret()): ?>
		<dt title="">SIRET</dt>
		<dd><?= $organization->getSiret() ? $organization->getSiret() : '<i class="missing-data">Aucun</i>' ?></dd>
		<?php endif; ?>

		<?php if($organization->getRnsr()): ?>
		<dt title="Répertoire National des Structure de Recherche">RNSR</dt>
		<dd><?= $organization->getRnsr() ? $organization->getRnsr() : '<i class="missing-data">Aucun</i>' ?></dd>
		<?php endif; ?>

		<?php if($organization->getTvaintra()): ?>
		<dt>TVA Intra</dt>
		<dd><?= $organization->getTvaintra() ? $organization->getTvaintra() : '<i class="missing-data">Aucun</i>' ?></dd>
		<?php endif; ?>

		<dt>Nom d'usage (nom court)</dt>
		<dd><?= $organization->getShortName() ? $organization->getShortName() : '<i class="missing-data">Aucun</i>' ?></dd>

		<dt>Nom complet</dt>
		<dd><?= $organization->getFullname() ? $organization->getFullname() : '<i class="missing-data">Aucun</i>' ?></dd>
		<?php if($organization->getDuns()): ?>
		<dt>DUNS</dt>
		<dd><?= $organization->getDuns() ? $organization->getDuns() : '<i class="missing-data">Aucun</i>' ?></dd>
		<?php endif; ?>

		<?php if($organization->getPhone()): ?>
		<dt>Téléphone</dt>
		<dd><?= $organization->getPhone() ? $organization->getPhone() : '<i class="missing-data">Aucun</i>' ?></dd>
		<?php endif; ?>

		<?php if($organization->getEmail()): ?>
		<dt>Email</dt>
		<dd><?= $organization->getEmail() ? $organization->getEmail() : '<i class="missing-data">Aucun</i>' ?></dd>
		<?php endif; ?>

		<?php if($organization->getUrl()): ?>
		<dt>url</dt>
		<dd><?= $organization->getUrl() ? $organization->getUrl() : '<i class="missing-data">Aucun</i>' ?></dd>
		<?php endif; ?>

		<dt>Adresse</dt>
		<dd>
		@@ -64,7 +89,7 @@
		. $organization->getStreet3() . '<br/>'
		. $organization->getZipcode() . ' '
		. $organization->getCity()
		. ' (' . $organization->getCountry() . ')'
		. ($organization->getCountry()??' (' . $organization->getCountry() . ')')
		?>
		</address>
		</dd>