Merge branch 'pcru-editor' into spartan (14a77c80) · Commits · open-source / oscar

module/Oscar/src/Oscar/Controller/ProjectGrantController.php

+358 −431

File changed.

Preview size limit exceeded, changes collapsed.

module/Oscar/src/Oscar/Entity/ActivityPcruInfos.php

+51 −43

Original line number	Diff line number	Diff line
		@@ -99,9 +99,9 @@ class ActivityPcruInfos

		/**
		* @var boolean
		* @ORM\Column(type="boolean")
		* @ORM\Column(type="boolean", name="coordinateurconsortium")
		*/
		private $cordinateurConsortium = false;
		private $coordinateurConsortium = false;

		/**
		* @var string
		@@ -145,8 +145,8 @@ class ActivityPcruInfos


		/**
		* @var float Durée en mois (min 0.5)
		* @ORM\Column(type="float", nullable=true)
		* @var string Durée en mois (min 0.5)
		* @ORM\Column(type="string", nullable=true)
		*/
		private $duree;

		@@ -163,22 +163,22 @@ class ActivityPcruInfos
		private $dateFin;

		/**
		* @var float Montant reçu (par l'unité)
		* @ORM\Column(type="float", nullable=true)
		* @var string Montant reçu (par l'unité)
		* @ORM\Column(type="string", nullable=true)
		*/
		private $montantPercuUnite = 0.0;
		private $montantPercuUnite = "";

		/**
		* @var float Coût/Frais
		* @ORM\Column(type="float", nullable=true)
		* @var string Coût/Frais
		* @ORM\Column(type="string", nullable=true)
		*/
		private $coutTotalEtude = 0.0;
		private $coutTotalEtude = "";

		/**
		* @var float Montant total (du contrat)
		* @ORM\Column(type="float", nullable=true)
		* @var string Montant total (du contrat)
		* @ORM\Column(type="string", nullable=true)
		*/
		private $montantTotal = 0.0;
		private $montantTotal = "";

		/**
		* @var boolean Validé par le pôle de compétivité
		@@ -247,7 +247,7 @@ class ActivityPcruInfos

		/**
		* @var boolean
		* @ORM\Column(type="boolean", nullable=true)
		* @ORM\Column(type="boolean")
		*/
		private $accordCadre = false;

		@@ -265,9 +265,9 @@ class ActivityPcruInfos

		/**
		* @var string (True/False/Indéfini)
		* @ORM\Column(type="string", length=8)
		* @ORM\Column(type="boolean")
		*/
		private $PresencePartenaireIndustriel = "Indéfini";
		private $PresencePartenaireIndustriel = false;

		/**
		* @var integer Identifiant du document "Contrat Signé"
		@@ -294,7 +294,13 @@ class ActivityPcruInfos
		);
		}

		public function toArray() :array {
		public function isWaiting() :bool
		{
		return $this->getStatus() == self::STATUS_FILE_READY;
		}

		public function toArray() :array
		{
		$out = [];
		$out['Objet'] = $this->getObjet();
		$out['CodeUniteLabintel'] = $this->getCodeUniteLabintel();
		@@ -306,7 +312,7 @@ class ActivityPcruInfos
		$out['ContratsAssocies'] = $this->getContratsAssocies();
		$out['ResponsableScientifique'] = $this->getResponsableScientifique();
		$out['EmployeurResponsableScientifique'] = $this->getEmployeurResponsableScientifique();
		$out['CoordinateurConsortium'] = $this->isCordinateurConsortium() ? 'True' : 'False';
		$out['CoordinateurConsortium'] = $this->isCoordinateurConsortium() ? 'True' : 'False';
		$out['Partenaires'] = $this->getPartenaires();
		$out['PartenairePrincipal'] = "Part inconnu"; // TODO
		$out['IdPartenairePrincipal'] = $this->getIdPartenairePrincipal();
		@@ -327,7 +333,7 @@ class ActivityPcruInfos
		$out['AccordCadre'] = $this->isAccordCadre() ? "True" : "False";
		$out['Cifre'] = $this->getCifre();
		$out['ChaireIndustrielle'] = $this->getChaireIndustrielle();
		$out['PresencePartenaireIndustriel'] = $this->getPresencePartenaireIndustriel();
		$out['PresencePartenaireIndustriel'] = $this->isPresencePartenaireIndustriel();
		return $out;
		}

		@@ -594,7 +600,7 @@ class ActivityPcruInfos
		/**
		* @return PcruTypeContract
		*/
		public function getTypeContrat()
		public function getTypeContrat() :?PcruTypeContract
		{
		return $this->typeContrat;
		}
		@@ -602,7 +608,7 @@ class ActivityPcruInfos
		/**
		* @param PcruTypeContract $typeContrat
		*/
		public function setTypeContrat($typeContrat): self
		public function setTypeContrat( PcruTypeContract $typeContrat): self
		{
		$this->typeContrat = $typeContrat;
		return $this;
		@@ -679,17 +685,17 @@ class ActivityPcruInfos
		/**
		* @return bool
		*/
		public function isCordinateurConsortium(): bool
		public function isCoordinateurConsortium(): bool
		{
		return $this->cordinateurConsortium;
		return $this->coordinateurConsortium;
		}

		/**
		* @param bool $cordinateurConsortium
		* @param bool $coordinateurConsortium
		*/
		public function setCordinateurConsortium(bool $cordinateurConsortium): self
		public function setCoordinateurConsortium(bool $coordinateurConsortium): self
		{
		$this->cordinateurConsortium = $cordinateurConsortium;
		$this->coordinateurConsortium = $coordinateurConsortium;
		return $this;
		}

		@@ -801,7 +807,7 @@ class ActivityPcruInfos
		}

		/**
		* @return float
		* @return string
		*/
		public function getDuree()
		{
		@@ -809,7 +815,7 @@ class ActivityPcruInfos
		}

		/**
		* @param float $duree
		* @param string $duree
		*/
		public function setDuree($duree): self
		{
		@@ -862,51 +868,51 @@ class ActivityPcruInfos
		}

		/**
		* @return float
		* @return string
		*/
		public function getMontantPercuUnite(): float
		public function getMontantPercuUnite(): string
		{
		return $this->montantPercuUnite;
		}

		/**
		* @param float $montantPercuUnite
		* @param string $montantPercuUnite
		*/
		public function setMontantPercuUnite(float $montantPercuUnite): self
		public function setMontantPercuUnite(string $montantPercuUnite): self
		{
		$this->montantPercuUnite = $montantPercuUnite;
		return $this;
		}

		/**
		* @return float
		* @return string
		*/
		public function getCoutTotalEtude(): float
		public function getCoutTotalEtude(): string
		{
		return $this->coutTotalEtude;
		}

		/**
		* @param float $coutTotalEtude
		* @param string $coutTotalEtude
		*/
		public function setCoutTotalEtude(float $coutTotalEtude): self
		public function setCoutTotalEtude(string $coutTotalEtude): self
		{
		$this->coutTotalEtude = $coutTotalEtude;
		return $this;
		}

		/**
		* @return float
		* @return string
		*/
		public function getMontantTotal(): float
		public function getMontantTotal(): string
		{
		return $this->montantTotal;
		}

		/**
		* @param float $montantTotal
		* @param string $montantTotal
		*/
		public function setMontantTotal(float $montantTotal): self
		public function setMontantTotal(string $montantTotal): self
		{
		$this->montantTotal = $montantTotal;
		return $this;
		@@ -1051,11 +1057,13 @@ class ActivityPcruInfos
		/**
		* @return string
		*/
		public function getPresencePartenaireIndustriel(): string
		public function isPresencePartenaireIndustriel(): bool
		{
		return $this->PresencePartenaireIndustriel;
		}



		/**
		* @return int
		*/
		@@ -1074,9 +1082,9 @@ class ActivityPcruInfos
		}

		/**
		* @param string $PresencePartenaireIndustriel
		* @param bool $PresencePartenaireIndustriel
		*/
		public function setPresencePartenaireIndustriel(string $PresencePartenaireIndustriel): self
		public function setPresencePartenaireIndustriel(bool $PresencePartenaireIndustriel): self
		{
		$this->PresencePartenaireIndustriel = $PresencePartenaireIndustriel;
		return $this;

module/Oscar/src/Oscar/Entity/PcruSourceFinancement.php

+0 −1

Original line number	Diff line number	Diff line
		@@ -12,7 +12,6 @@ use Doctrine\ORM\Mapping as ORM;

		/**
		* @package Oscar\Entity
		* @ORM\Entity
		* @ORM\Entity(repositoryClass="Oscar\Entity\PcruSourceFinancementRepository")
		* @ORM\Table(uniqueConstraints={@ORM\UniqueConstraint(name="sourcefinancementlabel_idx", columns={"label"})})
		*/

module/Oscar/src/Oscar/Entity/PcruSourceFinancementRepository.php

+10 −3

Original line number	Diff line number	Diff line
		@@ -10,9 +10,7 @@ namespace Oscar\Entity;

		use Doctrine\ORM\EntityRepository;
		use Doctrine\ORM\NoResultException;
		use Oscar\Connector\IConnectedRepository;
		use Oscar\Import\Activity\FieldStrategy\FieldImportOrganizationStrategy;
		use Oscar\Import\Data\DataExtractorOrganization;


		class PcruSourceFinancementRepository extends EntityRepository
		{
		@@ -23,4 +21,13 @@ class PcruSourceFinancementRepository extends EntityRepository
		$entities = $query->getQuery()->getResult();
		return array_map('current', $entities);
		}

		/**
		* @param string $label
		* @return PcruSourceFinancement\|null
		*/
		public function getByLabel( string $label ): ?PcruSourceFinancement
		{
		return $this->findOneByLabel($label);
		}
		}
		No newline at end of file

module/Oscar/src/Oscar/Entity/PcruTypeContractRepository.php

+12 −1

Original line number	Diff line number	Diff line
		@@ -25,6 +25,15 @@ class PcruTypeContractRepository extends EntityRepository
		return array_map('current', $entities);
		}

		/**
		* @param string $label
		* @return PcruTypeContract
		*/
		public function getPcruTypeContratByLabel( string $label ): ?PcruTypeContract
		{
		return $this->findOneBy(['label' => $label]);
		}

		public function getArrayDatasJoined(): array
		{
		$query = $this->createQueryBuilder('ptc')->orderBy("ptc.label", "ASC");
		@@ -80,6 +89,7 @@ class PcruTypeContractRepository extends EntityRepository
		public function getPcruContractForActivityTypeChained( ActivityType $activityType) : ?PcruTypeContract
		{
		$labelPcru = $this->getPcruContractByActivityType($activityType);

		if( $labelPcru == null ){
		$typeChain = $this->getEntityManager()->getRepository(ActivityType::class)->getChainFromActivityType($activityType);
		foreach ($typeChain as $type) {
		@@ -89,6 +99,7 @@ class PcruTypeContractRepository extends EntityRepository
		}
		}
		}
		return null;

		return $labelPcru;
		}
		}
		No newline at end of file