Commit a8725225 authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Avancées pour la saisie des missions

Refactoring Axios et possibilité d'utiliser modAjax dans un composant Vue
parent fa91a66a
Loading
Loading
Loading
Loading
+1 −1
Changes for front/components/Mission/Liste.vue: 1 added line, 1 removed line.
Original line number Diff line number Diff line
<template>
    <mission v-for="mission in missions" @delete="deleteMission" :key="mission.id" :options="options" :mission="mission"></mission>
    <mission v-for="mission in missions" @delete="deleteMission" :key="mission.id" :mission="mission"></mission>
    <a v-if="canAddMission" class="btn btn-primary" @click="addMission">Ajout d'une nouvelle mission</a>
</template>

+81 −17
Changes for front/components/Mission/Mission.vue: 81 added lines, 17 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">
            <div class="card-header" :class="{'bg-info':mission.valide}">
                {{ mission.typeMission.libelle }}
                <span class="badge bg-secondary">Du {{ mission.dateDebut }} au {{ mission.dateFin }}</span>
                <span class="float-end">Du {{ mission.dateDebut }} au {{ mission.dateFin }}</span>
            </div>
            <div class="card-body">
                <div class="row">
@@ -22,7 +22,12 @@
                            </div>
                            <div class="col-md-6">
                                <label class=" form-label">Nombre d'heures prévisionnelles</label>
                                <div class="form-control">{{ mission.heures }}</div>
                                <div class="input-group mb-3">
                                    <div class="form-control">{{ heuresLib }}</div>
                                    <button onclick="alert('non implémenté')" class="input-group-btn btn btn-secondary">Suivi</button>
                                </div>

                                <!--<div class="form-control">{{ mission.heures }}</div>-->
                            </div>
                        </div>
                        <div class="row">
@@ -36,15 +41,35 @@
                        </div>
                        <div class="row">
                            <div class="col-md-12">
                                <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>
                                <a v-if="mission.canEdit" :href="saisieUrl" class="btn btn-primary" @click.prevent="saisie">Modifier la mission</a>
                                <a class="btn btn-danger" @click.prevent="devalidation">Dévalidation de la mission</a>
                                <!--<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>
                            <label class=" form-label">Suivi</label>
                        </div>
                        <div>
                            <icon name="thumbs-up"/>
                            Créé le {{ mission.histoCreation }} par
                            <utilisateur :nom="mission.histoCreateur.displayName" :mail="mission.histoCreateur.email"/>
                        </div>
                        <div>
                            <icon :name="mission.valide ? 'thumbs-up' : 'thumbs-down'"/>
                            {{ validation }}
                            <utilisateur v-if="mission.validation.histoCreateur" :nom="mission.validation.histoCreateur.displayName"
                                         :mail="mission.validation.histoCreateur.email"/>
                        </div>
                        <div>
                            <icon :name="mission.contrat ? 'thumbs-up' : 'thumbs-down'"/>
                            {{ mission.contrat ? 'Contrat établi' : 'Pas de contrat' }}
                        </div>
                        <div>
                            Aucune heure réalisée
                        </div>
                    </div>
                </div>
            </div>
@@ -54,8 +79,9 @@

<script>

import utilisateur from "@components/Application/Utilisateur.vue";
import icon from "@components/Application/Icon.vue";
import utilisateur from "@/components/Application/Utilisateur.vue";
import icon from "@/components/Application/Icon.vue";
import {e} from "../../../public/dist/assets/vendor-5a215836";

export default {
    name: 'Mission',
@@ -69,24 +95,62 @@ export default {
    data()
    {
        return {
            mission: this.mission
            mission: this.mission,
            saisieUrl: Util.url('mission/saisie/:mission', {mission: this.mission.id}),
        };
    },
    computed: {
        heuresLib: function () {
            if (this.mission.heures === null || this.mission.heures === 0) {
                return 'Aucune heure saisie';
            } else if (this.mission.heures - this.mission.heuresValidees == 0) {
                return this.mission.heures + ' heures validés';
            } else if (this.mission.heuresValidees == 0) {
                return this.mission.heures + ' heures à valider';
            } else {
                return this.mission.heures + ' heures dont ' + (this.mission.heures - this.mission.heuresValidees) + ' à valider';
            }
        },
        validation: function () {
            if (this.mission.validation.id === undefined) {
                return 'A valider';
            } else if (this.mission.validation.id === null) {
                return 'Autovalidée';
            } else {
                return 'Validation du ' + this.mission.validation.histoCreation + ' par ';
            }
        }
    },
    methods: {
        submitForm(event)
        {
            axios.post(
                Util.url('mission/modifier'),
                this.mission,
            ).then(response => {
                this.mission = response.data;
            });
            // axios.post(
            //     Util.url('mission/modifier'),
            //     this.mission,
            // ).then(response => {
            //     this.mission = response.data;
            // });
        },
        deleteMission(mission)
        {
            this.$emit('delete', this.mission);
        },
        devalidation()
        {

        },
        saisie(event)
        {
            modAjax(event.target, (widget) => {
                axios.get(
                    Util.url("mission/mission/:mission", {mission: this.mission.id})
                ).then(response => {
                    this.mission = response.data;
                });
            });
        },
    }
    }

}
</script>

+34 −34
Changes for module/Application/src/Controller/Plugin/Axios.php: 34 added lines, 34 removed lines.
Original line number Diff line number Diff line
@@ -32,7 +32,39 @@ class Axios extends AbstractPlugin



    public function extract($object, array $properties = []): ?array
    public function send(array $data): JsonModel
    {
        /** @var FlashMessenger $flashMessenger */
        $flashMessenger = $this->controller->flashMessenger();

        $namespaces = [
            $flashMessenger::NAMESPACE_SUCCESS,
            $flashMessenger::NAMESPACE_WARNING,
            $flashMessenger::NAMESPACE_ERROR,
            $flashMessenger::NAMESPACE_INFO,
        ];

        $messages = [];
        foreach ($namespaces as $namespace) {
            if ($flashMessenger->hasCurrentMessages($namespace)) {
                $messages[$namespace] = $flashMessenger->getCurrentMessages($namespace);
                $flashMessenger->clearCurrentMessages($namespace);
            }
        }

        $jsonData = [
            'data'     => $data,
            'messages' => $messages,
        ];

        $model = new JsonModel($jsonData);

        return $model;
    }



    public static function extract($object, array $properties = []): ?array
    {
        if (!$object) {
            return null;
@@ -69,7 +101,7 @@ class Axios extends AbstractPlugin
                        if ($value instanceof \DateTime) {
                            $value = $value->format(Util::DATE_FORMAT);
                        } else {
                            $value = $this->extract($value, $subProperties);
                            $value = self::extract($value, $subProperties);
                        }
                    }
                    $result[$property] = $value;
@@ -81,36 +113,4 @@ class Axios extends AbstractPlugin

        return $result;
    }



    public function send(array $data): JsonModel
    {
        /** @var FlashMessenger $flashMessenger */
        $flashMessenger = $this->controller->flashMessenger();

        $namespaces = [
            $flashMessenger::NAMESPACE_SUCCESS,
            $flashMessenger::NAMESPACE_WARNING,
            $flashMessenger::NAMESPACE_ERROR,
            $flashMessenger::NAMESPACE_INFO,
        ];

        $messages = [];
        foreach ($namespaces as $namespace) {
            if ($flashMessenger->hasCurrentMessages($namespace)) {
                $messages[$namespace] = $flashMessenger->getCurrentMessages($namespace);
                $flashMessenger->clearCurrentMessages($namespace);
            }
        }

        $jsonData = [
            'data'     => $data,
            'messages' => $messages,
        ];

        $model = new JsonModel($jsonData);

        return $model;
    }
}
 No newline at end of file
+11 −6
Changes for module/Mission/config/module.config.php: 11 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -43,10 +43,15 @@ return [
                    'controller' => MissionController::class,
                    'action'     => 'liste',
                ],
                'modifier'  => [
                    'route'      => '/modifier',
                'mission'   => [
                    'route'      => '/mission/:mission',
                    'controller' => MissionController::class,
                    'action'     => 'mission',
                ],
                'saisie'    => [
                    'route'      => '/saisie[/:mission]',
                    'controller' => MissionController::class,
                    'action'     => 'modifier',
                    'action'     => 'saisie',
                ],
                'supprimer' => [
                    'route'      => '/supprimer',
@@ -159,15 +164,15 @@ return [
    'guards' => [
        [
            'controller' => MissionController::class,
            'action'     => ['index', 'liste'],
            'action'     => ['index', 'liste', 'mission'],
            'privileges' => [
                Privileges::MISSION_VISUALISATION,
            ],
            'assertion'  => Assertion\MissionAssertion::class,
            //'assertion'  => Assertion\MissionAssertion::class,
        ],
        [
            'controller' => MissionController::class,
            'action'     => ['modifier'],
            'action'     => ['saisie'],
            'privileges' => [
                Privileges::MISSION_EDITION,
            ],
+44 −77
Changes for module/Mission/src/Controller/MissionController.php: 44 added lines, 77 removed lines.
Original line number Diff line number Diff line
@@ -22,115 +22,82 @@ class MissionController extends AbstractController
    use MissionFormAwareTrait;


    /**
     * Page d'index des missions
     *
     * @return array|\Laminas\View\Model\ViewModel
     */
    public function indexAction()
    {
        /* @var $intervenant Intervenant */
        $intervenant = $this->getEvent()->getParam('intervenant');

        $missionForm = $this->getFormMission();

        $canAddMission = true;

        return compact('intervenant', 'canAddMission', 'missionForm');
        return compact('intervenant', 'canAddMission');
    }



    /**
     * Retourne la liste des missions
     *
     * @return JsonModel
     */
    public function listeAction()
    {
        $ax = $this->axios();

        /* @var $intervenant Intervenant */
        $intervenant = $this->getEvent()->getParam('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 => $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';
        $missions = $this->getServiceMission()->missionsByIntervenant($intervenant);
        foreach ($missions as $k => $mission) {
            $missions[$k] = $this->getServiceMission()->missionWs($mission);
        }

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

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

        return $ax->send($missions);

    /**
     * Retourne les données pour une mission
     *
     * @return JsonModel
     */
    public function missionAction()
    {
        /** @var Mission $mission */
        $mission = $this->getEvent()->getParam('mission');

        return $this->axios()->send($this->getServiceMission()->missionWs($mission));
    }



    public function modifierAction()
    /**
     * Formulaire de saisie
     *
     * @return array
     */
    public function saisieAction()
    {
        $data = $this->axios()->fromPost();
        /** @var Mission $mission */
        $mission = $this->getEvent()->getParam('mission');

        $id                  = (int)$data['id'];
        $data['description'] = str_replace(' ', '', $data['description']);
        if ($id <= 0) {
            $mission = $this->getServiceMission()->newEntity();
        if ($mission) {
            $title = 'Modification d\'une mission';
        } else {
            $mission = $this->getServiceMission()->get($id);
            $title   = 'Ajout d\'une mission';
            $mission = $this->getServiceMission()->newEntity();
        }

        $missionForm = $this->getFormMission();
        $missionForm->bind($mission);
        $missionForm->setData($data);
        //$this->flashMessenger()->addErrorMessage('et merde!');
        if ($missionForm->isValid()) {
            try {
        $form = $this->getFormMission();
        $form->remove('structure');
        $form->bindRequestSave($mission, $this->getRequest(), function ($mission) {
            $this->getServiceMission()->save($mission);
            } catch (\Exception $e) {
                $this->flashMessenger()->addErrorMessage($e->getMessage());
            }
        } else {
            foreach ($missionForm->getElements() as $element) {
                if ($messages = $element->getMessages()) {
                    foreach ($messages as $message) {
                        $this->flashMessenger()->addErrorMessage($message);
                    }
                }
            }
        }
        $result = $missionForm->getHydrator()->extract($mission);
        });

        return $this->axios()->send($result);
        return compact('form', 'title', 'mission');
    }


Loading