Commit 02a17c24 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Merge branch 'feature_cotutelle' into test

parents e534e0a5 65a1986e
Loading
Loading
Loading
Loading
+7 −0
Changes for doc/release-notes/v14/14.0.0/01_these_cotutelle.sql: 7 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -79,6 +79,8 @@ create table these_cotutelle_fichier
        constraint these_cotutelle_fichier_fichier_fk
            references fichier,

    commentaire           text,

    histo_createur_id     bigint                                                       not null
        constraint these_cotutelle_fichier_hc_fk
            references utilisateur,
@@ -108,6 +110,7 @@ create table these_cotutelle_avenant

    modifie_date_fin_cotutelle  boolean   default false                                      not null,
    nouvelle_date_fin_cotutelle date,
    commentaire                 text,

    -- document correspondant à l'avenant
    -- (si le dépôt de plusieurs fichiers devient nécessaire pour un même avenant, cf. table commentée ci-dessous)
@@ -176,6 +179,8 @@ create table these_cotutelle_inscription
        constraint these_cotutelle_frais_inscr_fichier_fk
            references fichier,

    commentaire                         text,

    histo_createur_id                   bigint                                                       not null
        constraint these_cotutelle_frais_inscr_hc_fk
            references utilisateur,
@@ -207,6 +212,8 @@ create table these_cotutelle_presence
    date_debut                 date                                                         not null,
    date_fin                   date                                                         not null,

    commentaire                text,

    justif_presence_fichier_id bigint
        constraint these_cotutelle_presence_justif_presence_fichier_fk
            references fichier,
+1 −0
Changes for module/TheseCotutelle/src/TheseCotutelle/Entity/Db/Mapping/TheseCotutelle.Entity.Db.TheseCotutelleAvenant.dcm.xml: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@
        <field name="numero" type="integer" column="numero"/>
        <field name="modifieDateFinCotutelle" type="boolean" column="modifie_date_fin_cotutelle"/>
        <field name="nouvelleDateFinCotutelle" type="date" column="nouvelle_date_fin_cotutelle"/>
        <field name="commentaire" type="string" column="commentaire"/>

        <field name="histoCreation" type="datetime" column="histo_creation"/>
        <field name="histoDestruction" type="datetime" column="histo_destruction" nullable="true"/>
+2 −0
Changes for module/TheseCotutelle/src/TheseCotutelle/Entity/Db/Mapping/TheseCotutelle.Entity.Db.TheseCotutelleFichier.dcm.xml: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@
            </join-columns>
        </many-to-one>

        <field name="commentaire" type="string" column="commentaire"/>

        <field name="histoCreation" type="datetime" column="histo_creation"/>
        <field name="histoDestruction" type="datetime" column="histo_destruction" nullable="true"/>
        <field name="histoModification" type="datetime" column="histo_modification"/>
+1 −0
Changes for module/TheseCotutelle/src/TheseCotutelle/Entity/Db/Mapping/TheseCotutelle.Entity.Db.TheseCotutelleInscription.dcm.xml: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@
        </id>

        <field name="annee" type="integer" column="annee"/>
        <field name="commentaire" type="string" column="commentaire"/>

        <many-to-one field="theseCotutelle" target-entity="TheseCotutelle\Entity\Db\TheseCotutelle">
            <join-columns>
+1 −0
Changes for module/TheseCotutelle/src/TheseCotutelle/Entity/Db/Mapping/TheseCotutelle.Entity.Db.TheseCotutellePresence.dcm.xml: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@

        <field name="dateDebut" type="date" column="date_debut"/>
        <field name="dateFin" type="date" column="date_fin"/>
        <field name="commentaire" type="string" column="commentaire"/>

        <field name="histoCreation" type="datetime" column="histo_creation"/>
        <field name="histoDestruction" type="datetime" column="histo_destruction" nullable="true"/>
Loading