Commit 7faa4957 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Merge branch 'financement'

parents ebcf1314 b5f11c7a
Loading
Loading
Loading
Loading
Loading
+12 −12
Changes for data/SQL/import.sql: 12 added lines, 12 removed lines.
Original line number Diff line number Diff line
/**
 * Ajout des colonnes Historique.
 */
alter TABLE SODOCT.VARIABLE ADD HISTO_CREATION        DATE DEFAULT SYSDATE not null;
alter TABLE SODOCT.VARIABLE ADD HISTO_CREATEUR_ID     NUMBER(38, 0) not null;
alter TABLE SODOCT.VARIABLE ADD HISTO_MODIFICATION    DATE DEFAULT SYSDATE  not null;
alter TABLE SODOCT.VARIABLE ADD HISTO_MODIFICATEUR_ID NUMBER(38, 0) not null;
alter TABLE SODOCT.VARIABLE ADD HISTO_DESTRUCTION     DATE;
alter TABLE SODOCT.VARIABLE ADD HISTO_DESTRUCTEUR_ID  NUMBER(38, 0);
ALTER TABLE SODOCT.VARIABLE ADD CONSTRAINT VARIABLE_HCFK FOREIGN KEY (HISTO_CREATEUR_ID) REFERENCES UTILISATEUR (ID);
ALTER TABLE SODOCT.VARIABLE ADD CONSTRAINT VARIABLE_HDFK FOREIGN KEY (HISTO_DESTRUCTEUR_ID) REFERENCES UTILISATEUR (ID);
ALTER TABLE SODOCT.VARIABLE ADD CONSTRAINT VARIABLE_HMFK FOREIGN KEY (HISTO_MODIFICATEUR_ID) REFERENCES UTILISATEUR (ID);
alter TABLE ORIGINE_FINANCEMENT ADD HISTO_CREATION        DATE DEFAULT SYSDATE not null;
alter TABLE ORIGINE_FINANCEMENT ADD HISTO_CREATEUR_ID     NUMBER(38, 0) not null;
alter TABLE ORIGINE_FINANCEMENT ADD HISTO_MODIFICATION    DATE DEFAULT SYSDATE  not null;
alter TABLE ORIGINE_FINANCEMENT ADD HISTO_MODIFICATEUR_ID NUMBER(38, 0) not null;
alter TABLE ORIGINE_FINANCEMENT ADD HISTO_DESTRUCTION     DATE;
alter TABLE ORIGINE_FINANCEMENT ADD HISTO_DESTRUCTEUR_ID  NUMBER(38, 0);
ALTER TABLE ORIGINE_FINANCEMENT ADD CONSTRAINT ORIGINE_FINANCEMENT_HCFK FOREIGN KEY (HISTO_CREATEUR_ID) REFERENCES UTILISATEUR (ID);
ALTER TABLE ORIGINE_FINANCEMENT ADD CONSTRAINT ORIGINE_FINANCEMENT_HDFK FOREIGN KEY (HISTO_DESTRUCTEUR_ID) REFERENCES UTILISATEUR (ID);
ALTER TABLE ORIGINE_FINANCEMENT ADD CONSTRAINT ORIGINE_FINANCEMENT_HMFK FOREIGN KEY (HISTO_MODIFICATEUR_ID) REFERENCES UTILISATEUR (ID);


/**
 * Ajout des colonnes Source.
 */
alter TABLE SODOCT.THESARD ADD SOURCE_ID   NUMBER(38, 0) not null;
alter TABLE SODOCT.THESARD ADD SOURCE_CODE VARCHAR2(64 CHAR);
ALTER TABLE SODOCT.THESARD ADD CONSTRAINT THESARD_SOURCE_FK FOREIGN KEY (SOURCE_ID) REFERENCES SOURCE (ID);
alter TABLE ORIGINE_FINANCEMENT ADD SOURCE_ID   NUMBER(38, 0) not null;
alter TABLE ORIGINE_FINANCEMENT ADD SOURCE_CODE VARCHAR2(64 CHAR);
ALTER TABLE ORIGINE_FINANCEMENT ADD CONSTRAINT ORIGINE_FINANCEMENT_SOURCE_FK FOREIGN KEY (SOURCE_ID) REFERENCES SOURCE (ID);
 No newline at end of file
+205 −0
Changes for module/Application/src/Application/Entity/Db/Financement.php: 205 added lines, 0 removed lines.
Original line number Diff line number Diff line
<?php

namespace Application\Entity\Db;

use DateTime;
use UnicaenApp\Entity\HistoriqueAwareTrait;
use UnicaenImport\Entity\Db\Source;

class Financement {

    use HistoriqueAwareTrait;

    /** @var int */
    private $id;
    /** @var Source */
    private $source;
    /** @var string */
    private $sourceCode;
    /** @var These */
    private $these;
    /** @var int */
    private $annee;
    /** @var OrigineFinancement */
    private $origineFinancement;
    /** @var string */
    private $complementFinancement;
    /** @var string */
    private $quotiteFinancement;
    /** @var DateTime */
    private $dateDebut;
    /** @var DateTime */
    private $dateFin;

    /**
     * @return int
     */
    public function getId()
    {
        return $this->id;
    }

    /**
     * @return Source
     */
    public function getSource()
    {
        return $this->source;
    }

    /**
     * @param Source $source
     * @return Financement
     */
    public function setSource($source)
    {
        $this->source = $source;
        return $this;
    }

    /**
     * @return string
     */
    public function getSourceCode()
    {
        return $this->sourceCode;
    }

    /**
     * @param string $sourceCode
     * @return Financement
     */
    public function setSourceCode($sourceCode)
    {
        $this->sourceCode = $sourceCode;
        return $this;
    }

    /**
     * @return These
     */
    public function getThese()
    {
        return $this->these;
    }

    /**
     * @param These $these
     * @return Financement
     */
    public function setThese($these)
    {
        $this->these = $these;
        return $this;
    }

    /**
     * @return int
     */
    public function getAnnee()
    {
        return $this->annee;
    }

    /**
     * @param int $annee
     * @return Financement
     */
    public function setAnnee($annee)
    {
        $this->annee = $annee;
        return $this;
    }

    /**
     * @return OrigineFinancement
     */
    public function getOrigineFinancement()
    {
        return $this->origineFinancement;
    }

    /**
     * @param OrigineFinancement $origineFinancement
     * @return Financement
     */
    public function setOrigineFinancement($origineFinancement)
    {
        $this->origineFinancement = $origineFinancement;
        return $this;
    }

    /**
     * @return string
     */
    public function getComplementFinancement()
    {
        return $this->complementFinancement;
    }

    /**
     * @param string $complementFinancement
     * @return Financement
     */
    public function setComplementFinancement($complementFinancement)
    {
        $this->complementFinancement = $complementFinancement;
        return $this;
    }

    /**
     * @return string
     */
    public function getQuotiteFinancement()
    {
        return $this->quotiteFinancement;
    }

    /**
     * @param string $quotiteFinancement
     * @return Financement
     */
    public function setQuotiteFinancement($quotiteFinancement)
    {
        $this->quotiteFinancement = $quotiteFinancement;
        return $this;
    }

    /**
     * @return DateTime
     */
    public function getDateDebut()
    {
        return $this->dateDebut;
    }

    /**
     * @param DateTime $dateDebut
     * @return Financement
     */
    public function setDateDebut($dateDebut)
    {
        $this->dateDebut = $dateDebut;
        return $this;
    }

    /**
     * @return DateTime
     */
    public function getDateFin()
    {
        return $this->dateFin;
    }

    /**
     * @param DateTime $dateFin
     * @return Financement
     */
    public function setDateFin($dateFin)
    {
        $this->dateFin = $dateFin;
        return $this;
    }


}
 No newline at end of file
+57 −0
Changes for module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Financement.dcm.xml: 57 added lines, 0 removed lines.
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\Financement" table="FINANCEMENT"
            repository-class="">
        <id name="id" type="integer" column="ID">
            <generator strategy="SEQUENCE"/>
        </id>

        <many-to-one field="source" target-entity="UnicaenImport\Entity\Db\Source">
            <join-columns>
                <join-column name="SOURCE_ID" referenced-column-name="ID"/>
            </join-columns>
        </many-to-one>

        <many-to-one field="these" target-entity="Application\Entity\Db\These">
            <join-columns>
                <join-column name="THESE_ID" referenced-column-name="ID"/>
            </join-columns>
        </many-to-one>

        <field name="annee" column="ANNEE" type="integer" nullable="false"/>
        <field name="sourceCode" type="string" column="SOURCE_CODE" length="64" nullable="true"/>

        <many-to-one field="origineFinancement" target-entity="Application\Entity\Db\OrigineFinancement">
            <join-columns>
                <join-column name="ORIGINE_FINANCEMENT_ID" referenced-column-name="ID"/>
            </join-columns>
        </many-to-one>

        <field name="complementFinancement" column="COMPLEMENT_FINANCEMENT" type="string" length="256" nullable="true"/>
        <field name="quotiteFinancement" column="QUOTITE_FINANCEMENT" type="string" length="8" nullable="true"/>
        <field name="dateDebut" column="DATE_DEBUT" type="datetime" nullable="true"/>
        <field name="dateFin" column="DATE_FIN" type="datetime" nullable="true"/>

        <field name="histoCreation" type="datetime" column="HISTO_CREATION" nullable="false"/>
        <field name="histoDestruction" type="datetime" column="HISTO_DESTRUCTION" nullable="true"/>
        <field name="histoModification" type="datetime" column="HISTO_MODIFICATION" nullable="false"/>

        <many-to-one field="histoCreateur" target-entity="Application\Entity\Db\Utilisateur">
            <join-columns>
                <join-column name="HISTO_CREATEUR_ID" referenced-column-name="ID"/>
            </join-columns>
        </many-to-one>
        <many-to-one field="histoModificateur" target-entity="Application\Entity\Db\Utilisateur">
            <join-columns>
                <join-column name="HISTO_MODIFICATEUR_ID" referenced-column-name="ID"/>
            </join-columns>
        </many-to-one>
        <many-to-one field="histoDestructeur" target-entity="Application\Entity\Db\Utilisateur">
            <join-columns>
                <join-column name="HISTO_DESTRUCTEUR_ID" referenced-column-name="ID"/>
            </join-columns>
        </many-to-one>
    </entity>
</doctrine-mapping>
 No newline at end of file
+43 −0
Changes for module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.OrigineFinancement.dcm.xml: 43 added lines, 0 removed lines.
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\OrigineFinancement" table="ORIGINE_FINANCEMENT"
            repository-class="">
        <id name="id" type="integer" column="ID">
            <generator strategy="SEQUENCE"/>
        </id>

        <field name="sourceCode" type="string" column="SOURCE_CODE" length="64" nullable="true"/>
        <field name="code" column="CODE" type="string" length="64" nullable="false"/>
        <field name="libelleLong" column="LIBELLE_LONG" type="string" length="256" nullable="false"/>
        <field name="libelleCourt" column="LIBELLE_COURT" type="string" length="64" nullable="false"/>

        <many-to-one field="source" target-entity="UnicaenImport\Entity\Db\Source">
            <join-columns>
                <join-column name="SOURCE_ID" referenced-column-name="ID"/>
            </join-columns>
        </many-to-one>

        <field name="histoCreation" type="datetime" column="HISTO_CREATION" nullable="false"/>
        <field name="histoDestruction" type="datetime" column="HISTO_DESTRUCTION" nullable="true"/>
        <field name="histoModification" type="datetime" column="HISTO_MODIFICATION" nullable="false"/>

        <many-to-one field="histoCreateur" target-entity="Application\Entity\Db\Utilisateur">
            <join-columns>
                <join-column name="HISTO_CREATEUR_ID" referenced-column-name="ID"/>
            </join-columns>
        </many-to-one>
        <many-to-one field="histoModificateur" target-entity="Application\Entity\Db\Utilisateur">
            <join-columns>
                <join-column name="HISTO_MODIFICATEUR_ID" referenced-column-name="ID"/>
            </join-columns>
        </many-to-one>
        <many-to-one field="histoDestructeur" target-entity="Application\Entity\Db\Utilisateur">
            <join-columns>
                <join-column name="HISTO_DESTRUCTEUR_ID" referenced-column-name="ID"/>
            </join-columns>
        </many-to-one>

    </entity>
</doctrine-mapping>
+3 −0
Changes for module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.These.dcm.xml: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -92,5 +92,8 @@
                <join-column name="HISTO_CREATEUR_ID" referenced-column-name="ID"/>
            </join-columns>
        </many-to-one>

        <one-to-many target-entity="Application\Entity\Db\Financement" field="financements" mapped-by="these"/>

    </entity>
</doctrine-mapping>
Loading