Commit 4d359b3c authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

WIP

parent fe29f1d5
Loading
Loading
Loading
Loading
+15 −8
Changes for front/Mission/Liste.vue: 15 added lines, 8 removed lines.
Original line number Diff line number Diff line
<template>
    <mission v-for="mission in missions" @supprimer="supprimer" :key="mission.id" :mission="mission"></mission>
    <mission v-for="mission in missions" @supprimer="supprimer" @refresh="refresh" :key="mission.id" :mitem="mission"></mission>
    <a v-if="canAddMission" class="btn btn-primary" :href="ajoutUrl" @click.prevent="ajout">Ajout d'une nouvelle mission</a>
</template>

@@ -24,28 +24,35 @@ export default {
    },
    mounted()
    {
        axios.get(
            Util.url("mission/liste/:intervenant", {intervenant: this.intervenant})
        ).then(response => {
            this.missions = response.data;
        });
        this.refresh();
    },
    methods: {
        ajout(event)
        {
            modAjax(event.target, (widget) => {
                let newId = widget.contentDiv.find('form').data('id');
                if (newId){
                    axios.get(
                    Util.url("mission/get/:mission", {mission: this.mission.id})
                        Util.url("mission/get/:mission", {mission: newId})
                    ).then(response => {
                        this.missions.push(response.data);
                    });
                }
            });
        },
        supprimer(mission)
        {
            const index = this.missions.indexOf(mission);
            this.missions.splice(index, 1);
        }
        },
        refresh()
        {
            axios.get(
                Util.url("mission/liste/:intervenant", {intervenant: this.intervenant})
            ).then(response => {
                this.missions = response.data;
            });
        },
    }
}
</script>
+39 −24
Changes for front/Mission/Mission.vue: 39 added lines, 24 removed lines.
Original line number Diff line number Diff line
@@ -26,8 +26,6 @@
                                    <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">
@@ -42,7 +40,8 @@
                        <div class="row">
                            <div class="col-md-12">
                                <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 v-if="!mission.validation" class="btn btn-secondary" @click.prevent="valider">Validation de la mission</a>
                                <a v-if="mission.validation" class="btn btn-danger" @click.prevent="devalider">Dévalidation de la mission</a>
                                <a class="btn btn-danger" :href="supprimerUrl" data-title="Suppression de la mission"
                                   data-content="Êtes-vous sur de vouloir supprimer la mission ?"
                                   data-confirm="true" @click.prevent="supprimer">Suppression de la mission</a>
@@ -61,8 +60,8 @@
                        </div>
                        <div>
                            <icon :name="mission.valide ? 'thumbs-up' : 'thumbs-down'"/>
                            {{ validation }}
                            <utilisateur v-if="mission.validation && mission.validation.histoCreateur" :nom="mission.validation.histoCreateur.displayName"
                            {{ validationText }}
                            <utilisateur v-if="mission.validation && mission.validation.histoCreateur" :nom="mission.validation.histoCreateur.libelle"
                                         :mail="mission.validation.histoCreateur.email"/>
                        </div>
                        <div>
@@ -84,16 +83,22 @@
export default {
    name: 'Mission',
    props: {
        mission: {required: true}
        mitem: {required: true}
    },
    data()
    {
        return {
            mission: this.mission,
            saisieUrl: Util.url('mission/saisie/:mission', {mission: this.mission.id}),
            supprimerUrl: Util.url("mission/supprimer/:mission", {mission: this.mission.id}),
            mission: this.mitem,
            validationText: this.calcValidation(this.mprop.validation),
            saisieUrl: Util.url('mission/saisie/:mission', {mission: this.mprop.id}),
            supprimerUrl: Util.url("mission/supprimer/:mission", {mission: this.mprop.id}),
        };
    },
    watch: {
        'mission.validation'(validation) {
            this.validationText = this.calcValidation(validation);
        }
    },
    computed: {
        heuresLib: function () {
            if (this.mission.heures === null || this.mission.heures === 0) {
@@ -105,26 +110,23 @@ export default {
            } else {
                return this.mission.heures + ' heures dont ' + (this.mission.heures - this.mission.heuresValidees) + ' à valider';
            }
        }
    },
        validation: function () {
            if (this.mission.validation === null) {
    methods: {
        calcValidation(validation)
        {
            if (validation === null) {
                return 'A valider';
            } else if (this.mission.validation.id === null) {
            } else if (validation.id === null) {
                return 'Autovalidée';
            } else {
                return 'Validation du ' + this.mission.validation.histoCreation + ' par ';
            }
                return 'Validation du ' + validation.histoCreation + ' par ';
            }
        },
    methods: {
        saisie(event)
        {
            modAjax(event.target, (widget) => {
                axios.get(
                    Util.url("mission/get/:mission", {mission: this.mission.id})
                ).then(response => {
                    this.mission = response.data;
                });
                this.refresh();
            });
        },
        supprimer(event)
@@ -136,15 +138,28 @@ export default {
        },
        valider()
        {

            axios.get(
                Util.url("mission/valider/:mission", {mission: this.mission.id})
            ).then(response => {
                this.$emit('refresh', this.mission);
                this.mission = response.data;
            });
        },
        devalider()
        {

            axios.get(
                Util.url("mission/devalider/:mission", {mission: this.mission.id})
            ).then(response => {
                this.mission = response.data;
            });
        },
        test()
        refresh()
        {

            axios.get(
                Util.url("mission/get/:mission", {mission: this.mission.id})
            ).then(response => {
                this.mission = response.data;
            });
        },
    }
}
+45 −9
Changes for module/Application/src/Service/TypeValidationService.php: 45 added lines, 9 removed lines.
Original line number Diff line number Diff line
@@ -24,74 +24,110 @@ class TypeValidationService extends AbstractEntityService
        return TypeValidation::class;
    }



    /**
     * Retourne l'alias d'entité courante
     *
     * @return string
     */
    public function getAlias(){
    public function getAlias()
    {
        return 'typev';
    }



    /**
     *
     * @param string $code
     *
     * @return TypeValidation
     */
    public function getByCode($code)
    {
        if (null == $code) return null;

        return $this->getRepo()->findOneBy(['code' => $code]);
    }



    public function getDonneesPerso()
    public function getMission(): TypeValidation
    {
        return $this->getByCode(TypeValidation::CODE_MISSION);
    }



    public function getMissionRealise(): TypeValidation
    {
        return $this->getByCode(TypeValidation::CODE_MISSION_REALISE);
    }



    public function getDonneesPerso(): TypeValidation
    {
        return $this->getByCode(TypeValidation::CODE_DONNEES_PERSO);
    }

    public function getEnseignement()


    public function getEnseignement(): TypeValidation
    {
        return $this->getByCode(TypeValidation::CODE_ENSEIGNEMENT);
    }

    public function getReferentiel()


    public function getReferentiel(): TypeValidation
    {
        return $this->getByCode(TypeValidation::CODE_REFERENTIEL);
    }

    public function getContrat()


    public function getContrat(): TypeValidation
    {
        return $this->getByCode(TypeValidation::CODE_CONTRAT);
    }

    public function getFichier()


    public function getFichier(): TypeValidation
    {
        return $this->getByCode(TypeValidation::CODE_FICHIER);
    }

    public function getPieceJointe()


    public function getPieceJointe(): TypeValidation
    {
        return $this->getByCode(TypeValidation::CODE_PIECE_JOINTE);
    }

    public function getClotureRealise()


    public function getClotureRealise(): TypeValidation
    {
        return $this->getByCode(TypeValidation::CODE_CLOTURE_REALISE);
    }



    /**
     * Retourne la liste des types de volumes horaires
     *
     * @param QueryBuilder|null $queryBuilder
     *
     * @return TypeValidation[]
     */
    public function orderBy(QueryBuilder $qb = null, $alias = null)
    {
        list($qb,$alias) = $this->initQuery($qb, $alias);
        [$qb, $alias] = $this->initQuery($qb, $alias);
        $qb->addOrderBy("$alias.libelle");

        return $qb;
    }

+17 −4
Changes for module/Application/src/Service/ValidationService.php: 17 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ use Application\Entity\Db\Validation;
use Application\Service\Traits\ContratServiceAwareTrait;
use Application\Service\Traits\MiseEnPaiementServiceAwareTrait;
use Application\Service\Traits\TypeValidationServiceAwareTrait;
use Mission\Entity\Db\Mission;
use RuntimeException;
use Doctrine\ORM\QueryBuilder;
use Service\Service\TypeVolumeHoraireServiceAwareTrait;
@@ -55,13 +56,11 @@ class ValidationService extends AbstractEntityService



    public function validerDossier(IntervenantDossier $intervenantDossier)
    public function validerDossier(IntervenantDossier $intervenantDossier): Validation
    {
        $typeDonneesPerso = $this->getServiceTypeValidation()->getByCode(TypeValidation::CODE_DONNEES_PERSO);

        $validation = $this->newEntity();
        $validation->setIntervenant($intervenantDossier->getIntervenant());
        $validation->setTypeValidation($typeDonneesPerso);
        $validation->setTypeValidation($this->getServiceTypeValidation()->getDonneesPerso());
        $validation->setStructure($intervenantDossier->getIntervenant()->getStructure());
        $this->save($validation);

@@ -70,6 +69,20 @@ class ValidationService extends AbstractEntityService



    public function validerMission(Mission $mission): Validation
    {
        $validation = $this->newEntity();
        $validation->setIntervenant($mission->getIntervenant());
        $validation->setTypeValidation($this->getServiceTypeValidation()->getMission());
        $validation->setStructure($mission->getStructure());
        $this->save($validation);
        $mission->addValidation($validation);

        return $validation;
    }



    /**
     *
     * @param Intervenant            $intervenant
+2 −2
Changes for module/Mission/config/module.config.php: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -64,12 +64,12 @@ return [
                    'action'     => 'supprimer',
                ],
                'valider'   => [
                    'route'      => '/valider',
                    'route'      => '/valider/:mission',
                    'controller' => MissionController::class,
                    'action'     => 'valider',
                ],
                'devalider' => [
                    'route'      => '/devalider',
                    'route'      => '/devalider/:mission',
                    'controller' => MissionController::class,
                    'action'     => 'devalider',
                ],
Loading