Commit c95e6529 authored by Antony Le Courtes's avatar Antony Le Courtes
Browse files

Rollback sur la correction popconfirm pour les validations de missions

parent 46984455
Loading
Loading
Loading
Loading
Loading
+21 −122
Changes for front/Mission/Mission.vue: 21 added lines, 122 removed lines.
Original line number Diff line number Diff line
@@ -95,8 +95,6 @@
                                   data-content="Êtes-vous sur de vouloir supprimer la mission ?"
                                   data-title="Suppression de la mission"
                                   @click.prevent="supprimer">Supprimer</a>


                            </div>
                        </div>
                    </div>
@@ -190,8 +188,6 @@
                           data-content="Êtes-vous sur de vouloir supprimer le volume horaire ?"
                           data-title="Suppression du volume horaire"
                           @click.prevent="volumeHoraireSupprimer">Supprimer</a>


                    </td>
                </tr>
                </tbody>
@@ -201,24 +197,19 @@

        </template>
    </u-modal>
    <u-confirm-dialog ref="confirmDialog"/>

</template>

<script>


export default {
    name: 'Mission',
    props: {
        mission: {required: true}
    },

    data()
    {
        return {
            boxOne: '',
            boxTwo: '',
            validationText: this.calcValidation(this.mission.validation),

            saisieUrl: unicaenVue.url('mission/saisie/:mission', {mission: this.mission.id}),
@@ -263,136 +254,44 @@ export default {
                this.refresh();
            });
        },
        async supprimer(event)
        supprimer(event)
        {
            const url = event.currentTarget.href;
            const title = event.currentTarget.dataset.title;
            const content = event.currentTarget.dataset.content;
            const confirmed = await this.$refs.confirmDialog.open(
                content,
                title
            );
            if (!url) {
                console.error("Aucune URL trouvée sur le bouton !");
                return;
            }


            if (confirmed) {
                const response = await unicaenVue.axios.get(url);
                if (response && response.data) {
            popConfirm(event.currentTarget, (response) => {
                this.$emit('supprimer', this.mission);
                }
            }

            });
        },

        async valider(event)
        valider(event)
        {
            const url = event.currentTarget.href;
            const title = event.currentTarget.dataset.title;
            const content = event.currentTarget.dataset.content;
            if (!url) {
                console.error("Aucune URL trouvée sur le bouton !");
                return;
            }
            const confirmed = await this.$refs.confirmDialog.open(
                content,
                title
            );

            if (confirmed) {
                const response = await unicaenVue.axios.get(url);
                if (response && response.data) {
            popConfirm(event.currentTarget, (response) => {
                this.$emit('refresh', response.data);
                }
            }


            });
        },
        async devalider(event)
        devalider(event)
        {
            const url = event.currentTarget.href;
            const title = event.currentTarget.dataset.title;
            const content = event.currentTarget.dataset.content;
            if (!url) {
                console.error("Aucune URL trouvée sur le bouton !");
                return;
            }
            const confirmed = await this.$refs.confirmDialog.open(
                content,
                title
            );

            if (confirmed) {
                const response = await unicaenVue.axios.get(url);
                if (response && response.data) {
            popConfirm(event.currentTarget, (response) => {
                this.$emit('refresh', response.data);
                }
            }
            });
        },
        async volumeHoraireSupprimer(event)
        volumeHoraireSupprimer(event)
        {
            const url = unicaenVue.url('mission/volume-horaire/supprimer/:missionVolumeHoraire', {missionVolumeHoraire: event.currentTarget.dataset.id});
            const title = event.currentTarget.dataset.title;
            const content = event.currentTarget.dataset.content;
            if (!url) {
                console.error("Aucune URL trouvée sur le bouton !");
                return;
            }
            const confirmed = await this.$refs.confirmDialog.open(
                content,
                title
            );

            if (confirmed) {
                const response = await unicaenVue.axios.get(url);
                if (response && response.data) {
            event.currentTarget.href = unicaenVue.url('mission/volume-horaire/supprimer/:missionVolumeHoraire', {missionVolumeHoraire: event.currentTarget.dataset.id});
            popConfirm(event.currentTarget, (response) => {
                this.$emit('refresh', response.data);
                }
            }
            });
        },
        async volumeHoraireValider(event)
        volumeHoraireValider(event)
        {
            const url = unicaenVue.url('mission/volume-horaire/valider/:missionVolumeHoraire', {missionVolumeHoraire: event.currentTarget.dataset.id});
            const title = event.currentTarget.dataset.title;
            const content = event.currentTarget.dataset.content;
            if (!url) {
                console.error("Aucune URL trouvée sur le bouton !");
                return;
            }
            const confirmed = await this.$refs.confirmDialog.open(
                content,
                title
            );

            if (confirmed) {
                const response = await unicaenVue.axios.get(url);
                if (response && response.data) {
            event.currentTarget.href = unicaenVue.url('mission/volume-horaire/valider/:missionVolumeHoraire', {missionVolumeHoraire: event.currentTarget.dataset.id});
            popConfirm(event.currentTarget, (response) => {
                this.$emit('refresh', response.data);
                }
            }
            });
        },
        async volumeHoraireDevalider(event)
        volumeHoraireDevalider(event)
        {
            const url = unicaenVue.url('mission/volume-horaire/devalider/:missionVolumeHoraire', {missionVolumeHoraire: event.currentTarget.dataset.id});
            const title = event.currentTarget.dataset.title;
            const content = event.currentTarget.dataset.content;
            if (!url) {
                console.error("Aucune URL trouvée sur le bouton !");
                return;
            }
            const confirmed = await this.$refs.confirmDialog.open(
                content,
                title
            );

            if (confirmed) {
                const response = await unicaenVue.axios.get(url);
                if (response && response.data) {
            event.currentTarget.href = unicaenVue.url('mission/volume-horaire/devalider/:missionVolumeHoraire', {missionVolumeHoraire: event.currentTarget.dataset.id});
            popConfirm(event.currentTarget, (response) => {
                this.$emit('refresh', response.data);
                }
            }
            });
        },
        refresh()
        {
+10 −46
Changes for front/Mission/SuiviEvent.vue: 10 added lines, 46 removed lines.
Original line number Diff line number Diff line
@@ -9,29 +9,22 @@
    </div>
    <div class="event-actions">
        <div class="btn-group btn-group-sm">
            <button v-if="event.canEdit" class="btn btn-light" @click="modifier" data-title="Modifier le suivi"
                    title="Modifier le suivi"
                    :data-url="modifierUrl">
            <button v-if="event.canEdit" class="btn btn-light" @click="modifier" title="Modifier le suivi" :data-url="modifierUrl">
                <u-icon name="pen-to-square"/>
            </button>
            <button v-if="event.canValider" class="btn btn-light" @click="valider" data-title="Valider le suivi"
                    title="Valider le suivi"
                    :data-url="validerUrl">
            <button v-if="event.canValider" class="btn btn-light" @click="valider" title="Valider le suivi" :data-url="validerUrl">
                <u-icon name="check" class="text-success"/>
            </button>
            <button v-if="event.canDevalider" class="btn btn-light" @click="devalider" data-title="Dévalider le suivi"
                    title="Dévalider le suivi" :data-url="devaliderUrl"
            <button v-if="event.canDevalider" class="btn btn-light" @click="devalider" title="Dévalider le suivi" :data-url="devaliderUrl"
                    data-content="Voulez-vous vraiment dévalider ce suivi ?">
                <u-icon name="xmark" class="text-danger"/>
            </button>
            <button v-if="event.canSupprimer" class="btn btn-light" @click="supprimer" data-title="Supprimer le suivi"
                    title="Supprimer le suivi" :data-url="supprimerUrl"
            <button v-if="event.canSupprimer" class="btn btn-light" @click="supprimer" title="Supprimer le suivi" :data-url="supprimerUrl"
                    data-content="Voulez-vous vraiment supprimer ce suivi ?">
                <u-icon name="trash-can" class="text-danger"/>
            </button>
        </div>
    </div>
    <u-confirm-dialog ref="confirmDialog"/>
</template>

<script>
@@ -72,26 +65,11 @@ export default {
            });
        },

        async supprimer(event)
        supprimer(event)
        {
            const url = event.currentTarget.dataset.url;
            const title = event.currentTarget.dataset.title;
            const content = event.currentTarget.dataset.content;
            const confirmed = await this.$refs.confirmDialog.open(
                content,
                title
            );
            if (!url) {
                console.error("Aucune URL trouvée sur le bouton !");
                return;
            }
            if (confirmed) {
                const response = await unicaenVue.axios.get(url);
                if (response && response.data) {
            popConfirm(event.currentTarget, (response) => {
                this.suivi.refresh();
                }
            }

            });
        },

        valider(event)
@@ -101,25 +79,11 @@ export default {
            });
        },

        async devalider(event)
        devalider(event)
        {
            const url = event.currentTarget.dataset.url;
            const title = event.currentTarget.dataset.title;
            const content = event.currentTarget.dataset.content;
            const confirmed = await this.$refs.confirmDialog.open(
                content,
                title
            );
            if (!url) {
                console.error("Aucune URL trouvée sur le bouton !");
                return;
            }
            if (confirmed) {
                const response = await unicaenVue.axios.get(url);
                if (response && response.data) {
            popConfirm(event.currentTarget, (response) => {
                this.suivi.refresh();
                }
            }
            });
        },

    },
+2 −2
Changes for public/dist/.vite/manifest.json: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@
    "name": "vendor"
  },
  "main.js": {
    "file": "assets/main-BpKRGuUU.js",
    "file": "assets/main-CvUT0ogH.js",
    "name": "main",
    "src": "main.js",
    "isEntry": true,
@@ -12,7 +12,7 @@
      "_vendor-Rl39KpUh.js"
    ],
    "css": [
      "assets/main-DXZMKt2U.css"
      "assets/main-DcqHEHht.css"
    ]
  }
}
 No newline at end of file
−15

File deleted.

Preview size limit exceeded, changes collapsed.

+15

File added.

Preview size limit exceeded, changes collapsed.

Loading