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

front/Mission/SuiviEvent.vue

+1 −1
Original line number Diff line number Diff line 
<template>

    <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">

            de {{ heureDebut }} à {{ heureFin }}, soit {{ heures }} heure{{ heures < 2 ? '' : 's' }}

                <span class="badge bg-secondary" v-if="event.formation">En formation</span>

module/Mission/src/Controller/SuiviController.php

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ class SuiviController extends AbstractController 


        $properties = [

            'id',

            ['mission', ['id', 'libelleCourt']],

            ['mission', ['id', 'libelleCourt', 'libelleMission']],

            'date',

            'heureDebut',

            'heureFin',

module/Mission/src/Entity/Db/Mission.php

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ class Mission implements HistoriqueAwareInterface, ResourceInterface, EntityMana 


    public function __toString(): string

    {

        return $this->getLibelleCourt() ?? '';

        return $this->getLibelleMission() ? $this->getLibelleCourt() : '';

    }

module/Mission/src/Form/MissionSuiviForm.php

+3 −1
Original line number Diff line number Diff line
@@ -47,7 +47,9 @@ class MissionSuiviForm extends AbstractForm 
            'options' => [

                'label'         => 'Mission',

                'empty_option'  => '- Non renseignée -',

                'value_options' => Util::collectionAsOptions($missions),

                'value_options' => Util::collectionAsOptions($missions, false, function ($m) {

                    return $m->getLibelleMission() ?? $m->getLibelleCourt();

                }),

            ],

            'attributes' => [

                'data-besoin-formation' => json_encode($besoinFormation),

public/dist/.vite/manifest.json

+2 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
    "name": "vendor"

  },

  "main.js": {

    "file": "assets/main-Cs49WrJ8.js",

    "file": "assets/main-B2CQGFD_.js",

    "name": "main",

    "src": "main.js",

    "isEntry": true,
@@ -12,7 +12,7 @@ 
      "_vendor-DcfRBLtF.js"

    ],

    "css": [

      "assets/main-BnA9GdwI.css"

      "assets/main-CM-4QD2K.css"

    ]

  }

}
 
 No newline at end of file