Commit 6b27c407 authored by Florian Joriot's avatar Florian Joriot
Browse files

Ajout du taux de rému dans le statut

parent c14bf1c2
Loading
Loading
Loading
Loading
+16 −0
Changes for data/ddl/ref-constraint/STATUT_TAUX_FK.php: 16 added lines, 0 removed lines.
Original line number Diff line number Diff line
<?php

//@formatter:off

return [
    'name'        => 'STATUT_TAUX_FK',
    'table'       => 'STATUT',
    'rtable'      => 'TAUX_REMU',
    'delete_rule' => NULL,
    'index'       => NULL,
    'columns'     => [
        'TAUX_REMU_ID' => 'ID',
    ],
];

//@formatter:on
+12 −0
Changes for data/ddl/table/STATUT.php: 12 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -1005,6 +1005,18 @@ return [
            'position'    => 81,
            'commentaire' => NULL,
        ],
        'TAUX_REMU_ID'                   => [
            'name'        => 'TAUX_REMU_ID',
            'type'        => 'int',
            'bdd-type'    => 'NUMBER',
            'length'      => 0,
            'scale'       => NULL,
            'precision'   => NULL,
            'nullable'    => TRUE,
            'default'     => NULL,
            'position'    => 85,
            'commentaire' => NULL,
        ],
        'TYPE_INTERVENANT_ID'            => [
            'name'        => 'TYPE_INTERVENANT_ID',
            'type'        => 'int',
+1 −0
Changes for data/ddl_columns_pos.php: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -1307,6 +1307,7 @@ return [
        'CONTRAT_GENERATION',
        'MISSION',
        'MISSION_REALISE_EDITION',
        'TAUX_REMU_ID',
    ],
    'STRUCTURE'                      => [
        'ID',
+4 −2
Changes for front/Paiement/Taux.vue: 4 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@
                   @click.prevent="saisie">
                    <u-icon name="pen-to-square"/>
                    Modifier</a>
                &nbsp;
                &nbsp
                <a v-if="canDeleteTaux"
                   :href="supprimerUrl"
                   class="btn btn-danger"
@@ -25,7 +25,7 @@
                Modification :<br/>
                <ul>
                    <div v-for="tauxValeur in taux.tauxRemuValeurs" :key="tauxValeur.id">
                        <li>
                        <li class="">
                            <div class="row align-items-start">
                                <div class="col-md-4">
                                    {{ tauxValeur.valeur }}€/h à partir du {{ tauxValeur.dateEffet }}
@@ -37,6 +37,7 @@
                                       :data-id="tauxValeur.id">
                                        <i class="fas fa-pen-to-square" :data-id="tauxValeur.id"/>
                                    </a>
                                    &nbsp
                                    <a v-if="canDeleteTaux"
                                       class="btn btn-danger btn-sm"
                                       @click.prevent="supprimerValeur"
@@ -75,6 +76,7 @@
                                           :data-id="tauxValeur.id">
                                            <i class=" fas fa-pen-to-square" :data-id="tauxValeur.id"/>
                                        </a>
                                        &nbsp
                                        <a v-if="canDeleteTaux"
                                           class="btn btn-sm btn-danger"
                                           @click.prevent="supprimerValeur"
+3 −0
Changes for module/Intervenant/src/Entity/Db/Mapping/Intervenant.Entity.Db.Statut.dcm.xml: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -114,5 +114,8 @@
        <many-to-one field="histoDestructeur" target-entity="Application\Entity\Db\Utilisateur">
                <join-column name="HISTO_DESTRUCTEUR_ID" referenced-column-name="ID"/>
        </many-to-one>
        <many-to-one field="tauxRemu" target-entity="Paiement\Entity\Db\TauxRemu">
            <join-column name="TAUX_REMU_ID" referenced-column-name="ID"/>
        </many-to-one>
    </entity>
</doctrine-mapping>
Loading