Commit 1839ab9b authored by Stephane Bouvry's avatar Stephane Bouvry
Browse files

- Ajout au modèle des activités certaines informations necessaires à PCRU (Non-obligatoire) 

  - Source de financement
  - Pôle de compétitivité

- Command de contrôle sur les données PCRU en cours
parent d6ce0db7

front/README.md

0 → 100644
+3 −0
Changes for front/README.md: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line 
# Gestion des modules d'interface VUEJS



Informations pour le développement : Ajout / Modification des modules
 
 No newline at end of file

front/gulpfile.js

+46 −12
Changes for front/gulpfile.js: 46 added lines, 12 removed lines.
Original line number Diff line number Diff line
@@ -4,6 +4,14 @@ const exec = require('child_process').exec; 
const pathModuleSrc = './src/';

const pathModuleDest = './../public/js/oscar/dist/'





////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

// Fonctions génériques



/**

 * Compilation d'un module

 * @param module

 */

function compile(module){

    let moduleSrc = pathModuleSrc + module + ".vue";

    let moduleDest = pathModuleDest;
@@ -13,6 +21,10 @@ function compile(module){ 
    exec(cmd);

}



/**

 * Compilation d'un composant

 * @param module

 */

function compileComponent(componentBaseName){

    let moduleSrc = './src/components/' + componentBaseName + ".vue";

    let moduleDest = pathModuleDest;
@@ -22,29 +34,49 @@ function compileComponent(componentBaseName){ 
    exec(cmd);

}



function activityDocument(cb) {

    compile("ActivityDocument");

    cb();

}

////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

//

// COMMANDES GULP

//

////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////



////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

//// 2. MODULES

//

// 2.1 UI de configuration PCRU (FTP)

function administrationPcru(cb) {

    compile("AdministrationPcru");

    cb();

}

exports.administrationPcru = administrationPcru;

exports.administrationPcruWatch = function(cb){

    watch(pathModuleSrc + "AdministrationPcru.vue", administrationPcru);

}



//// 2.2 UI de configuration des pôles de compétitivité PCRU

function administrationPcruPC(cb) {

    compile("AdministrationPcruPoleCompetitivite");

    cb();

}

exports.administrationPCPcru = administrationPcruPC;

exports.administrationPCPcruWatch = function(cb){

    watch(pathModuleSrc + "AdministrationPcruPoleCompetitivite.vue", administrationPcruPC);

}



let commands = ['activityDocument', 'administrationPcru'];





//// 2.3 Documents des activités

function activityDocument(cb) {

    compile("ActivityDocument");

    cb();

}

exports.activityDocument = activityDocument;

exports.activityDocumentWatch = function(cb){

    watch(pathModuleSrc + "ActivityDocument.vue", activityDocument);

}



exports.administrationPcru = administrationPcru;

exports.administrationPcruWatch = function(cb){

    watch(pathModuleSrc + "AdministrationPcru.vue", administrationPcru);

}



////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

//// 3. COMPOSANTS

///////////////////////// COMPOSANTS COMPILES

function componentPassword(cb) {

    compileComponent('PasswordField');
@@ -60,6 +92,8 @@ function componentTextarea(cb) { 
exports.componentTextarea = componentTextarea;

exports.componentTextareaWatch = function(cb){ watch('./src/components/TextareaField.vue', componentTextarea); }



let commands = ['activityDocument', 'administrationPcru', 'administrationPcruPC'];



function defaultTask(cb) {

    console.log("Usage : ");

    for( let i=0; i<commands.length; i++ ){

front/src/AdministrationPcruPoleCompetitivite.vue

0 → 100644
+72 −0
Changes for front/src/AdministrationPcruPoleCompetitivite.vue: 72 added lines, 0 removed lines.
Original line number Diff line number Diff line 
<template>

    <section style="position: relative; min-height: 100px">

        <ajax-oscar :oscar-remote-data="remoterState" />



        <article class="card xs" v-for="pole in poles">

          <h3>{{ pole }} - {{ i }}</h3>

        </article>

    </section>

</template>

<script>

    /******************************************************************************************************************/

    /* ! DEVELOPPEUR

    Depuis la racine OSCAR :



    cd front



    Pour compiler en temps réél :

    node node_modules/.bin/gulp administrationPcruPCWatch



    Pour compiler :

    node node_modules/.bin/gulp administrationPCPcru



     */

    import AjaxOscar from "./remote/AjaxOscar";

    import OscarRemoteData from "./remote/OscarRemoteData";

    import PasswordField from "./components/PasswordField";



    // test

    let oscarRemoteData = new OscarRemoteData();



    function flashMessage(){

        // TODO

    }



    export default {



        components: {

            "ajax-oscar": AjaxOscar

        },



        props: {

            url: { required: true }

        },



        data(){

            return {

                formData: null,

                remoterState: oscarRemoteData.state,

                configuration: null,

                poles: ["foo", "bar"]

            }

        },



        methods:{

            handlerSuccess(success){

                let data = success.data;

                this.poles = data.poles;

            },



            fetch(){

                oscarRemoteData

                    .setDebug(true)

                    .setPendingMessage("Chargement du référenciel des pôles de compétitivité")

                    .setErrorMessage("Impossible de charger le référenciel")

                    .performGet(this.url, this.handlerSuccess);

            }

        },

        mounted(){

            this.fetch();

        }

    }

</script>
 
 No newline at end of file

module/Oscar/config/module.config.php

+12 −1
Changes for module/Oscar/config/module.config.php: 12 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ return array( 
                        'typeDocumentApi',

                        'numerotation',

                        'parameters',

                        'polesCompetitivite',

                        'privileges2',

                        'planComptableLoaded',

                        'userLogs',
@@ -208,7 +209,17 @@ return array( 
                ],



                ['controller' => 'Api',

                    'action' => ['help','persons','person','organization','organizations','roles','adminManageAccess', 'activity'],

                    'action' => [

                        'activity',

                        'help',

                        'organization',

                        'organizations',

                        'person',

                        'persons',

                        'referencielPcruPoleCompetitivite',

                        'roles',

                        'adminManageAccess',

                    ],

                    'roles' => []

                ],

module/Oscar/config/routes.yml

+17 −0
Changes for module/Oscar/config/routes.yml: 17 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -63,6 +63,14 @@ api: 
                defaults:

                    action: help



        # Référenciel PCRU

        referenciel-pcru-polecompetitivite:

            type: segment

            options:

                route: /referenciel/pcru/pole-competitivite

                defaults:

                    action: referencielPcruPoleCompetitivite



        organizations:

            type: segment

            options:
@@ -1808,3 +1816,12 @@ administration: 
                defaults:

                    action: pcru

            may_terminate: true



        # Types d'organisation

        poles-competitivite:

            type: segment

            options:

                route: /poles-competitivite

                defaults:

                    action: polesCompetitivite

            may_terminate: true
 
 No newline at end of file