Commit c0136025 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Nouveau champ IdHAL dans les formulaires Diffusion et RDV BU.

parent c91f8dbb
Loading
Loading
Loading
Loading
+24 −3
Changes for module/Application/src/Application/Entity/Db/Diffusion.php: 24 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -6,9 +6,6 @@ use Application\Constants;
use Application\Rule\AutorisationDiffusionRule;
use UnicaenApp\Entity\HistoriqueAwareInterface;
use UnicaenApp\Entity\HistoriqueAwareTrait;
use UnicaenApp\Message\Message;
use UnicaenApp\Message\MessageRepository;
use UnicaenApp\Message\MessageService;

/**
 * Diffusion
@@ -77,6 +74,11 @@ class Diffusion implements HistoriqueAwareInterface
     */
    private $orcid;

    /**
     * @var string
     */
    private $halId;

    /**
     * @var string
     */
@@ -299,6 +301,25 @@ class Diffusion implements HistoriqueAwareInterface
        return $this;
    }

    /**
     * @return string|null
     */
    public function getHalId()
    {
        return $this->halId;
    }

    /**
     * @param string|null $halId
     * @return Diffusion
     */
    public function setHalId($halId = null): Diffusion
    {
        $this->halId = $halId;

        return $this;
    }

    /**
     * Get id
     *
+1 −0
Changes for module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Diffusion.dcm.xml: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@
        <field name="autorisEmbargoDuree" type="string" column="AUTORIS_EMBARGO_DUREE" length="20" nullable="true"/>
        <field name="autorisMotif" type="string" column="AUTORIS_MOTIF" length="2000" nullable="true"/>
        <field name="orcid" type="string" column="ORCID" length="200" nullable="true"/>
        <field name="halId" type="string" column="HAL_ID" length="100" nullable="true"/>
        <field name="nnt" type="string" column="NNT" length="200" nullable="true"/>

        <field name="histoCreation" type="datetime" column="HISTO_CREATION" nullable="false"/>
+11 −0
Changes for module/Application/src/Application/Form/DiffusionTheseForm.php: 11 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -214,6 +214,17 @@ class DiffusionTheseForm extends Form
            ],
        ]);

        $this->add([
            'type'       => 'Text',
            'name'       => 'halId',
            'options'    => [
                'label' => 'Identifiant HAL (facultatif)',
            ],
            'attributes' => [
                'title' => "",
            ],
        ]);

        $this->add([
            'type'       => 'Checkbox',
            'name'       => 'certifCharteDiff',
+3 −9
Changes for module/Application/src/Application/Form/Hydrator/DiffusionHydrator.php: 3 added lines, 9 removed lines.
Original line number Diff line number Diff line
@@ -3,18 +3,10 @@
namespace Application\Form\Hydrator;

use Application\Entity\Db\Diffusion;
use Application\Entity\Db\RecapBu;
use Doctrine\ORM\OptimisticLockException;
use DoctrineModule\Stdlib\Hydrator\DoctrineObject;
use UnicaenApp\Service\EntityManagerAwareInterface;
use UnicaenApp\Service\EntityManagerAwareTrait;

/**
 * Created by PhpStorm.
 * User: gauthierb
 * Date: 20/05/16
 * Time: 17:08
 */
class DiffusionHydrator extends DoctrineObject implements EntityManagerAwareInterface
{
    use EntityManagerAwareTrait;
@@ -41,7 +33,6 @@ class DiffusionHydrator extends DoctrineObject implements EntityManagerAwareInte
     * @param  array     $data
     * @param  Diffusion $attestation
     * @return Diffusion
     * @throws OptimisticLockException
     */
    public function hydrate(array $data, $attestation)
    {
@@ -53,6 +44,9 @@ class DiffusionHydrator extends DoctrineObject implements EntityManagerAwareInte
        if (!isset($data['orcid'])) {
            $data['orcid'] = null;
        }
        if (!isset($data['halId'])) {
            $data['halId'] = null;
        }

        /** @var Diffusion $diff */
        $diff = parent::hydrate($data, $attestation);
+35 −21
Changes for module/Application/src/Application/Form/Hydrator/RdvBuHydrator.php: 35 added lines, 21 removed lines.
Original line number Diff line number Diff line
@@ -4,13 +4,21 @@ namespace Application\Form\Hydrator;

use Application\Entity\Db\Diffusion;
use Application\Entity\Db\RdvBu;
use Application\Entity\Db\VersionFichier;
use Application\Service\FichierThese\FichierTheseServiceAwareTrait;
use Doctrine\ORM\EntityManager;
use Doctrine\ORM\OptimisticLockException;
use DoctrineModule\Stdlib\Hydrator\DoctrineObject;
use UnicaenApp\Exception\RuntimeException;

/**
 * @property EntityManager $objectManager
 *
 * @author Unicaen
 */
class RdvBuHydrator extends DoctrineObject
{
    use FichierTheseServiceAwareTrait;
//    use EntityManagerAwareTrait;

    private function existeVersionArchivable(RdvBu $rdvBu)
    {
@@ -28,27 +36,17 @@ class RdvBuHydrator extends DoctrineObject
        $data = parent::extract($rdvBu);
        $data['versionArchivableFournie'] = $this->existeVersionArchivable($rdvBu);

//        /** @var QueryBuilder $qb */
//        $qb = $this->objectManager->getRepository(Diffusion::class)->createQueryBuilder("d")
//            ->andWhere("d.theseId = :theseId")
//            ->setParameter("theseId", $rdvBu->getThese()->getId());
//        /** @var Diffusion $result */
//        $result = $qb->getQuery()->getOneOrNullResult();

        /** @var Diffusion $result */
        $result = $this->objectManager->getRepository(Diffusion::class)->findOneBy(["these" => $rdvBu->getThese()]);


        if ($result) $data['idOrcid'] = $result->getOrcid();
        if ($diffusion = $this->getDiffusion($rdvBu)) {
            $data['idOrcid'] = $diffusion->getOrcid();
            $data['halId'] = $diffusion->getHalId();
        }

        return $data;
    }

    /**
     * Hydrate $object with the provided $data.
     *
     * @param array  $data
     * @param  RdvBu $rdvBu
     * @param object $rdvBu
     * @return RdvBu
     */
    public function hydrate(array $data, $rdvBu)
@@ -60,13 +58,29 @@ class RdvBuHydrator extends DoctrineObject

        /** @var RdvBu $object */
        $object = parent::hydrate($data, $rdvBu);
        /** @var Diffusion $result */
        $result = $this->objectManager->getRepository(Diffusion::class)->findOneBy(["these" => $rdvBu->getThese()]);
        if ($result) {
            $result->setOrcid($data['idOrcid']);
            $this->objectManager->flush();

        if ($diffusion = $this->getDiffusion($rdvBu)) {
            $diffusion->setOrcid($data['idOrcid']);
            $diffusion->setHalId($data['halId']);
            try {
                $this->objectManager->flush($diffusion);
            } catch (OptimisticLockException $e) {
                throw new RuntimeException("Impossible d'enregistrer la Diffusion", null, $e);
            }
        }

        return $object;
    }

    /**
     * @param RdvBu $rdvBu
     * @return Diffusion|null
     */
    private function getDiffusion(RdvBu $rdvBu)
    {
        // le RDV BU ne concerne que le dépôt de la version initiale
        $version = $this->fichierTheseService->fetchVersionFichier(VersionFichier::CODE_ORIG);

        return $rdvBu->getThese()->getDiffusionForVersion($version);
    }
}
 No newline at end of file
Loading