Commit 3ea419c4 authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

refactoring

parent 4d359b3c
Loading
Loading
Loading
Loading
+9 −13
Changes for front/Mission/Liste.vue: 9 added lines, 13 removed lines.
Original line number Diff line number Diff line
<template>
    <mission v-for="mission in missions" @supprimer="supprimer" @refresh="refresh" :key="mission.id" :mitem="mission"></mission>
    <mission v-for="mission in missions" @supprimer="supprimer" @refresh="refresh" :key="mission.id" :mission="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,24 @@ export default {
    },
    mounted()
    {
        this.refresh();
        this.reload();
    },
    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: newId})
                    ).then(response => {
                        this.missions.push(response.data);
                    });
                }
                this.reload();
            });
        },
        supprimer(mission)
        {
            const index = this.missions.indexOf(mission);
            this.missions.splice(index, 1);
            this.reload();
        },
        refresh(mission)
        {
            this.missions[mission.id] = mission;
        },
        refresh()
        reload()
        {
            axios.get(
                Util.url("mission/liste/:intervenant", {intervenant: this.intervenant})
+7 −10
Changes for front/Mission/Mission.vue: 7 added lines, 10 removed lines.
Original line number Diff line number Diff line
@@ -83,15 +83,14 @@
export default {
    name: 'Mission',
    props: {
        mitem: {required: true}
        mission: {required: true}
    },
    data()
    {
        return {
            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}),
            validationText: this.calcValidation(this.mission.validation),
            saisieUrl: Util.url('mission/saisie/:mission', {mission: this.mission.id}),
            supprimerUrl: Util.url("mission/supprimer/:mission", {mission: this.mission.id}),
        };
    },
    watch: {
@@ -133,7 +132,6 @@ export default {
        {
            popAjax(event.target, (widget) => {
                this.$emit('supprimer', this.mission);
                alertFlash('Mission supprimée', 'success');
            });
        },
        valider()
@@ -141,8 +139,7 @@ export default {
            axios.get(
                Util.url("mission/valider/:mission", {mission: this.mission.id})
            ).then(response => {
                this.$emit('refresh', this.mission);
                this.mission = response.data;
                this.$emit('refresh', response.data);
            });
        },
        devalider()
@@ -150,7 +147,7 @@ export default {
            axios.get(
                Util.url("mission/devalider/:mission", {mission: this.mission.id})
            ).then(response => {
                this.mission = response.data;
                this.$emit('refresh', response.data);
            });
        },
        refresh()
@@ -158,7 +155,7 @@ export default {
            axios.get(
                Util.url("mission/get/:mission", {mission: this.mission.id})
            ).then(response => {
                this.mission = response.data;
                this.$emit('refresh', response.data);
            });
        },
    }
+1 −1
Changes for module/Application/view/application/chargens/seuil.phtml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ $canEditcomp = $this->isAllowed(Privileges::getResourceId(Privileges::CHARGENS_S
            url: "<?= $scenario ? $this->url('chargens/seuil/modifier', ['scenario' => $scenario->getId()]) : null ?>",
            data: params,
            success: function () {
                alertFlash("Le nouveau seuil a bien été pris en compte", 'success', 3000);
                Util.alert("Le nouveau seuil a bien été pris en compte", 'success';
                seuilCalcHeures();
            },
        });
+1 −1
Changes for module/Application/view/application/droits/affectations.phtml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ $ajoutUrl = $this->url('droits/affectations/edition');
<script type="text/javascript">
    $(function () {
        $("body").on("affectation-edition", function (event, data) {
            alertFlash("L'action a bien été prise en compte", 'success');
            Util.alert("L'action a bien été prise en compte", 'success');
            window.location.reload();
        });

+1 −1
Changes for module/Application/view/application/formule/test-saisir.phtml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -585,7 +585,7 @@ echo $this->tag('h1', ['class' => 'page-header'])->html($title);
                        that.saving = false;
                    },
                    error: function (jqXHR) {
                        alertFlash(jqXHR.responseText, 'error', 5000);
                        Util.alert(jqXHR.responseText, 'error');
                        console.log(jqXHR);
                        that.saving = false;
                    }
Loading