Commit 2079814d authored by Antony Le Courtes's avatar Antony Le Courtes
Browse files

Meilleure gestion pour le hors établissement pour qu'il s'affiche dans la...

Meilleure gestion pour le hors établissement pour qu'il s'affiche dans la partie demande de mise en paiement de la composante d'affectation de l'intervenant
parent 7cfe8d3a
Loading
Loading
Loading
Loading
Loading
+2 −1
Changes for front/Paiement/DemandeMiseEnPaiementStructure.vue: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -62,7 +62,8 @@
                <div v-for="(etape, codeEtape) in datas.etapes">
                    <div v-for="(enseignement,codeEnseignement) in etape.enseignements">
                        <div class="cartridge gray bordered" style="padding-bottom: 5px">
                            <span>Enseignement</span>
                            <span v-if="etape.exterieur == 0">Enseignement</span>
                            <span v-if="etape.exterieur == 1">Enseignement hors établissement</span>
                            <span v-html="codeEtape +  ' - ' + shorten(etape.libelle, 40)"></span>
                            <span>{{ codeEnseignement + ' - ' + enseignement.libelle }}</span>
                        </div>
+10 −3
Changes for module/Paiement/src/Service/DemandesService.php: 10 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -185,13 +185,16 @@ class DemandesService extends AbstractService
            tp.structure_id                     structure_id,
            COALESCE(MAX(se.code), 
                     MAX(ssr.code),
                     MAX(sm.code))              structure_code,
                     MAX(sm.code),
                     MAX(si.code))              structure_code,
            COALESCE(MAX(se.libelle_long), 
                     MAX(ssr.libelle_long),
                     MAX(sm.libelle_long))      structure_libelle,
                     MAX(sm.libelle_long),
                     MAX(si.libelle_long))      structure_libelle,
            COALESCE(MAX(se.libelle_court), 
                     MAX(ssr.libelle_court),
                     MAX(sm.libelle_court))   	structure_libelle_court,
                     MAX(sm.libelle_court),
                     MAX(si.libelle_court))   	structure_libelle_court,
            CASE
                WHEN MAX(tp.service_id) IS NOT NULL AND MAX(s.element_pedagogique_id) IS NOT NULL THEN 'enseignement'
                WHEN MAX(tp.service_id) IS NOT NULL AND MAX(s.element_pedagogique_id) IS NULL THEN 'enseignement-exterieur'
@@ -258,6 +261,8 @@ class DemandesService extends AbstractService
        LEFT JOIN structure sm ON sm.id = m.structure_id
        LEFT JOIN type_mission tm ON tm.id = m.type_mission_id
        LEFT JOIN etablissement etab ON etab.id = s.etablissement_id
        LEFT JOIN intervenant i ON i.id = tp.intervenant_id
        LEFT JOIN structure si ON si.id = i.structure_id
        WHERE
            tp.intervenant_id = :intervenant ";

@@ -317,6 +322,7 @@ class DemandesService extends AbstractService
                $dmep[$value['STRUCTURE_CODE']]['libelle']                                                                                                                  = $value['STRUCTURE_LIBELLE'];
                $dmep[$value['STRUCTURE_CODE']]['libelleCourt']                                                                                                             = $value['STRUCTURE_LIBELLE_COURT'];
                $dmep[$value['STRUCTURE_CODE']]['etapes'][$value['ETAPE_CODE']]['libelle']                                                                                  = $value['ETAPE_LIBELLE'];
                $dmep[$value['STRUCTURE_CODE']]['etapes'][$value['ETAPE_CODE']]['exterieur'] = 0;
                $dmep[$value['STRUCTURE_CODE']]['etapes'][$value['ETAPE_CODE']]['enseignements'][$value['ELEMENT_CODE']]['libelle']                                         = $value['ELEMENT_LIBELLE'];
                $dmep[$value['STRUCTURE_CODE']]['etapes'][$value['ETAPE_CODE']]['enseignements'][$value['ELEMENT_CODE']]['typeHeure'][$value['TYPE_HEURE_CODE']]['libelle'] = $value['TYPE_HEURE_LIBELLE'];
                if (!array_key_exists('heures', $dmep[$value['STRUCTURE_CODE']]['etapes'][$value['ETAPE_CODE']]['enseignements'][$value['ELEMENT_CODE']]['typeHeure'][$value['TYPE_HEURE_CODE']])) {
@@ -388,6 +394,7 @@ class DemandesService extends AbstractService
                $dmep[$value['STRUCTURE_CODE']]['libelle']                                                                                                   = $value['STRUCTURE_LIBELLE'];
                $dmep[$value['STRUCTURE_CODE']]['libelleCourt']                                                                                              = $value['STRUCTURE_LIBELLE_COURT'];
                $dmep[$value['STRUCTURE_CODE']]['etapes'][$value['ETAB_CODE']]['libelle'] = $value['ETAB_LIBELLE'];
                $dmep[$value['STRUCTURE_CODE']]['etapes'][$value['ETAB_CODE']]['exterieur'] = 1;
                $dmep[$value['STRUCTURE_CODE']]['etapes'][$value['ETAB_CODE']]['enseignements'][$ensCode]['libelle']                                         = $value['ENSEIGNEMENT_EXT_LIBELLE'];
                $dmep[$value['STRUCTURE_CODE']]['etapes'][$value['ETAB_CODE']]['enseignements'][$ensCode]['typeHeure'][$value['TYPE_HEURE_CODE']]['libelle'] = $value['TYPE_HEURE_LIBELLE'];
                if (!array_key_exists('heures', $dmep[$value['STRUCTURE_CODE']]['etapes'][$value['ETAB_CODE']]['enseignements'][$ensCode]['typeHeure'][$value['TYPE_HEURE_CODE']])) {
+2 −2
Changes for public/dist/.vite/manifest.json: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@
    "name": "vendor"
  },
  "main.js": {
    "file": "assets/main-CR5_7u4t.js",
    "file": "assets/main-C137TWer.js",
    "name": "main",
    "src": "main.js",
    "isEntry": true,
@@ -12,7 +12,7 @@
      "_vendor-KzP7jRq0.js"
    ],
    "css": [
      "assets/main-DNNuuxg0.css"
      "assets/main-DcqHEHht.css"
    ]
  }
}
 No newline at end of file
+9 −9

File changed and moved.

Preview size limit exceeded, changes collapsed.

+1 −1
Changes for public/dist/assets/main-DcqHEHht.css: 1 added line, 1 removed line.
Original line number Diff line number Diff line
.user-profile-select-form[data-v-cbfe77c3]{padding-left:25px}input.is-invalid[data-v-29c90e6d]{background-color:#dc4c64}.cartridge[data-v-ba77464f]{white-space:nowrap}.icon-attention[data-v-ba77464f]{font-size:50pt;float:left;margin-right:20pt;margin-top:0;line-height:42pt}.desactivee[data-v-ba77464f]{background-color:#fdfdfd;font-style:italic;color:#bbb}.code[data-v-f6c21cf6]{font-weight:400;font-size:7pt}.arrondi[data-v-717df7b7]{text-decoration:underline dotted}.arrondi-defaut[data-v-717df7b7]{color:#00f;background-color:#e6e6ff;text-decoration:underline dotted}.arrondi-exces[data-v-717df7b7]{color:red;background-color:#ffe6e6;text-decoration:underline dotted}table tr.details th[data-v-07a28351]{font-weight:700;background-color:#f8f8f8}.table-details tr.details th[data-v-07a28351]{font-size:8pt}.btn-choixtevh[data-v-07a28351]{width:100%;margin-bottom:6px}.total[data-v-07a28351]{text-align:right;font-weight:700}table.table-details[data-v-07a28351]{border-top:0px white solid}th.service[data-v-07a28351]{border-left:0px white solid;border-right:0px white solid;padding-top:1em;padding-bottom:2px}.types-interventions[data-v-140dc61b]{overflow:scroll}.types-interventions table[data-v-140dc61b] *{border-width:1px 1px}.types-interventions table th[data-v-140dc61b],.types-interventions table td[data-v-140dc61b]{min-width:5em;white-space:nowrap}.saisie[data-v-140dc61b]{background-color:#fff8dc}.fvh th[data-v-140dc61b]{font-size:8pt}.fvh td[data-v-140dc61b]{white-space:nowrap;min-width:4em;padding:0}.fvh td .pourc[data-v-140dc61b]{font-size:8pt}.spacer[data-v-140dc61b]{max-width:5px!important;min-width:5px!important}.dinput[data-v-140dc61b]{border:none;height:2em;width:100%;background-color:#fff8dc}.doutput[data-v-140dc61b]{border:none;height:2em;width:100%;background-color:transparent}.res-mode[data-v-140dc61b]{width:100%;min-width:300px}.resultats td[data-v-140dc61b]{text-align:right}.debug-td[data-v-140dc61b]{min-width:42em!important}.debug-cell[data-v-140dc61b]{background-color:#ccc;color:#000;margin:2px;padding:3px;border-radius:5px;font-size:8pt;white-space:nowrap;float:left}.debug-val[data-v-140dc61b]{background-color:#fff;padding:0 3px;border-top-right-radius:5px;border-bottom-right-radius:5px;color:#000;font-size:8pt}.importer[data-v-140dc61b]{display:none}.actions .btn[data-v-140dc61b]{width:100%}.actions label[data-v-140dc61b]{display:block}table[data-v-f852d328]{margin-bottom:0}td.nombre[data-v-f852d328]{text-align:right}table.table-bordered[data-v-f852d328] *{border-width:1px}.sous-structures[data-v-046af32d]{padding-left:4em}.card-header h5[data-v-1735108d]{font-weight:500}.btn[data-v-1735108d]{margin-left:2px;margin-right:2px}.table tr[data-v-b803dde7]{background-color:#f4f4f4;border-left:1px #ddd solid;border-right:1px #ddd solid}.table-hover tr[data-v-b803dde7]:hover{background-color:#f7f7f7}.recherche[data-v-b803dde7]{text-align:center}.recherche .btn-group[data-v-b803dde7]{box-shadow:none;margin:auto}.recherche select.btn[data-v-b803dde7]{padding-right:3em}.recherche #otherMois[data-v-b803dde7]{width:12em}.recherche #otherAnnee[data-v-b803dde7]{width:8em}th.nom-jour[data-v-b803dde7]{width:1%;padding-left:3px}th.numero-jour[data-v-b803dde7]{width:1%;padding-right:.5em}.recherche[data-v-b803dde7]{justify-content:center;padding-bottom:5px}.event[data-v-b803dde7]{display:flex;justify-content:space-between;align-items:center;margin-bottom:3px;border-left:10px #bbb solid;border-right:10px #bbb solid}.event[data-v-b803dde7]:hover{background-color:#fff}.event-content[data-v-e888b6fc]{flex-grow:1}.event-content.valide[data-v-e888b6fc]{background-color:#ff0}.event-content p[data-v-e888b6fc]{margin-bottom:.2rem}.event-content p.mission[data-v-e888b6fc]{font-weight:700}.event-content p.horaires[data-v-e888b6fc]{font-style:italic;font-weight:lighter}.event-actions[data-v-e888b6fc]{align-self:flex-start}.table[data-v-6001d54b]{margin-bottom:1px}.lap[data-v-6001d54b]{padding-top:.5em;padding-bottom:.5em}.lap[data-v-6001d54b]:hover{background-color:#fff9de}
.user-profile-select-form[data-v-cbfe77c3]{padding-left:25px}input.is-invalid[data-v-29c90e6d]{background-color:#dc4c64}.cartridge[data-v-ba77464f]{white-space:nowrap}.icon-attention[data-v-ba77464f]{font-size:50pt;float:left;margin-right:20pt;margin-top:0;line-height:42pt}.desactivee[data-v-ba77464f]{background-color:#fdfdfd;font-style:italic;color:#bbb}.code[data-v-f6c21cf6]{font-weight:400;font-size:7pt}.arrondi[data-v-717df7b7]{text-decoration:underline dotted}.arrondi-defaut[data-v-717df7b7]{color:#00f;background-color:#e6e6ff;text-decoration:underline dotted}.arrondi-exces[data-v-717df7b7]{color:red;background-color:#ffe6e6;text-decoration:underline dotted}table tr.details th[data-v-07a28351]{font-weight:700;background-color:#f8f8f8}.table-details tr.details th[data-v-07a28351]{font-size:8pt}.btn-choixtevh[data-v-07a28351]{width:100%;margin-bottom:6px}.total[data-v-07a28351]{text-align:right;font-weight:700}table.table-details[data-v-07a28351]{border-top:0px white solid}th.service[data-v-07a28351]{border-left:0px white solid;border-right:0px white solid;padding-top:1em;padding-bottom:2px}.types-interventions[data-v-bd222fc1]{overflow:scroll}.types-interventions table[data-v-bd222fc1] *{border-width:1px 1px}.types-interventions table th[data-v-bd222fc1],.types-interventions table td[data-v-bd222fc1]{min-width:5em;white-space:nowrap}.saisie[data-v-bd222fc1]{background-color:#fff8dc}.fvh th[data-v-bd222fc1]{font-size:8pt}.fvh td[data-v-bd222fc1]{white-space:nowrap;min-width:4em;padding:0}.fvh td .pourc[data-v-bd222fc1]{font-size:8pt}.spacer[data-v-bd222fc1]{max-width:5px!important;min-width:5px!important}.dinput[data-v-bd222fc1]{border:none;height:2em;width:100%;background-color:#fff8dc}.doutput[data-v-bd222fc1]{border:none;height:2em;width:100%;background-color:transparent}.res-mode[data-v-bd222fc1]{width:100%;min-width:300px}.resultats td[data-v-bd222fc1]{text-align:right}.debug-td[data-v-bd222fc1]{min-width:42em!important}.debug-cell[data-v-bd222fc1]{background-color:#ccc;color:#000;margin:2px;padding:3px;border-radius:5px;font-size:8pt;white-space:nowrap;float:left}.debug-val[data-v-bd222fc1]{background-color:#fff;padding:0 3px;border-top-right-radius:5px;border-bottom-right-radius:5px;color:#000;font-size:8pt}.importer[data-v-bd222fc1]{display:none}.actions .btn[data-v-bd222fc1]{width:100%}.actions label[data-v-bd222fc1]{display:block}table[data-v-f852d328]{margin-bottom:0}td.nombre[data-v-f852d328]{text-align:right}table.table-bordered[data-v-f852d328] *{border-width:1px}.sous-structures[data-v-046af32d]{padding-left:4em}.card-header h5[data-v-6ff4d26e]{font-weight:500}.btn[data-v-6ff4d26e]{margin-left:2px;margin-right:2px}.table tr[data-v-b803dde7]{background-color:#f4f4f4;border-left:1px #ddd solid;border-right:1px #ddd solid}.table-hover tr[data-v-b803dde7]:hover{background-color:#f7f7f7}.recherche[data-v-b803dde7]{text-align:center}.recherche .btn-group[data-v-b803dde7]{box-shadow:none;margin:auto}.recherche select.btn[data-v-b803dde7]{padding-right:3em}.recherche #otherMois[data-v-b803dde7]{width:12em}.recherche #otherAnnee[data-v-b803dde7]{width:8em}th.nom-jour[data-v-b803dde7]{width:1%;padding-left:3px}th.numero-jour[data-v-b803dde7]{width:1%;padding-right:.5em}.recherche[data-v-b803dde7]{justify-content:center;padding-bottom:5px}.event[data-v-b803dde7]{display:flex;justify-content:space-between;align-items:center;margin-bottom:3px;border-left:10px #bbb solid;border-right:10px #bbb solid}.event[data-v-b803dde7]:hover{background-color:#fff}.event-content[data-v-e888b6fc]{flex-grow:1}.event-content.valide[data-v-e888b6fc]{background-color:#ff0}.event-content p[data-v-e888b6fc]{margin-bottom:.2rem}.event-content p.mission[data-v-e888b6fc]{font-weight:700}.event-content p.horaires[data-v-e888b6fc]{font-style:italic;font-weight:lighter}.event-actions[data-v-e888b6fc]{align-self:flex-start}.table[data-v-6001d54b]{margin-bottom:1px}.lap[data-v-6001d54b]{padding-top:.5em;padding-bottom:.5em}.lap[data-v-6001d54b]:hover{background-color:#fff9de}