Commit 2ab51dee authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Déport des boutons d'action dans le SuiviEvent, pour pouvoir ajouter la validation

parent cdf1b13f
Loading
Loading
Loading
Loading
+0 −32
Changes for front/Application/UI/UCalendar.vue: 0 added lines, 32 removed lines.
Original line number Diff line number Diff line
@@ -30,20 +30,8 @@
                </th>
                <td>
                    <div class="event" :style="'border-color:'+event.color" v-for="(event, index) in eventsByJour(jour)" :key="index">
                        <div class="event-content">
                        <component :is="event.component" :event="event"></component>
                    </div>
                        <div class="event-actions">
                            <div class="btn-group btn-group-sm">
                                <button class="btn btn-light" @click="editEvent" :data-index="index">
                                    <u-icon name="pen-to-square"/>
                                </button>
                                <button class="btn btn-light" @click="deleteEvent" :data-index="index">
                                    <u-icon name="trash-can" class="text-danger"/>
                                </button>
                            </div>
                        </div>
                    </div>

                    <div v-if="canAddEvent">
                        <button @click="addEvent" :data-jour="jour" class="btn btn-light btn-sm">
@@ -155,18 +143,6 @@ export default {
            this.$emit('addEvent', dateObj, event);
        },

        editEvent(event)
        {
            const index = event.currentTarget.dataset.index;
            this.$emit('editEvent', this.events[index], event);
        },

        deleteEvent(event)
        {
            const index = event.currentTarget.dataset.index;
            this.$emit('deleteEvent', this.events[index], event);
        },

        prevMois()
        {
            const dateObj = new Date(this.date);
@@ -257,12 +233,4 @@ th.numero-jour {
    background-color: white;
}

.event-content {
    flex-grow: 1;
}

.event-actions {
    align-self: flex-start;
}

</style>
 No newline at end of file
+8 −3
Changes for front/Mission/Suivi.vue: 8 added lines, 3 removed lines.
Original line number Diff line number Diff line
<template>
    <u-calendar :date="date" @changeDate="changeDate" @addEvent="addVolumeHoraire" @editEvent="editVolumeHoraire" @deleteEvent="deleteVolumeHoraire"
                :can-add-event="true"
                :events="suivi"/>
    <u-calendar :date="date" @changeDate="changeDate" @addEvent="addVolumeHoraire" :can-add-event="true" :events="suivi"/>
</template>

<script>
@@ -43,6 +41,11 @@ export default {
            this.date = dateObj;
        },

        toto()
        {
            console.log('prout');
        },

        addVolumeHoraire(dateObj, event)
        {
            const urlParams = {
@@ -66,6 +69,7 @@ export default {
                this.refresh();
            });
        },

        saveVolumeHoraire(event)
        {
            console.log('submit!!!');
@@ -91,6 +95,7 @@ export default {
        },
        refresh()
        {
            //  SuiviEvent.data.suivi = this;
            unicaenVue.axios.get(
                unicaenVue.url("intervenant/:intervenant/missions-suivi-data", {intervenant: this.intervenant})
            ).then(response => {
+38 −0
Changes for front/Mission/SuiviEvent.vue: 38 added lines, 0 removed lines.
Original line number Diff line number Diff line
<template>
    <div class="event-content">
        <p>{{ event.mission.libelle }}</p>
        <p>
            de {{ event.heureDebut }} à {{ event.heureFin }}, {{ event.heures }} heures
@@ -6,6 +7,17 @@
            <b-badge v-if="event.formation">En formation</b-badge>
        </p>
        <p v-if="event.description">{{ event.description }}</p>
    </div>
    <div class="event-actions">
        <div class="btn-group btn-group-sm">
            <button class="btn btn-light" @click="editEvent">
                <u-icon name="pen-to-square"/>
            </button>
            <button class="btn btn-light" @click="deleteEvent">
                <u-icon name="trash-can" class="text-danger"/>
            </button>
        </div>
    </div>
</template>

<script>
@@ -14,9 +26,35 @@ export default {
    props: {
        event: {type: Object, required: true},
    },
    data(){
        return {
            suivi: this.$parent.$parent,
        };
    },
    methods: {

        editEvent(event)
        {
            this.suivi.editVolumeHoraire(this.event, event);
        },

        deleteEvent(event)
        {
            this.suivi.deleteVolumeHoraire(this.event, event);
        },

    },
}
</script>

<style scoped>

.event-content {
    flex-grow: 1;
}

.event-actions {
    align-self: flex-start;
}

</style>
 No newline at end of file