Commit 432de5ee authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Bug axios pour du get

parent 95e722c4
Loading
Loading
Loading
Loading
+1 −1
Changes for module/Application/view/layout/layout.phtml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -63,10 +63,10 @@ echo $this->doctype();
    ?>

    <!-- Scripts globaux -->
    <script type="text/javascript" src="<?= $this->basePath('/js/util.js?v=' . $version) ?>"></script>
    <script type="text/javascript" src="<?= $this->basePath('/vendor/jquery-3.6.0.min.js') ?>"></script>
    <script type="text/javascript" src="<?= $this->basePath('/vendor/jquery-ui-1.12.1/jquery-ui.min.js') ?>"></script>
    <script type="text/javascript" src="<?= $this->basePath('/vendor/axios/axios.min.js') ?>"></script>
    <script type="text/javascript" src="<?= $this->basePath('/js/util.js?v=' . $version) ?>"></script>
    <?= $this->vite()->head(); ?>
</head>

+0 −58
Changes for public/js/app.js: 0 added lines, 58 removed lines.
Original line number Diff line number Diff line
@@ -112,64 +112,6 @@ $(function ()
    $('.selectpicker').data('liveSearchNormalize', true);
    $('.selectpicker').data('size', 'auto');

    axios.interceptors.request.use(function (config) {
        if (config.submitter) {
            let msg = config.msg ? config.msg : 'Action en cours';
            if (config.popover != undefined) {
                config.popover.dispose();
            }
            config.popover = new bootstrap.Popover(config.submitter, {
                content: "<div class=\"spinner-border text-primary\" role=\"status\">\n" +
                    "  <span class=\"visually-hidden\">Loading...</span>\n" +
                    "</div> " + msg,
                html: true,
                trigger: 'focus'
            });
            config.popover.show();
        }
        return config;
    });

    axios.interceptors.response.use(function (response) {
        response.messages = response.data.messages;
        response.data = response.data.data;

        if (response.config.popover) {
            var popover = response.config.popover;

            let content = '';
            for (ns in response.messages) {
                for (mid in response.messages[ns]) {
                    content += '<div class="alert fade show alert-' + (ns == 'error' ? 'danger' : ns) + '" role="alert">' + response.messages[ns][mid] + '</div>';
                }
            }

            // S'il y a un truc à afficher
            if (content) {
                popover._config.content = content;
                popover.setContent();
                setTimeout(() => {
                    popover.dispose();
                }, 3000)
            } else {
                // la popover est masquée si tout est fini
                popover.dispose();
            }
        }

        response.showMessages = function (element) {
            content = '';
            for (ns in this.messages) {
                for (mid in this.messages[ns]) {
                    content += '<div class="alert alert-dismissible fade show alert-' + (ns == 'error' ? 'danger' : ns) + '" role="alert">' + this.messages[ns][mid] + '<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button></div>';
                }
            }
            element.innerHTML = content;
        };

        return response;
    });


    $(document).ajaxSend((event, xhr, settings) => {
        if (settings.submitter) {
+61 −0
Changes for public/js/util.js: 61 added lines, 0 removed lines.
Original line number Diff line number Diff line
axios.interceptors.request.use(config => {
    if (config.submitter) {
        let msg = config.msg ? config.msg : 'Action en cours';
        if (config.popover != undefined) {
            config.popover.dispose();
        }
        config.popover = new bootstrap.Popover(config.submitter, {
            content: "<div class=\"spinner-border text-primary\" role=\"status\">\n" +
                "  <span class=\"visually-hidden\">Loading...</span>\n" +
                "</div> " + msg,
            html: true,
            trigger: 'focus'
        });
        config.popover.show();
    }
    return config;
});

axios.interceptors.response.use(response => {
    console.log('coucou');
    response.messages = response.data.messages;
    response.data = response.data.data;

    if (response.config.popover) {
        var popover = response.config.popover;

        let content = '';
        for (ns in response.messages) {
            for (mid in response.messages[ns]) {
                content += '<div class="alert fade show alert-' + (ns == 'error' ? 'danger' : ns) + '" role="alert">' + response.messages[ns][mid] + '</div>';
            }
        }

        // S'il y a un truc à afficher
        if (content) {
            popover._config.content = content;
            popover.setContent();
            setTimeout(() => {
                popover.dispose();
            }, 3000)
        } else {
            // la popover est masquée si tout est fini
            popover.dispose();
        }
    }

    response.showMessages = function (element) {
        content = '';
        for (ns in this.messages) {
            for (mid in this.messages[ns]) {
                content += '<div class="alert alert-dismissible fade show alert-' + (ns == 'error' ? 'danger' : ns) + '" role="alert">' + this.messages[ns][mid] + '<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button></div>';
            }
        }
        element.innerHTML = content;
    };

    return response;
});



/**
 * Ajoute/remplace un paramètre GET à une URL.
 *