Commit 9199ce44 authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Ergonomie

parent 97b1fa81

front/Mission/Suivi.vue

+18 −0
Changes for front/Mission/Suivi.vue: 18 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -95,6 +95,19 @@ export default { 
        },

        refresh()

        {

            const colors = [

                '#e74c3c',

                '#8e44ad',

                '#3498db',

                '#1abc9c',

                '#2ecc71',

                '#f1c40f',

                '#e67e22',

                '#d35400',

            ];

            let colorIndex = 0;

            let missionsColors = [];



            //  SuiviEvent.data.suivi = this;

            unicaenVue.axios.get(

                unicaenVue.url("intervenant/:intervenant/missions-suivi-data", {intervenant: this.intervenant})
@@ -103,6 +116,11 @@ export default { 
                for (let i in response.data) {

                    let missionSuivi = response.data[i];



                    if (undefined === missionsColors[missionSuivi.mission.id]){

                        missionsColors[missionSuivi.mission.id] = colors[colorIndex];

                        colorIndex++;

                    }

                    missionSuivi.color = missionsColors[missionSuivi.mission.id];

                    missionSuivi.component = markRaw(SuiviEvent);

                    missionSuivi.date = new Date(missionSuivi.date);

                    newSuivi.push(missionSuivi);

front/Mission/SuiviEvent.vue

+1 −1
Changes for front/Mission/SuiviEvent.vue: 1 added line, 1 removed line.
Original line number Diff line number Diff line 
<template>

    <div class="event-content">

        <p>{{ event.mission.libelle }}</p>

        <p>{{ event.mission.libelleCourt }}</p>

        <p>

            de {{ event.heureDebut }} à {{ event.heureFin }}, {{ event.heures }} heures

            <b-badge v-if="event.nocturne">Nocturne</b-badge>

module/Mission/src/Controller/MissionController.php

+1 −1
Changes for module/Mission/src/Controller/MissionController.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ use Mission\Service\MissionServiceAwareTrait; 
use Service\Service\TypeVolumeHoraireServiceAwareTrait;

use UnicaenVue\Axios\AxiosExtractor;

use UnicaenVue\View\Model\AxiosModel;

use UnicaenVue\View\Model\VueModel;





/**
@@ -192,6 +191,7 @@ class MissionController extends AbstractController 


        $form = $this->getFormMissionSuivi();

        $form->setIntervenant($intervenant);

        $form->date = $volumeHoraireMission->getHoraireDebut();

        $form->build();



        $form->bindRequestSave($volumeHoraireMission, $this->getRequest(), function ($vhm) {

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

+7 −3
Changes for module/Mission/src/Entity/Db/Mission.php: 7 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -359,9 +359,13 @@ class Mission implements HistoriqueAwareInterface, ResourceInterface, AxiosExtra 






    /**

     * @return Collection|VolumeHoraireMission[]

     */

    public function getLibelleCourt(): string

    {

        return $this->getTypeMission()->getLibelle();

    }







    public function getVolumesHoraires(): Collection

    {

        return $this->volumesHoraires;

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

+1 −1
Changes for module/Mission/src/Entity/Db/VolumeHoraireMission.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ class VolumeHoraireMission implements HistoriqueAwareInterface, ImportAwareInter 
            // Pour un VH réalisé

            return [

                'guid',

                ['mission',['id','libelle']],

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

                'date',

                'heureDebut',

                'heureFin',