Commit 122d8ca7 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Merge branch 'release_5.3.0'

parents 59b7f5a2 6d78c817

CHANGELOG.md

+4 −0
Changes for CHANGELOG.md: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line 
Journal des modifications

=========================



5.3.0

-----

- Nouvelle version du module Rapports d'activité.



5.2.11

------

- Formation : Ajout d'un mail vers les formateurs lorsque la session est imminente

bin/database/README.md

+3 −2
Changes for bin/database/README.md: 3 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -21,8 +21,9 @@ Le script shell [`./build_db_install_files.sh`](build_db_install_files.sh) gén 
    - `05_prepare_data.sql`

    - `06_create_constraints.sql`

    - `07_create_comue.sql`

    - `08_init.sql`

    - `09_create_fixture.sql`

    - `08_create_ced.sql`

    - `09_init.sql`

    - `10_create_fixture.sql`

      

  - un script bash et un fichier de config pour "préparer" les scripts SQL ayant l'extension `.sql.dist` :    

    - `build_db_files.conf.dist`

bin/database/build_db_install_files.sh

+11 −2
Changes for bin/database/build_db_install_files.sh: 11 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -118,6 +118,7 @@ NAME_INSERT_BOOTSTRAP_DATA='insert_bootstrap_data' 
NAME_INSERT_DATA='insert_data'

NAME_PREPARE_DATA='prepare_data'

NAME_CREATE_COMUE='create_comue'

NAME_CREATE_CED='create_ced'

NAME_INIT='init'

NAME_CREATE_FIXTURE='create_fixture'

NAME_CREATE_CONSTRAINTS='create_constraints'
@@ -192,10 +193,18 @@ SRC_SCRIPT=$THIS_DIR/src/sql/$NAME_CREATE_COMUE.template.sql 
cp $SRC_SCRIPT $OUTPUT_FILE

echo "> $OUTPUT_FILE"



#

# CED

#

OUTPUT_FILE=$OUTPUT_DIR/sql/08_$NAME_CREATE_CED.sql.dist

SRC_SCRIPT=$THIS_DIR/src/sql/$NAME_CREATE_CED.template.sql

cp $SRC_SCRIPT $OUTPUT_FILE

echo "> $OUTPUT_FILE"



#

# init

#

OUTPUT_FILE=$OUTPUT_DIR/sql/08_$NAME_INIT.sql.dist

OUTPUT_FILE=$OUTPUT_DIR/sql/09_$NAME_INIT.sql.dist

SRC_SCRIPT=$THIS_DIR/src/sql/$NAME_INIT.template.sql

cp $SRC_SCRIPT $OUTPUT_FILE

echo "> $OUTPUT_FILE"
@@ -203,7 +212,7 @@ echo "> $OUTPUT_FILE" 
#

# fixtures

#

OUTPUT_FILE=$OUTPUT_DIR/sql/09_$NAME_CREATE_FIXTURE.sql.dist

OUTPUT_FILE=$OUTPUT_DIR/sql/10_$NAME_CREATE_FIXTURE.sql.dist

SRC_SCRIPT=$THIS_DIR/src/sql/$NAME_CREATE_FIXTURE.template.sql

cp $SRC_SCRIPT $OUTPUT_FILE

echo "> $OUTPUT_FILE"

bin/database/src/README.template.md

+3 −2
Changes for bin/database/src/README.template.md: 3 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -15,8 +15,9 @@ Les fichiers fournis permettant de créer une base de données pour ESUP-SyGAL s 
    - [`05_prepare_data.sql`](sql/05_prepare_data.sql)

    - [`06_create_constraints.sql`](sql/06_create_constraints.sql)

    - [`07_create_comue.sql.dist`](sql/07_create_comue.sql.dist)

    - [`08_init.sql.dist`](sql/08_init.sql.dist)

    - [`09_create_fixture.sql.dist`](sql/09_create_fixture.sql.dist)

    - [`08_create_ced.sql.dist`](sql/08_create_ced.sql.dist)

    - [`09_init.sql.dist`](sql/09_init.sql.dist)

    - [`10_create_fixture.sql.dist`](sql/10_create_fixture.sql.dist)

    



## Case départ

bin/database/src/build_db_files.template.conf.dist

+5 −0
Changes for bin/database/src/build_db_files.template.conf.dist: 5 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -18,6 +18,11 @@ ETAB_COMUE=0 # Une COMUE doit-elle être créée 
#ETAB_COMUE_LIBELLE='Normandie Université'   # Libellé complet de la COMUE

#ETAB_COMUE_DOMAINE='normandie-univ.fr'      # Domaine de la COMUE



#============================= CED =========================#

ETAB_CED=0                                                  # Un CED doit-il être créé ? 0=Non 1=Oui

#ETAB_CED_SIGLE='CED'                                        # Sigle du CED

#ETAB_CED_LIBELLE='Collège des écoles doctorales normandes'  # Libellé complet du CED



#============= Sources d'import ============#

SOURCE_APOGEE=1                             # Apogée   est-elle une source de données à importer ? 0=Non 1=Oui

SOURCE_PHYSALIS=0                           # Physalis est-elle une source de données à importer ? 0=Non 1=Oui