Commit c8db3c9f authored by Florian Joriot's avatar Florian Joriot
Browse files

Merge branch 'master' into Modularisation_Contrat_FJ_merge_master

parents d32eb5d6 4a073be1

config/autoload/unicaen-vue.global.php

+2 −0
Original line number Diff line number Diff line
@@ -4,5 +4,7 @@ return [ 
    'unicaen-vue' => [

        'host'        => 'http://localhost:5133',

        'hot-loading' => \AppConfig::inDev() ? \AppConfig::get('dev', 'hot-loading') : false,

        'dist-path'   => 'public/dist',

        'dist-url'    => 'dist',

    ],

];
 
 No newline at end of file

module/Mission/src/Entity/Db/Mission.php

+1 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ class Mission implements HistoriqueAwareInterface, ResourceInterface, AxiosExtra 
            'heuresValidees',

            'heuresRealisees',

            'volumesHorairesPrevus',

            ['etudiants',['id', 'code', 'nomUsuel', 'prenom', 'dateNaissance']],

            'contrat',

            'valide',

            'validation',

module/Mission/src/Entity/Db/TypeMission.php

+13 −1
Original line number Diff line number Diff line
@@ -5,8 +5,9 @@ namespace Mission\Entity\Db; 
use Application\Interfaces\ParametreEntityInterface;

use Application\Traits\ParametreEntityTrait;

use Paiement\Entity\Db\TauxRemu;

use UnicaenVue\Axios\AxiosExtractorInterface;



class TypeMission implements ParametreEntityInterface

class TypeMission implements ParametreEntityInterface, AxiosExtractorInterface

{

    use ParametreEntityTrait;
@@ -22,6 +23,17 @@ class TypeMission implements ParametreEntityInterface 






    public function axiosDefinition(): array

    {

        return [

            'id',

            'libelle',

            'accompagnementEtudiants',

        ];

    }







    public function getId(): ?int

    {

        return $this->id;

vite.config.js

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ export default unicaenVue.defineConfig({ 
    root: 'front',

    build: {

        // Répertoire où seront placés les fichiers issus du build et à ajouter au GIT

        // à mettre en cohérence avec la config côté PHP

        outDir: path.resolve(__dirname, 'public/dist'),

    },

    server: {