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

Correction de identite et du mapping de these

parent 1f6e8633
Loading
Loading
Loading
Loading
+3 −3
Changes for module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Financement.dcm.xml: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@
<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"
    <entity name="Application\Entity\Db\Financement" table="FINANCEMENT"
            repository-class="">
        <id name="id" type="integer" column="ID">
            <generator strategy="SEQUENCE"/>
@@ -20,9 +20,9 @@
            </join-columns>
        </many-to-one>

        <field name="annee"                     column="ANNEE_ID"                   type="int"                          nullable="false" />
        <field name="annee"                     column="ANNEE_ID"                   type="integer"                          nullable="false" />

        <many-to-one field="origineFinacement" target-entity="Application\Entity\Db\OrigineFinancement">
        <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>
+1 −10
Changes for module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.These.dcm.xml: 1 added line, 10 removed lines.
Original line number Diff line number Diff line
@@ -93,15 +93,6 @@
            </join-columns>
        </many-to-one>

        <many-to-many target-entity="Application\Entity\Db\Financement" field="financements">
            <join-table name="FINANCEMENT_THESE">
                <join-columns>
                    <join-column name="THESE_ID" referenced-column-name="ID"/>
                </join-columns>
                <inverse-join-columns>
                    <join-column name="FINANCEMENT_ID" referenced-column-name="ID"/>
                </inverse-join-columns>
            </join-table>
        </many-to-many>
        <one-to-many target-entity="Application\Entity\Db\Financement" field="financements" mapped-by="these"/>
    </entity>
</doctrine-mapping>
+9 −1
Changes for module/Application/view/application/these/identite.phtml: 9 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -225,8 +225,16 @@ $persopassModifiedEvent = 'persopass-modified-event';
                Financement(s)
            </dt>
            <dd>
                <?php /** @var \Application\Entity\Db\Financement $financement */ ?>
                <?php foreach ($these->getFinancements() as $financement) : ?>
                    <?php echo $financement->getLibelle(); ?> <br/>
                    <?php echo $financement->getOrigineFinancement()->getLibelle(); ?>
                    <?php if($financement->getQuotiteFinancement()): ?>
                        (<?php echo $financement->getQuotiteFinancement(); ?>)
                    <?php endif; ?>
                    <?php if($financement->getComplementFinancement()): ?>
                        - <?php echo $financement->getComplementFinancement(); ?>
                    <?php endif; ?>
                    <br/>
                <?php endforeach; ?>
            </dd>