Commit d8d8da83 authored by Stephane Bouvry's avatar Stephane Bouvry
Browse files

Préparation des messages de relance

parent f6050b25

doc/config-documents.md

+4 −0
Changes for doc/config-documents.md: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -57,3 +57,7 @@ Puis pensez à recharger Apache : 
```bash

service apache2 restart

```



## Documents générés



Oscar permet de générer des documents automatiquement à partir de gabarits (.doc), plus d'information dans la document [Générer des documents](generated-documents.md). 
 No newline at end of file

doc/generated-documents.md

+6 −3
Changes for doc/generated-documents.md: 6 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 


La version **2.9 Matrix** de *Oscar* introduit un système pour générer des documents à partir de la fiche activité.



# Configuration d'un modèle

## Configuration d'un modèle



Dans le fichier `config/autoload/local.php`, on renseigne la clef `generated-documents` :
@@ -43,12 +43,15 @@ Exemple : 


<table border='1'><tr><th>id</th><td><small>STRING</small></td><td><code>2</code></td></tr><tr><th>acronym</th><td><small>STRING</small></td><td><code>RELACSV</code></td></tr><tr><th>amount</th><td><small>STRING</small></td><td><code>15000</code></td></tr><tr><th>pfi</th><td><small>STRING</small></td><td><code></code></td></tr><tr><th>oscar</th><td><small>STRING</small></td><td><code>2015DRI00001</code></td></tr><tr><th>montant</th><td><small>STRING</small></td><td><code>15 000,00€</code></td></tr><tr><th>annee-debut</th><td><small>STRING</small></td><td><code>2015</code></td></tr><tr><th>annee-fin</th><td><small>STRING</small></td><td><code>2017</code></td></tr><tr><th>debut</th><td><small>STRING</small></td><td><code>01/01/2015</code></td></tr><tr><th>fin</th><td><small>STRING</small></td><td><code>31/12/2017</code></td></tr><tr><th>intitule</th><td><small>STRING</small></td><td><code>Exemple d'activité 2</code></td></tr><tr><th>label</th><td><small>STRING</small></td><td><code>Exemple d'activité 2</code></td></tr><tr><th>type</th><td><small>STRING</small></td><td><code>Colloques</code></td></tr><tr><th>ingenieur</th><td><small>STRING</small></td><td><code>Sarah Déclarant, Marcel Grossmann, John Doe</code></td></tr><tr><th>ingenieur-list</th><td><small>[LIST]</small></td><td>Sarah Déclarant, Marcel Grossmann, John Doe</td></tr><tr><th>responsable-scientifique</th><td><small>STRING</small></td><td><code>Maurice Solovine, Albert Einstein</code></td></tr><tr><th>responsable-scientifique-list</th><td><small>[LIST]</small></td><td>Maurice Solovine, Albert Einstein</td></tr><tr><th>composante-responsable</th><td><small>STRING</small></td><td><code>ACME </code></td></tr><tr><th>composante-responsable-list</th><td><small>[LIST]</small></td><td>ACME </td></tr><tr><th>laboratoire</th><td><small>STRING</small></td><td><code>US Robots , Cyberdyne </code></td></tr><tr><th>laboratoire-list</th><td><small>[LIST]</small></td><td>US Robots , Cyberdyne </td></tr><tr><th>jalon-fin-d-eligibilite-des-depenses</th><td><small>STRING</small></td><td><code>30/06/2019</code></td></tr><tr><th>jalon-fin-d-eligibilite-des-depenses-list</th><td><small>[LIST]</small></td><td>30/06/2019</td></tr><tr><th>jalon-debut-d-eligibilite-des-depenses</th><td><small>STRING</small></td><td><code>01/01/2019</code></td></tr><tr><th>jalon-debut-d-eligibilite-des-depenses-list</th><td><small>[LIST]</small></td><td>01/01/2019</td></tr><tr><th>versements-prevus</th><td><small>STRING</small></td><td><code>2,500.00 € le 01/03/2019, 5,000.00 € le 01/04/2019, 3,000.00 € le 01/05/2019, 4,500.00 € le 01/06/2019</code></td></tr><tr><th>versements-effectues</th><td><small>STRING</small></td><td><code></code></td></tr><tr><th>versementPrevuMontant</th><td><small>[LIST]</small></td><td>2,500.00 €, 5,000.00 €, 3,000.00 €, 4,500.00 €</td></tr><tr><th>versementPrevuDate</th><td><small>[LIST]</small></td><td>01/03/2019, 01/04/2019, 01/05/2019, 01/06/2019</td></tr><tr><th>versement-effectue-montant</th><td><small>[LIST]</small></td><td>2,500.00 €, 5,000.00 €, 3,000.00 €, 4,500.00 €</td></tr><tr><th>versement-effectue-date</th><td><small>[LIST]</small></td><td>01/03/2019, 01/04/2019, 01/05/2019, 01/06/2019</td></tr></table>



# Variable STRING dans le gabarit

## Variable STRING dans le gabarit



Les variables typées **STRING** peuvent être affichée dans le gabarit avec l'expression `${variable}` où variable correspond au nom de la variable. Par exemple si l'on souhaite afficher l'acronyme de l'activité, on utilisera `${acronym}`.



> Les variables issues des jalons/organisations/personnes dépendent des rôles/type de jalon que vous utilisez dans votre installation Oscar.



# Variable LIST dans le gabarit







## Variable LIST dans le gabarit



A VENIR (en cours)
 
 No newline at end of file

install/privileges.json

+8 −0
Changes for install/privileges.json: 8 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -759,5 +759,13 @@ 
    "code": "NOTIFICATION_PERSON",

    "libelle": "Peut notifier manuellement une personne",

    "fullcode": "MAINTENANCE-NOTIFICATION_PERSON"

  },



  "MAINTENANCE-PARAMETERS_MANAGE": {

    "spot": 7,

    "category_id": 6,

    "code": "PARAMETERS_MANAGE",

    "libelle": "Peut gérer les paramètres",

    "fullcode": "MAINTENANCE-PARAMETERS_MANAGE"

  }

}
 
 No newline at end of file

module/Oscar/config/module.config.php

+15 −14
Changes for module/Oscar/config/module.config.php: 15 added lines, 14 removed lines.
Original line number Diff line number Diff line
@@ -35,36 +35,37 @@ return array( 


                [ 'controller' =>  'Administration',

                    'action' => [

                        'access',

                        "accessAPI",

                        'accueil', // OK

                        'activityIndexBuild', // OK

                        'connectorsConfig',

                        'connectorTest',

                        'connectorExecute',

                        'connectorsHome',

                        'connectorConfigure',

                        'discipline', // OK

                        'documentSections',

                        'users',

                        'roles',

                        'rolesEdit',

                        "index",

                        "roleAPI",

                        "userLogs",

                        'userRoles',

                        'index',

                        'messages',

                        'organizationRole',

                        'organizationRoleApi',

                        'organizationType',

                        'oscarWorkerStatus',

                        'roleAPI',

                        'roles',

                        'rolesEdit',

                        'testconfig',

                        'tva',

                        'connectorsConfig',

                        'connectorTest',

                        'connectorExecute',

                        'connectorsHome',

                        'connectorConfigure',

                        'typeDocument',

                        'typeDocumentApi',

                        'numerotation',

                        'parameters',

                        'privileges2',

                        'access',

                        'planComptableLoaded'

                        'planComptableLoaded',

                        'userLogs',

                        'users',

                        'userRoles',

                    ],

                    'roles' => ['user']

                ],

module/Oscar/config/routes.yml

+9 −0
Changes for module/Oscar/config/routes.yml: 9 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -1776,3 +1776,12 @@ administration: 
                         route: /api[/[:typedocumentid]]

                         defaults:

                           action: typeDocumentApi



        # Types d'organisation

        messages:

            type: segment

            options:

                route: /messages

                defaults:

                    action: messages

            may_terminate: true
 
 No newline at end of file