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

Progress

parent 7bb795eb

module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.SpecificiteActivite.dcm.xml→module/FichePoste/src/FichePoste/Entity/Db/Mapping/FichePoste.Entity.Db.MissionAdditionnelle.dcm.xml

+31 −7
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">

    <entity name="Application\Entity\Db\SpecificiteActivite" table="ficheposte_activite_specifique">

    <entity name="Application\Entity\Db\FichePoste" table="ficheposte">



        <id name="id" type="integer" column="id">

            <generator strategy="IDENTITY"/>

        </id>



        <many-to-one field="specificite" target-entity="Application\Entity\Db\SpecificitePoste">

            <join-column name="specificite_id" referenced-column-name="id" />

        <field name="libelle"           type="string" length="256"      column="libelle"            nullable="false"/>



        <many-to-one field="agent" target-entity="Application\Entity\Db\Agent">

            <join-column name="agent" referenced-column-name="c_individu" />

        </many-to-one>

        <many-to-one field="activite" target-entity="Application\Entity\Db\Activite">

            <join-column name="activite_id" referenced-column-name="id" />



        <one-to-one field="specificite" target-entity="Application\Entity\Db\SpecificitePoste" mapped-by="fiche"/>



        <one-to-many target-entity="Application\Entity\Db\Expertise"                mapped-by="ficheposte" field="expertises"/>



        <one-to-many target-entity="Application\Entity\Db\FicheTypeExterne" mapped-by="fichePoste" field="fichesMetiers"/>

        <one-to-many target-entity="Application\Entity\Db\FicheposteApplicationRetiree" mapped-by="fichePoste" field="applicationsRetirees"/>

        <one-to-many target-entity="Application\Entity\Db\FicheposteCompetenceRetiree" mapped-by="fichePoste" field="competencesRetirees"/>

        <one-to-many target-entity="Application\Entity\Db\FicheposteActiviteDescriptionRetiree" mapped-by="fichePoste" field="descriptionsRetirees"/>



        <many-to-one field="etat" target-entity="UnicaenEtat\Entity\Db\Etat">

            <join-column name="etat_id" referenced-column-name="id" />

        </many-to-one>

        <field name="rifseep"           type="integer"      column="rifseep"            nullable="true"/>

        <field name="nbi"               type="integer"      column="nbi"                nullable="true"/>



        <field name="retrait"               column="retrait"                type="string"   length="1024"   nullable="true"/>

        <field name="description"           column="description"            type="string"   length="9999"   nullable="true"/>

        <many-to-many field="validations" target-entity="UnicaenValidation\Entity\Db\ValidationInstance">

            <join-table name="ficheposte_validation">

                <join-columns>

                    <join-column name="ficheposte_id" referenced-column-name="id" />

                </join-columns>

                <inverse-join-columns>

                    <join-column name="validation_id" referenced-column-name="id" />

                </inverse-join-columns>

            </join-table>

        </many-to-many>



        <field name="finValidite"     type="datetime"                 column="fin_validite"     nullable="false"/>

        <one-to-one field="poste" target-entity="Application\Entity\Db\Poste" mapped-by="ficheposte"/>

        <!-- DONNEE POUR L'HISTORISATION ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->

        <field name="histoCreation"     type="datetime"                 column="histo_creation"     nullable="false"/>

        <field name="histoModification" type="datetime"                 column="histo_modification" nullable="false"/>

module/Application/src/Application/Entity/Db/SpecificiteActivite.php→module/FichePoste/src/FichePoste/Entity/Db/MissionAdditionnelle.php

+17 −18
Original line number Diff line number Diff line 
<?php



namespace Application\Entity\Db;



use UnicaenUtilisateur\Entity\Db\HistoriqueAwareInterface;

use UnicaenUtilisateur\Entity\Db\HistoriqueAwareTrait;



class SpecificiteActivite implements HistoriqueAwareInterface {

class MissionAdditionnelle implements HistoriqueAwareInterface {

    use HistoriqueAwareTrait;



    /** @var int */

    private $id;

    /** @var SpecificitePoste */

    /** @var \Application\Entity\Db\SpecificitePoste */

    private $specificite;

    /** @var Activite */

    /** @var \Application\Entity\Db\Activite */

    private $activite;

    /** @var string|null */

    private $retrait;
@@ -28,36 +27,36 @@ class SpecificiteActivite implements HistoriqueAwareInterface { 
    }



    /**

     * @return SpecificitePoste|null

     * @return \Application\Entity\Db\SpecificitePoste|null

     */

    public function getSpecificite(): ?SpecificitePoste

    public function getSpecificite(): ?\Application\Entity\Db\SpecificitePoste

    {

        return $this->specificite;

    }



    /**

     * @param SpecificitePoste $specificite

     * @return SpecificiteActivite

     * @param \Application\Entity\Db\SpecificitePoste $specificite

     * @return \Application\Entity\Db\SpecificiteActivite

     */

    public function setSpecificite(SpecificitePoste $specificite): SpecificiteActivite

    public function setSpecificite(\Application\Entity\Db\SpecificitePoste $specificite): MissionAdditionnelle

    {

        $this->specificite = $specificite;

        return $this;

    }



    /**

     * @return Activite|null

     * @return \Application\Entity\Db\Activite|null

     */

    public function getActivite(): ?Activite

    public function getActivite(): ?\Application\Entity\Db\Activite

    {

        return $this->activite;

    }



    /**

     * @param Activite $activite

     * @return SpecificiteActivite

     * @param \Application\Entity\Db\Activite $activite

     * @return \Application\Entity\Db\SpecificiteActivite

     */

    public function setActivite(Activite $activite): SpecificiteActivite

    public function setActivite(\Application\Entity\Db\Activite $activite): MissionAdditionnelle

    {

        $this->activite = $activite;

        return $this;
@@ -73,9 +72,9 @@ class SpecificiteActivite implements HistoriqueAwareInterface { 


    /**

     * @param string|null $retrait

     * @return SpecificiteActivite

     * @return \Application\Entity\Db\SpecificiteActivite

     */

    public function setRetrait(?string $retrait): SpecificiteActivite

    public function setRetrait(?string $retrait): MissionAdditionnelle

    {

        $this->retrait = $retrait;

        return $this;
@@ -91,9 +90,9 @@ class SpecificiteActivite implements HistoriqueAwareInterface { 


    /**

     * @param string|null $description

     * @return SpecificiteActivite

     * @return \Application\Entity\Db\SpecificiteActivite

     */

    public function setDescription(?string $description): SpecificiteActivite

    public function setDescription(?string $description): MissionAdditionnelle

    {

        $this->description = $description;

        return $this;