Commit 0a185f5c authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Refactoring général et amélioration hot loading

parent 967ef9c4
Loading
Loading
Loading
Loading
+2 −2
Changes for admin/actions/help.php: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -35,13 +35,13 @@ $actionsDev = [
    "update-ddl"            => "Mise à jour du fichier de définition de la base de données à partir de cette dernière",
    "update-bdd-data"       => "Mise à jour des données de la base de données",
    "update-bdd-privileges" => "Mise à jour des privilèges de la base de données",
    "update-bdd-formules"   => "Mise à jour de le liste des formules de calcul",
    "update-bdd-formules"   => "Mise à jour de la liste des formules de calcul",
    "test"                  => "Script de tests divers",
    "test-migration"        => "Script de test de migration. Paramètres : [before|after nom_du_script_de_migration]",
    "build-tableaux-bord"   => "Reconstruction des tableaux de bord",
];

if ((getenv('APPLICATION_ENV') ?: 'dev') == 'dev') {
if ($oa->inDev()) {
    $actions = array_merge($actions, $actionsDev);
}

+14 −0
Changes for admin/src/OseAdmin.php: 14 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -263,6 +263,20 @@ class OseAdmin



    public function getEnv(): string
    {
        return getenv('APPLICATION_ENV') ?: 'dev';
    }



    public function inDev(): bool
    {
        return 'dev' == $this->getEnv();
    }



    public function exec($args)
    {
        $this->console->passthru("php " . $this->getOseDir() . "/public/index.php " . $args);
+8 −41
Changes for code/test3.php: 8 added lines, 41 removed lines.
Original line number Diff line number Diff line
@@ -9,48 +9,15 @@
 */
?>
<div class="res">
    <?php

</div>
<script type="text/javascript">

    Util.ajax = function (params) {

        if (params.type === undefined) {
            params.type = 'POST';
        }

        params.url = Util.url(params.url);

        // var getArgs = data ? $.param(data) : null;
        // return Url.getBase() + route + (getArgs ? '?' + getArgs : '');
        //
        // params.url = Url.getBase().

    };



    $(function () {
        console.clear();

        let route = 'mission/liste/:intervenant';
        let params = {intervenant: '1000000000'};
        //let query = {order: 'ASC'};
        let query = undefined;
    //return true;
    // This method is very useful for the local server
    // if we try to access it, and by any means, didn't started Vite yet
    // it will fallback to load the production files from manifest
    // so you still navigate your site as you intended!

        console.log(Util.url(route, params, query));
        /*
                $.ajax({
                    type: 'POST',
                    //url: '/mission/liste/:intervenant',
                    url: '/mission/liste/1000000000',
                    urlParams: {intervenant: 1000000000},
                    data: this.mission,
                    success: function (response) {
                        console.log(response);
                    }
                });
        */

    });
</script>
 No newline at end of file
    ?>
</div>
+12 −12
Changes for composer.lock: 12 added lines, 12 removed lines.
Original line number Diff line number Diff line
@@ -75,16 +75,16 @@
        },
        {
            "name": "brick/varexporter",
            "version": "0.3.7",
            "version": "0.3.8",
            "source": {
                "type": "git",
                "url": "https://github.com/brick/varexporter.git",
                "reference": "3e263cd718d242594c52963760fee2059fd5833c"
                "reference": "b5853edea6204ff8fa10633c3a4cccc4058410ed"
            },
            "dist": {
                "type": "zip",
                "url": "https://api.github.com/repos/brick/varexporter/zipball/3e263cd718d242594c52963760fee2059fd5833c",
                "reference": "3e263cd718d242594c52963760fee2059fd5833c",
                "url": "https://api.github.com/repos/brick/varexporter/zipball/b5853edea6204ff8fa10633c3a4cccc4058410ed",
                "reference": "b5853edea6204ff8fa10633c3a4cccc4058410ed",
                "shasum": ""
            },
            "require": {
@@ -112,7 +112,7 @@
            ],
            "support": {
                "issues": "https://github.com/brick/varexporter/issues",
                "source": "https://github.com/brick/varexporter/tree/0.3.7"
                "source": "https://github.com/brick/varexporter/tree/0.3.8"
            },
            "funding": [
                {
@@ -120,7 +120,7 @@
                    "type": "github"
                }
            ],
            "time": "2022-06-29T23:37:57+00:00"
            "time": "2023-01-21T23:05:38+00:00"
        },
        {
            "name": "doctrine/annotations",
@@ -1371,16 +1371,16 @@
        },
        {
            "name": "doctrine/persistence",
            "version": "3.1.2",
            "version": "3.1.3",
            "source": {
                "type": "git",
                "url": "https://github.com/doctrine/persistence.git",
                "reference": "b44d128311af55275dbed6a4558ca59a2b9f9387"
                "reference": "920da294b4bb0bb527f2a91ed60c18213435880f"
            },
            "dist": {
                "type": "zip",
                "url": "https://api.github.com/repos/doctrine/persistence/zipball/b44d128311af55275dbed6a4558ca59a2b9f9387",
                "reference": "b44d128311af55275dbed6a4558ca59a2b9f9387",
                "url": "https://api.github.com/repos/doctrine/persistence/zipball/920da294b4bb0bb527f2a91ed60c18213435880f",
                "reference": "920da294b4bb0bb527f2a91ed60c18213435880f",
                "shasum": ""
            },
            "require": {
@@ -1449,7 +1449,7 @@
            ],
            "support": {
                "issues": "https://github.com/doctrine/persistence/issues",
                "source": "https://github.com/doctrine/persistence/tree/3.1.2"
                "source": "https://github.com/doctrine/persistence/tree/3.1.3"
            },
            "funding": [
                {
@@ -1465,7 +1465,7 @@
                    "type": "tidelift"
                }
            ],
            "time": "2022-12-19T13:58:18+00:00"
            "time": "2023-01-19T13:39:42+00:00"
        },
        {
            "name": "easybook/geshi",
+5 −5
Changes for config/application.config.php: 5 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -139,11 +139,11 @@ class AppConfig
            array_unshift($modules, 'BjyAuthorize'); // ne charge BjyAuthorize QUE si on n'est pas en mode console
        }

        if ('dev' == $env) {
        if (self::inDev()) {
            $modules[] = 'Laminas\DeveloperTools';
        }

        if (self::inConsole() || 'dev' == $env) {
        if (self::inConsole() || self::inDev()) {
            $modules[] = 'UnicaenCode';
        }

@@ -154,15 +154,15 @@ class AppConfig
            'modules'                 => $modules,
            'module_listener_options' => [
                'config_glob_paths'        => [
                    'config/autoload/{,*.}{global,local' . ('dev' == $env ? ',dev' : '') . '}.php',
                    'config/autoload/{,*.}{global,local' . (self::inDev() ? ',dev' : '') . '}.php',
                ],
                'module_paths'             => [
                    './module',
                    './vendor',
                ],
                'cache_dir'                => 'cache/',
                'config_cache_enabled'     => ('prod' == $env && !self::inConsole()),
                'module_map_cache_enabled' => ('prod' == $env && !self::inConsole()),
                'config_cache_enabled'     => (self::inProd() && !self::inConsole()),
                'module_map_cache_enabled' => (self::inProd() && !self::inConsole()),
            ],
        ];
    }
Loading