Skip to content
Snippets Groups Projects
Commit aa522851 authored by Antony Le Courtes's avatar Antony Le Courtes
Browse files

Correction affichage libellé mission dans le suivi de mission

parent 6b86263f
Branches
Tags 24.0-beta14
No related merge requests found
Pipeline #36170 passed
Stage: test
Show whitespace changes
Inline Side-by-side
Showing
with 10 additions and 8 deletions
front/Mission/SuiviEvent.vue
+ 1
− 1
View file @ aa522851
<template> <template>
<div class="event-content"> <div class="event-content">
<p class="mission">{{ event.mission.libelleCourt }} <span class="badge bg-success" v-if="event.valide">Validé</span></p> <p class="mission">{{ event.mission.libelleMission || event.mission.libelleCourt }} <span class="badge bg-success" v-if="event.valide">Validé</span></p>
<p class="horaires"> <p class="horaires">
de {{ heureDebut }} à {{ heureFin }}, soit {{ heures }} heure{{ heures < 2 ? '' : 's' }} de {{ heureDebut }} à {{ heureFin }}, soit {{ heures }} heure{{ heures < 2 ? '' : 's' }}
<span class="badge bg-secondary" v-if="event.formation">En formation</span> <span class="badge bg-secondary" v-if="event.formation">En formation</span>
......
module/Mission/src/Controller/SuiviController.php
+ 1
− 1
View file @ aa522851
...@@ -74,7 +74,7 @@ class SuiviController extends AbstractController ...@@ -74,7 +74,7 @@ class SuiviController extends AbstractController
$properties = [ $properties = [
'id', 'id',
['mission', ['id', 'libelleCourt']], ['mission', ['id', 'libelleCourt', 'libelleMission']],
'date', 'date',
'heureDebut', 'heureDebut',
'heureFin', 'heureFin',
......
module/Mission/src/Entity/Db/Mission.php
+ 1
− 1
View file @ aa522851
...@@ -62,7 +62,7 @@ class Mission implements HistoriqueAwareInterface, ResourceInterface, EntityMana ...@@ -62,7 +62,7 @@ class Mission implements HistoriqueAwareInterface, ResourceInterface, EntityMana
public function __toString(): string public function __toString(): string
{ {
return $this->getLibelleCourt() ?? ''; return $this->getLibelleMission() ? $this->getLibelleCourt() : '';
} }
......
module/Mission/src/Form/MissionSuiviForm.php
+ 3
− 1
View file @ aa522851
...@@ -47,7 +47,9 @@ class MissionSuiviForm extends AbstractForm ...@@ -47,7 +47,9 @@ class MissionSuiviForm extends AbstractForm
'options' => [ 'options' => [
'label' => 'Mission', 'label' => 'Mission',
'empty_option' => '- Non renseignée -', 'empty_option' => '- Non renseignée -',
'value_options' => Util::collectionAsOptions($missions), 'value_options' => Util::collectionAsOptions($missions, false, function ($m) {
return $m->getLibelleMission() ?? $m->getLibelleCourt();
}),
], ],
'attributes' => [ 'attributes' => [
'data-besoin-formation' => json_encode($besoinFormation), 'data-besoin-formation' => json_encode($besoinFormation),
......
public/dist/.vite/manifest.json
+ 2
− 2
View file @ aa522851
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"name": "vendor" "name": "vendor"
}, },
"main.js": { "main.js": {
"file": "assets/main-Cs49WrJ8.js", "file": "assets/main-B2CQGFD_.js",
"name": "main", "name": "main",
"src": "main.js", "src": "main.js",
"isEntry": true, "isEntry": true,
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
"_vendor-DcfRBLtF.js" "_vendor-DcfRBLtF.js"
], ],
"css": [ "css": [
"assets/main-BnA9GdwI.css" "assets/main-CM-4QD2K.css"
] ]
} }
} }
\ No newline at end of file
public/dist/assets/main-Cs49WrJ8.js → public/dist/assets/main-B2CQGFD_.js
+ 1
− 1
View file @ aa522851
Source diff could not be displayed: it is too large. Options to address this: view the blob.
public/dist/assets/main-BnA9GdwI.css → public/dist/assets/main-CM-4QD2K.css
+ 1
− 1
View file @ aa522851
.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-0606e4c1]{background-color:#f4f4f4;border-left:1px #ddd solid;border-right:1px #ddd solid}.table-hover tr[data-v-0606e4c1]:hover{background-color:#f7f7f7}.recherche[data-v-0606e4c1]{text-align:center}.recherche .btn-group[data-v-0606e4c1]{box-shadow:none;margin:auto}.recherche select.btn[data-v-0606e4c1]{padding-right:3em}.recherche #otherMois[data-v-0606e4c1]{width:12em}.recherche #otherAnnee[data-v-0606e4c1]{width:8em}th.nom-jour[data-v-0606e4c1]{width:1%;padding-left:3px}th.numero-jour[data-v-0606e4c1]{width:1%;padding-right:.5em}.recherche[data-v-0606e4c1]{justify-content:center;padding-bottom:5px}.event[data-v-0606e4c1]{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-0606e4c1]:hover{background-color:#fff}.event-content[data-v-17cb1f29]{flex-grow:1}.event-content.valide[data-v-17cb1f29]{background-color:#ff0}.event-content p[data-v-17cb1f29]{margin-bottom:.2rem}.event-content p.mission[data-v-17cb1f29]{font-weight:700}.event-content p.horaires[data-v-17cb1f29]{font-style:italic;font-weight:lighter}.event-actions[data-v-17cb1f29]{align-self:flex-start}.table[data-v-d4a24889]{margin-bottom:1px}.lap[data-v-d4a24889]{padding-top:.5em;padding-bottom:.5em}.lap[data-v-d4a24889]: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-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-0606e4c1]{background-color:#f4f4f4;border-left:1px #ddd solid;border-right:1px #ddd solid}.table-hover tr[data-v-0606e4c1]:hover{background-color:#f7f7f7}.recherche[data-v-0606e4c1]{text-align:center}.recherche .btn-group[data-v-0606e4c1]{box-shadow:none;margin:auto}.recherche select.btn[data-v-0606e4c1]{padding-right:3em}.recherche #otherMois[data-v-0606e4c1]{width:12em}.recherche #otherAnnee[data-v-0606e4c1]{width:8em}th.nom-jour[data-v-0606e4c1]{width:1%;padding-left:3px}th.numero-jour[data-v-0606e4c1]{width:1%;padding-right:.5em}.recherche[data-v-0606e4c1]{justify-content:center;padding-bottom:5px}.event[data-v-0606e4c1]{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-0606e4c1]: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-d4a24889]{margin-bottom:1px}.lap[data-v-d4a24889]{padding-top:.5em;padding-bottom:.5em}.lap[data-v-d4a24889]:hover{background-color:#fff9de}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment