Merge branch 'starling' into starling-depenses (60576fe9) · Commits · open-source / oscar

CHANGELOG.md

+17 −0

Original line number	Diff line number	Diff line
		# 📢 CHANGEMENTS

		## 2025

		### Février
		- [Starling] MAJ de la fiche organisation (ajout et affichage conditionnel des informations)
		- [Starling] Ajout des champs DUNS, RNSR, Labintel, TVA Intra dans la recherche textuelle pour les organisations
		- [Starling] Recherche activité > Recherche strict sur les identifiants des connectors
		- [Starling] Mise à jour de l'interface de déclaration de temps
		- [Starling] Mise à jour des logs pour une activité/projet

		### Janvier
		- [Starling] Ajout d'un lien dans la liste des types d'organisation vers le référentiel des organisations filtré sur le type
		- [Starling] Ajout des mots-clefs pour la recherche textuelle, ajout d'un filtre pour les mots-clefs
		- [Starling] Interface d'administration des mots-clefs
		- [Starling] Synchronisation des personnes avec une valeur entière
		- [Starling] Refonte de la synthèse des déclarations d'un déclarant (Ajout d'information sur le temps déclaré, commentaires sur la période, répartition sur le nombre de jour / nombre de créneaux)
		- [Starling] Ajout de bulle d'information dans la fiche activité sur les personnes

		## 2024

		### Décembre

+36 −1

Original line number	Diff line number	Diff line
		@@ -11,6 +11,7 @@ use Cocur\Slugify\Slugify;
		use Doctrine\Common\Collections\ArrayCollection;
		use Doctrine\ORM\Mapping as ORM;
		use Laminas\Permissions\Acl\Resource\ResourceInterface;
		use Laminas\Validator\Date;
		use Oscar\Import\Data\DataExtractorDate;
		use Oscar\Service\ActivityTypeService;
		use Doctrine\ORM\Mapping\OneToOne as OneToOne;
		@@ -324,11 +325,19 @@ class Activity implements ResourceInterface
		/**
		* Date de la dernière mise en cache des données
		*
		* @var datetime
		* @var ?\DateTime
		* @ORM\Column(type="date", nullable=true)
		*/
		private $dateCached;

		/**
		* Date de négociation
		*
		* @var ?\DateTime
		* @ORM\Column(type="date", nullable=true)
		*/
		private $dateNegociation;

		/**
		* Cache
		*
		@@ -1284,6 +1293,32 @@ class Activity implements ResourceInterface
		return $this;
		}


		public function getDateNegociation(): ?\DateTime
		{
		return $this->dateNegociation;
		}

		public function setDateNegociation(?\DateTime $dateNegociation): self
		{
		$this->dateNegociation = $dateNegociation;
		return $this;
		}

		/**
		* @param staring $format
		* @return string
		*/
		public function getDateNegociationStr(string $format = 'Y-m-d'): string
		{
		if ($this->getDateNegociation()) {
		return $this->getDateNegociation()->format($format);
		}
		else {
		return "";
		}
		}

		/**
		* @param string $format
		* @return string

+13 −2

Original line number	Diff line number	Diff line
		@@ -27,7 +27,6 @@ class ProjectGrantForm extends Form implements InputFilterProviderInterface, Use

		private $numbers;
		private $editable;

		private $organizations = false;
		private $organizationRoles = null;

		@@ -40,7 +39,7 @@ class ProjectGrantForm extends Form implements InputFilterProviderInterface, Use
		/**
		* @return ProjectGrantService
		*/
		public function getProjectGrantService()
		public function getProjectGrantService() :ProjectGrantService
		{
		return $this->getServiceContainer()->get(ProjectGrantService::class);
		}
		@@ -335,6 +334,18 @@ class ProjectGrantForm extends Form implements InputFilterProviderInterface, Use
		'type' => 'Text'
		]);

		// DateNegociation
		$this->add([
		'name' => 'dateNegociation',
		'options' => [
		'label' => "Date de début des négociations"
		],
		'attributes' => [
		'class' => 'input-date form-control'
		],
		'type' => 'Text'
		]);


		// DateOpened
		$this->add(new KeyValue('numbers', ['keys' => $this->numbers, 'editable' => $this->editable]));

+2 −0

Original line number	Diff line number	Diff line
		@@ -94,6 +94,7 @@ class ProjectGrantFormHydrator implements HydratorInterface, UseServiceContainer
		->setDateEnd(DateTimeUtils::toDatetime($data['dateEnd']))
		->setDateSigned(DateTimeUtils::toDatetime($data['dateSigned']))
		->setDateOpened(DateTimeUtils::toDatetime($data['dateOpened']))
		->setDateNegociation(DateTimeUtils::toDatetime($data['dateNegociation']))
		->setPcruValidPoleCompetitivite($data['pcruValidPoleCompetitivite'] == "1")
		->setNumbers(array_key_exists('numbers', $data) ? $data['numbers'] : [])
		;
		@@ -204,6 +205,7 @@ class ProjectGrantFormHydrator implements HydratorInterface, UseServiceContainer
		'dateEnd' => $object->getDateEnd()?$object->getDateEnd()->format('Y-m-d'):'',
		'dateSigned' => $object->getDateSigned()?$object->getDateSigned()->format('Y-m-d'):'',
		'dateOpened' => $object->getDateOpened()?$object->getDateOpened()->format('Y-m-d'):'',
		'dateNegociation' => $object->getDateNegociation()?$object->getDateNegociation()->format('Y-m-d'):'',
		'currency' => $object->getCurrency() ? $object->getCurrency()->getId() : -1,
		'project' => $object->getProject(),
		'numbers' => $object->getNumbers(),

+2 −0

Original line number	Diff line number	Diff line
		@@ -448,11 +448,13 @@ class ProjectGrantApiService implements UseEntityManager, UsePersonService, UseO
		'type' => $activity->getActivityType() ? (string)$activity->getActivityType() : null,
		'type_chain' => $typesJson,
		'type_id' => $activity->getActivityType()?->getId(),
		'dateCreated' => $this->formatDateTime($activity->getDateCreated()),
		'dateStart' => $this->formatDateTime($activity->getDateStart()),
		'dateEnd' => $this->formatDateTime($activity->getDateEnd()),
		'dateSigned' => $this->formatDateTime($activity->getDateSigned()),
		'dateUpdated' => $this->formatDateTime($activity->getDateUpdated()),
		'dateOpened' => $this->formatDateTime($activity->getDateOpened()),
		'dateNegociation' => $this->formatDateTime($activity->getDateNegociation()),
		'urls' => [
		'edit' => $urlPlugin->fromRoute('contract/edit', ['id' => $activity->getId()]),
		'change_project' => $urlPlugin->fromRoute('contract/moveToProject', ['id' => $activity->getId()]),