Commit 0009c1d3 authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Réorganisation front missions en cours

Nouvelles Vues icon et utilisateur
parent 3b8bca68
Loading
Loading
Loading
Loading
+16 −0
Changes for front/components/Application/Icon.vue: 16 added lines, 0 removed lines.
Original line number Diff line number Diff line
<template>
    <i :class="`fas fa-${name}`"></i>
</template>

<script>
export default {
    name: "icon",
    props: {
        name: {required: true, type: String}
    },
}
</script>

<style scoped>

</style>
 No newline at end of file
+4 −4
Changes for front/components/Application/Utilisateur.vue: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
<template>
{{ title }}
    Mon popover super
    <a :href="`mailto:${mail}`">{{ nom }}</a>
</template>

<script>
export default {
    name: "Popover",
    name: "Utilisateur",
    props: {
        title: String
        nom: String,
        mail: String
    }
}
</script>
+1 −2
Changes for front/components/Mission/Liste.vue: 1 added line, 2 removed lines.
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ export default {
    props: {
        intervenant: {type: Number, required: true},
        canAddMission: {type: Boolean, required: true},
        options: {type: Object}
    },
    data()
    {
@@ -38,7 +37,7 @@ export default {
    {
        axios.get(
            Util.url("mission/liste/:intervenant", {intervenant: this.intervenant})
        ).then((response) => {
        ).then(response => {
            this.missions = response.data;
        });
    }
+32 −38
Changes for front/components/Mission/Mission.vue: 32 added lines, 38 removed lines.
Original line number Diff line number Diff line
<template>
    <div :id="mission.id" class="card bg-default">
        <form @submit.prevent="submitForm">
            <div class="card-header form-inline">
                <select class="form-select" v-model="mission.typeMission">
                    <option v-for="(label, value) in options.typeMission" :key="value" :value="value">{{ label }}</option>
                </select>
                &nbsp;, du&nbsp;<input type="date" class="form-control" v-model="mission.dateDebut"/>
                &nbsp;au&nbsp;<input type="date" class="form-control" v-model="mission.dateFin"/>

            <div class="card-header">
                {{ mission.typeMission.libelle }}
                <span class="badge bg-secondary">Du {{ mission.dateDebut }} au {{ mission.dateFin }}</span>
            </div>
            <div class="card-body">
                <div class="row">
                    <div class="col-md-6">
                        <div class="mb-2">
                            <label class=" form-label" for="structure">Composante en charge du suivi de mission</label>
                            <select class="form-select" v-model="mission.structure">
                                <option v-for="(label, value) in options.structure" :key="value" :value="value">{{ label }}</option>
                            </select>
                        </div>
                    </div>
                    <div class="col-md-3">
                        <div class="mb-2">
                            <label class=" form-label" for="missionTauxRemu">Taux de rémunération</label>
                            <select class="form-select" v-model="mission.missionTauxRemu">
                                <option v-for="(label, value) in options.missionTauxRemu" :key="value" :value="value">{{ label }}</option>
                            </select>
                    <div class="col-md-8">
                        <!-- Propriétés -->
                        <div class="row">
                            <div class="col-md-12">
                                <label class="form-label">Composante en charge du suivi</label>
                                <div class="form-control">{{ mission.structure.libelle }}</div>
                            </div>
                        </div>
                    <div class="col-md-3">
                        <div class="mb-2">
                            <label class=" form-label" for="heures">Heures</label>
                            <input class="form-control" type="text" v-model="mission.heures"/>
                        <div class="row">
                            <div class="col-md-6">
                                <label class=" form-label">Taux de rémunération</label>
                                <div class="form-control">{{ mission.missionTauxRemu.libelle }}</div>
                            </div>
                            <div class="col-md-6">
                                <label class=" form-label">Nombre d'heures prévisionnelles</label>
                                <div class="form-control">{{ mission.heures }}</div>
                            </div>
                        </div>
                        <div class="row">
                            <div class="col-md-12">
                        <div class="mb-2">
                            <label class=" form-label" for="description">Descriptif de la mission</label>
                            <input class="form-control" type="text" v-model="mission.description"/>
                                <label class=" form-label">Descriptif de la mission</label>
                                <div class="form-control">{{ mission.description }}</div>
                            </div>
                        </div>
                        <div class="row">
                            <div class="col-md-12">&nbsp;</div>
                        </div>
                        <div class="row">
                            <div class="col-md-12">
                        <div class="mb-2">
                            <input type="submit" class="btn btn-primary" value="Enregistrer"/>
                                <input v-if="mission.canEdit" type="submit" class="btn btn-primary" value="Modifier la mission"/>
                                &nbsp;
                                <a class="btn btn-danger" @click="deleteMission">Suppression de la mission</a>
                            </div>
                        </div>

                    </div>
                    <div class="col-md-4">
                        <!-- Suivi -->
                        <icon name="thumbs-up" /> Créé le {{ mission.histoCreation }} par <utilisateur :nom="mission.histoCreateur.displayName" :mail="mission.histoCreateur.email" />
                    </div>
                </div>
            </div>
        </form>
        <popover title="Mon titre cool"></popover>
    </div>
</template>

<script>

import popover from '@components/Application/Popover.vue';
import utilisateur from "@components/Application/Utilisateur.vue";
import icon from "@components/Application/Icon.vue";

export default {
    name: 'Mission',
    components: {
        popover
        utilisateur,
        icon
    },
    props: {
        mission: {required: true},
        options: {type: Object}
        mission: {required: true}
    },
    data()
    {
@@ -83,8 +78,7 @@ export default {
            axios.post(
                Util.url('mission/modifier'),
                this.mission,
                {submitter: event.submitter}
            ).then((response) => {
            ).then(response => {
                this.mission = response.data;
            });
        },
+46 −7
Changes for module/Mission/src/Controller/MissionController.php: 46 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@

namespace Mission\Controller;

use Application\Constants;
use Application\Controller\AbstractController;
use Application\Entity\Db\Intervenant;
use Laminas\View\Model\JsonModel;
@@ -37,23 +38,61 @@ class MissionController extends AbstractController

    public function listeAction()
    {
        /* @var $intervenant Intervenant */
        /* @var $missions Mission[] */
        $ax = $this->axios();

        /* @var $intervenant Intervenant */
        $intervenant = $this->getEvent()->getParam('intervenant');
        $missionForm = $this->getFormMission();

        $dql = "SELECT m FROM " . Mission::class . " m WHERE m.histoDestruction IS NULL AND m.intervenant = :intervenant";
        $dql = "
        SELECT 
          m, tm, str, tr, valid
        FROM 
          " . Mission::class . " m
          JOIN m.typeMission tm
          JOIN m.structure str
          JOIN m.missionTauxRemu tr
          LEFT JOIN m.validations valid
        WHERE 
            m.histoDestruction IS NULL 
            AND m.intervenant = :intervenant
        ";

        /* @var $missions Mission[] */
        $missions = $this->em()->createQuery($dql)->setParameters([
            'intervenant' => $intervenant,
        ])->getResult();

        foreach ($missions as $k => $mission) {
            $missions[$k] = $missionForm->getHydrator()->extract($mission);
        foreach ($missions as $k => $m) {
            $mission = $ax->extract($m, [
                'typeMission',
                'dateDebut',
                'dateFin',
                'structure',
                'missionTauxRemu',
                'description',
                'histoCreation',
                ['histoCreateur', ['email', 'displayName']],
                'heures',
                'valide',
            ]);
            if (empty($mission['heures'])) {
                $mission['heures'] = 'Non renseignées';
            }

            $validation = $m->getValidation();
            if ($validation) {
                if ($validation->getId()) {
                    $mission['validation'] = (string)$validation;
                } else {
                    $mission['validation'] = 'Validé automatiquement';
                }
            }

            $mission['canEdit'] = true;
            $missions[$k]       = $mission;
        }

        return new JsonModel($missions);
        return $ax->send($missions);
    }


Loading