Commit fb885c0e authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

Retrait de questionnaireId référencant Autoform

parent 6c6f31d4
Loading
Loading
Loading
Loading
+3 −9
Changes for documentation/600_DB_EMC2_FORMATION.sql: 3 added lines, 9 removed lines.
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ create table formation_instance
        constraint formation_instance_unicaen_etat_etat_id_fk
            references unicaen_etat_etat,
    auto_inscription        boolean default false not null,
    source_id               bigint,
    source_id               varchar(100),
    id_source               varchar(256),
    histo_creation          timestamp             not null,
    histo_createur_id       integer               not null
@@ -132,11 +132,7 @@ create table formation_instance_inscrit
            references agent
            on delete cascade,
    liste                     varchar(64),
    questionnaire_id          integer
        constraint formation_instance_inscrit_autoform_formulaire_instance_id_fk
            references unicaen_autoform_formulaire_instance
            on delete set null,
    source_id                 bigint,
    source_id                 varchar(100),
    id_source                 varchar(100),
    etat_id                   integer
        constraint formation_instance_inscrit_unicaen_etat_etat_id_fk
@@ -546,9 +542,7 @@ WITH d(code, lib, ordre) AS (
    SELECT 'formation_ajouter', 'Ajouter une formation ', 30 UNION
    SELECT 'formation_modifier', 'Modifier une formation ', 40 UNION
    SELECT 'formation_historiser', 'Historiser/Restaurer une formation ', 50 UNION
    SELECT 'formation_supprimer', 'Supprimer une formation ', 60 UNION
    SELECT 'formation_questionnaire_visualiser', 'Afficher les questionnaires de retour de formation', 110 UNION
    SELECT 'formation_questionnaire_modifier', 'Renseigner les questionnaires de retour de formation', 120
    SELECT 'formation_supprimer', 'Supprimer une formation ', 60
)
SELECT cp.id, d.code, d.lib, d.ordre
FROM d
+21 −38
Changes for module/Formation/src/Formation/Entity/Db/FormationInstanceInscrit.php: 21 added lines, 38 removed lines.
Original line number Diff line number Diff line
@@ -10,8 +10,9 @@ use DateInterval;
use DateTime;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Common\Collections\Collection;
use Exception;
use Laminas\Permissions\Acl\Resource\ResourceInterface;
use UnicaenAutoform\Entity\Db\FormulaireInstance;
use RuntimeException;
use UnicaenEtat\Entity\Db\HasEtatInterface;
use UnicaenEtat\Entity\Db\HasEtatTrait;
use UnicaenUtilisateur\Entity\Db\HistoriqueAwareInterface;
@@ -23,7 +24,7 @@ class FormationInstanceInscrit implements HistoriqueAwareInterface, HasAgentInte
    use HasSourceTrait;
    use HistoriqueAwareTrait;

    public function getResourceId()
    public function getResourceId() : string
    {
        return 'Inscrit';
    }
@@ -31,29 +32,25 @@ class FormationInstanceInscrit implements HistoriqueAwareInterface, HasAgentInte
    const PRINCIPALE = 'principale';
    const COMPLEMENTAIRE = 'complementaire';

    /** @var integer */
    private $id;
    /** @var FormationInstance */
    private $instance;
    /** @var Agent */
    private $agent;
    /** @var string */
    private $liste;
    /** @var ArrayCollection (Presence) */
    private $presences;
    /** @var FormationInstanceFrais */
    private $frais;
    /** @var FormulaireInstance */
    private $questionnaire;
    /** @var string|null */
    private $complement;
    private ?DateTime $validationEnquete;
    private ?int $id = null;
    private ?FormationInstance $instance = null;
    private ?Agent $agent = null;
    private ?string $liste = null;
    private Collection $presences;
    private ?FormationInstanceFrais $frais = null;
    private ?string $complement = null;
    private ?DateTime $validationEnquete = null;
    private Collection $reponsesEnquete;

    private ?string $justificationAgent = null;
    private ?string $justificationResponsable = null;
    private ?string $justificationRefus = null;

    public function __construct()
    {
        $this->presences = new ArrayCollection();
        $this->reponsesEnquete = new ArrayCollection();
    }

    /**
     * @return int
     */
@@ -135,30 +132,12 @@ class FormationInstanceInscrit implements HistoriqueAwareInterface, HasAgentInte
        return $this;
    }

    /**
     * @return FormulaireInstance|null
     */
    public function getQuestionnaire(): ?FormulaireInstance
    {
        return $this->questionnaire;
    }

    /**
     * @param FormulaireInstance $questionnaire
     * @return FormationInstanceInscrit
     */
    public function setQuestionnaire(FormulaireInstance $questionnaire): FormationInstanceInscrit
    {
        $this->questionnaire = $questionnaire;
        return $this;
    }

    /**
     * @return EnqueteReponse[]
     */
    public function getReponsesEnquete(): array
    {
        if ($this->reponsesEnquete === null) return [];
        $responses = $this->reponsesEnquete->toArray();
        $responses = array_filter($responses, function (EnqueteReponse $a) { return $a->estNonHistorise(); });
        return $responses;
@@ -239,7 +218,11 @@ class FormationInstanceInscrit implements HistoriqueAwareInterface, HasAgentInte
            }
            if ($journee->getType() === Seance::TYPE_VOLUME) {
                $volume = $journee->getVolume();
                try {
                    $temp = new DateInterval('PT' . $volume . 'H');
                } catch (Exception $e) {
                    throw new RuntimeException("Unproblème est survenu lors de la création de l'intervale avec [PT".$volume."H]");
                }
                $sum->add($temp);
            }
        }
+0 −3
Changes for module/Formation/src/Formation/Entity/Db/Mapping/Formation.Entity.Db.FormationInstanceInscrit.dcm.xml: 0 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -18,9 +18,6 @@
        <one-to-one field="frais"       target-entity="Formation\Entity\Db\FormationInstanceFrais"      mapped-by="inscrit" />
        <one-to-many field="presences"  target-entity="Formation\Entity\Db\Presence"   mapped-by="inscrit" />

        <one-to-one target-entity="UnicaenAutoform\Entity\Db\FormulaireInstance"  field="questionnaire">
            <join-column name="questionnaire_id" referenced-column-name="id"/>
        </one-to-one>
        <many-to-one target-entity="UnicaenEtat\Entity\Db\Etat"  field="etat">
            <join-column name="etat_id" referenced-column-name="id"/>
        </many-to-one>