#3523 Implémentaion et uilisation Table configuration

Alexandre
1 parent 5e70d8b0
Showing 24 changed files with 619 additions and 163 deletions Show diff stats
database/labinvent_2.0_19-04-16.sql -> database/labinvent_2.1_09-05-16.sql
database/update/.gitignore
database/update/db-update-2016-05-09.sql
install/installation.sh
install/installation.sh~
src/Controller/AppController.php
src/Controller/ConfigurationsController.php
src/Controller/MaterielsController.php
src/Model/Entity/Configuration.php
src/Model/Table/ConfigurationsTable.php
src/Model/Table/MaterielsTable.php
src/Template/Configurations/edit.ctp
src/Template/Configurations/view.ctp
src/Template/Layout/default.ctp
src/Template/Materiels/add.ctp
src/Template/Materiels/edit.ctp
src/Template/Pages/home.ctp
src/Template/Pages/home_app.ctp
src/Template/Pages/home_install.ctp
src/Template/Pages/tools.ctp
@@ -296,6 +296,35 @@ CREATE TABLE IF NOT EXISTS `users` (
 ) ENGINE=InnoDB  DEFAULT CHARSET=latin1 AUTO_INCREMENT=25 ;
+-- --------------------------------------------------------
+--
+-- Structure de la table `configurations`
+--
+
+DROP TABLE IF EXISTS `configurations`;
+CREATE TABLE IF NOT EXISTS `configurations` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `nom` varchar(45) NOT NULL COMMENT 'obligatoire (et unique)',
+  `mode_install` tinyint(1)  DEFAULT NULL,
+  `mode_debug` tinyint(1)  DEFAULT NULL,
+  `use_ldap` tinyint(1)  DEFAULT NULL,
+  `host_ldap` varchar(30)  DEFAULT NULL,
+  `port_ldap` varchar(10)  DEFAULT NULL,
+  `authentificationType_ldap` varchar(30)  DEFAULT NULL,
+  `baseDn_ldap` varchar(30)  DEFAULT NULL,
+  `filter_ldap` varchar(30)  DEFAULT NULL,
+  `labName` varchar(30)  DEFAULT NULL,
+  `labNameShort` varchar(20)  DEFAULT NULL,
+  `labPresent` varchar(10)  DEFAULT NULL,
+  `labUmr` varchar(30)  DEFAULT NULL,
+  `hasPrinter` tinyint(1)  DEFAULT NULL,
+  `emailGuest1` varchar(45)  DEFAULT NULL,
+  `emailGuest2` varchar(45)  DEFAULT NULL,
+  `emailGuest3` varchar(45)  DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `nom_UNIQUE` (`nom`)
+);
+
 --
 -- Contraintes pour les tables exportées
 --
@@ -349,6 +378,11 @@ ALTER TABLE `suivis`
 ALTER TABLE `users`
   ADD CONSTRAINT `fk_users_groupes_travails1` FOREIGN KEY (`groupes_metier_id`) REFERENCES `groupes_metiers` (`id`) ON DELETE NO ACTION ON UPDATE NO ACTION;
+
+-- Insertion par défaut pour la table configuration
+Insert into `configurations`(`nom`, `mode_install`, `mode_debug`, `use_ldap`, `host_ldap`, `port_ldap`, `authentificationType_ldap`, `baseDn_ldap`, `filter_ldap`, `labName`, `labNameShort`, `labPresent`, `labUmr`, `hasPrinter`, `emailGuest1`, `emailGuest2`, `emailGuest3`) values ('default', '1', '0', '0', '', '', '', '', '', 'LABONAME', 'LABO', 'du ', '', '0', '', '', '');
+
+
 /*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
 /*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
@@ -0,0 +1 @@
+/db-update-2016-05-09.sql~
@@ -0,0 +1,27 @@
+
+DROP TABLE IF EXISTS `configurations`;
+CREATE TABLE IF NOT EXISTS `configurations` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `nom` varchar(45) NOT NULL COMMENT 'obligatoire (et unique)',
+  `mode_install` tinyint(1)  DEFAULT NULL,
+  `mode_debug` tinyint(1)  DEFAULT NULL,
+  `use_ldap` tinyint(1)  DEFAULT NULL,
+  `host_ldap` varchar(30)  DEFAULT NULL,
+  `port_ldap` varchar(10)  DEFAULT NULL,
+  `authentificationType_ldap` varchar(30)  DEFAULT NULL,
+  `baseDn_ldap` varchar(30)  DEFAULT NULL,
+  `filter_ldap` varchar(30)  DEFAULT NULL,
+  `labName` varchar(30)  DEFAULT NULL,
+  `labNameShort` varchar(20)  DEFAULT NULL,
+  `labPresent` varchar(10)  DEFAULT NULL,
+  `labUmr` varchar(30)  DEFAULT NULL,
+  `hasPrinter` tinyint(1)  DEFAULT NULL,
+  `emailGuest1` varchar(45)  DEFAULT NULL,
+  `emailGuest2` varchar(45)  DEFAULT NULL,
+  `emailGuest3` varchar(45)  DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `nom_UNIQUE` (`nom`)
+);
+
+
+Insert into `configurations`(`nom`, `mode_install`, `mode_debug`, `use_ldap`, `host_ldap`, `port_ldap`, `authentificationType_ldap`, `baseDn_ldap`, `filter_ldap`, `labName`, `labNameShort`, `labPresent`, `labUmr`, `hasPrinter`, `emailGuest1`, `emailGuest2`, `emailGuest3`) values ('default', '1', '0', '0', '', '', '', '', '', 'LABONAME', 'LABO', 'du ', '', '0', '', '', '');
@@ -283,8 +283,8 @@ cd database/
   echo "Creation script de construction."
   [[ -f build.sql ]] && cp -p build.sql build.sql.ORIG
-  #Contraintes présentes dans le fichier "labinvent_2.0_19-04-16.sql"
-  cat ./labinvent_2.0_19-04-16.sql > ./build.sql
+  #Contraintes présentes dans le fichier "labinvent_2.1_09-05-16.sql"
+  cat ./labinvent_2.1_09-05-16.sql > ./build.sql
   # Ajout login & mdp utlisateur application dans le script build.sql
   sed -e "s/'mydb'/'$bddUserName'/" -i ./build.sql
@@ -49,24 +49,48 @@ read
 #Creation des dossiers temporaires (tmp, logs, ...)
 echo "Création des dossiers temporaires..."
-mkdir ./logs/
-touch ./logs/error.log
-touch ./logs/cli-error.log
-mkdir ./tmp/
-mkdir ./tmp/bake/
-mkdir ./tmp/cache/
-mkdir ./tmp/cache/models/
-mkdir ./tmp/cache/persistent/
-mkdir ./tmp/cache/views/
-mkdir ./tmp/documents/
-mkdir ./tmp/sessions/
-mkdir ./tmp/tests/
+if [ ! -d "./logs" ]; then
+   mkdir ./logs/
+fi
+if [ ! -f "./logs/error.log" ]; then
+   touch ./logs/error.log
+fi
+if [ ! -f "./logs/cli-error.log" ]; then
+   touch ./logs/cli-error.log
+fi
+
+if [ ! -d "./tmp" ]; then
+   mkdir ./tmp/
+fi
+if [ ! -d "./tmp/bake" ]; then
+   mkdir ./tmp/bake/
+fi
+if [ ! -d "./tmp/cache" ]; then
+   mkdir ./tmp/cache/
+fi
+if [ ! -d "./tmp/cache/models" ]; then
+   mkdir ./tmp/cache/models/
+fi
+if [ ! -d "./tmp/cache/persistent" ]; then
+   mkdir ./tmp/cache/persistent/
+fi
+if [ ! -d "./tmp/cache/views" ]; then
+   mkdir ./tmp/cache/views/
+fi
+if [ ! -d "./tmp/documents" ]; then
+   mkdir ./tmp/documents/
+fi
+if [ ! -d "./tmp/sessions" ]; then
+   mkdir ./tmp/sessions/
+fi
+if [ ! -d "./tmp/tests" ]; then
+   mkdir ./tmp/tests/
+fi
+
 echo "==>Done"
 # Donner les droits et le groupe aux dossiers 
 echo "Mise à jour des droits des dossiers..."
-##sudo chgrp -R $grp ./tmp/
-##sudo chmod -R 775 ./tmp/
 # 1) POUR LES QRCODES
@@ -109,15 +133,15 @@ chmod -R 777 ./tmp/
 sudo chgrp -R $grp ./tmp/
 chmod -R 777 ./logs/
 sudo chgrp -R $grp ./logs/
+#Il semble qu'il manque des droits au dossier Vendor, droit trop général à réduire (identifié les composants qui ont besoin de s'éxécuter ou de se lire, pas d'écriture dans le dossier Vendor normalement...)
+chmod -R 777 ./vendor/cakephp/
 echo "==>Done"
-#chown --> user 
 # CONFIGURATION (Database and LDAP)
 cakephpAppPath=./
 configPath=$cakephpAppPath/config
-#myconfigFile=$configPath/config.php
 dbConfigFile=$configPath/app.php
 myConfigFile=$configPath/app.php
 configFile=$configPath/app.php
@@ -125,7 +149,6 @@ configFile=$configPath/app.php
 # Copy sample GENERAL config file to real personal file (make a copy first if already exists !)
 [[ -f $myConfigFile ]] && cp -p $myConfigFile $myConfigFile.ORIG
 cp $configPath/app.default.php $myConfigFile
-#cp $configPath/app.default.php $configPath/app.php
 # - 1) Configuration : LDAP
 echo
@@ -182,7 +205,6 @@ echo &quot;Informations sur la base de donnee &quot;
 echo "Voulez-vous creer la base de donnees, Oui/Non ? (par defaut, Non) :"
 read rep
-##if  [ -z $rep ] || [ $rep = "N" ] || [ $rep = "n" ] || [ $rep = "Non" ]  || [ $rep = "non" ]  || [ $rep = "NON" ]; then
 if  [ -z $rep ] ; then
 	rep="Non"
 fi
@@ -217,8 +239,7 @@ read bddName
 if  [ -z $bddName ] ; then
     bddName="labinvent"
 fi
-#sed -i "s/mydb/$bddName/" $dbConfigFile
-#sed -e "s/mydb/$bddName/" -i $dbConfigFile
+sed -e "s/'database' => 'database'/'database' => '$bddName'/" -i $dbConfigFile
 echo "Entrez le login privilegie vous donnant le droit de CREER la Base de donnees inventaire (NB: ce login ne sera utilise qu'une seule fois, pour la creation de la base ; par defaut=root) :"
 read bddAdminName
@@ -242,14 +263,11 @@ if [ -z $bddUserName ] ; then
 	bddUserName=$defaultBddUserName
 fi
 echo "==> BD inventaire user login = $bddUserName"
-#sed -i "s/root/$bddUserName/" $dbConfigFile
-#sed -e "s/root/$bddUserName/" -i $dbConfigFile
+sed -e "s/'username' => 'username'/'username' => '$bddUserName'/" -i $dbConfigFile
 echo "Entrez le mot de passe de cet utilisateur :"
 read -s bddUserPass
 # Cela ne s ecrit pas sur l ecran 
-# read -s bddPassword
-#sed -i "s/pwdrt/$bddUserPass/" $dbConfigFile
-#sed -e "s/pwdrt/$bddUserPass/" -i $dbConfigFile
+sed -e "s/'password' => 'password'/'password' => '$bddUserPass'/" -i $dbConfigFile
 echo
@@ -264,13 +282,13 @@ cd database/
   echo "Creation script de construction."
   [[ -f build.sql ]] && cp -p build.sql build.sql.ORIG
+
   #Contraintes présentes dans le fichier "labinvent_2.0_19-04-16.sql"
   cat ./labinvent_2.0_19-04-16.sql > ./build.sql
-  # Ajout des contraintes
-  #cat ./Upd_TableConstraints.sql >> ./build.sql
-  #sed -i "s/bddUserName/$bddUserName/" ./build.sql
-  sed -e "s/bddUserName/$bddUserName/" -i ./build.sql
-  sed -e "s/bddUserPass/$bddUserPass/" -i ./build.sql
+
+  # Ajout login & mdp utlisateur application dans le script build.sql
+  sed -e "s/'mydb'/'$bddUserName'/" -i ./build.sql
+  sed -e "s/'mydb1'/'$bddUserPass'/" -i ./build.sql
 # Seulement pour IRAP
 if  [ $INSTALL_DATA_IRAP -eq 1 ] ; then
@@ -287,9 +305,7 @@ if  [ $INSTALL_DATA_IRAP -eq 1 ] ; then
 fi
 rep=" "
-##echo "Caracteristation des users"
 echo "Maintenant, nous allons definir l utilisateur qui sera superadministrateur de l application, ca peut etre VOUS :"
-##if  [ $LDAP = "Oui" ] || [ -z $rep ] || [ $rep = "N" ] || [ $rep = "n" ] || [ $rep = "Non" ]  || [ $rep = "non" ]  || [ $rep = "NON" ]; then
     cat ./Insert_Users.sql >> ./build.sql 
     echo "- Entrez ses (vos) Nom et Prenom (sous forme : Nom Prenom ) :"
     read UserName UserPrenom
@@ -301,13 +317,10 @@ echo &quot;Maintenant, nous allons definir l utilisateur qui sera superadministrateur
     fi
     echo "- Entrez son (votre) email :"
     read mel
-    #sed -i "s/Nom/$UserName/" ./build.sql
     sed -e "s/Nom/$UserName/" -i ./build.sql
     sed -e "s/Prenom/$UserPrenom/" -i ./build.sql
     sed -e "s/userlogin/$login/" -i ./build.sql
     sed -e "s/'__@__'/'$mel'/" -i ./build.sql
-    #sed -e "s/mydb/$bddName/" -i ./build.sql
-##fi
 if  [ $LDAP != "Oui" ]; then
 	echo "Voulez-vous installer quelques utilisateurs supplementaires dans la base de donnees (vous pourrez ensuite changer leur nom dans l'application, ou meme les supprimer ; par defaut, Oui): Oui/Non ?"
@@ -315,26 +328,14 @@ if  [ $LDAP != &quot;Oui&quot; ]; then
     	if  [ -z $rep ] || [ $rep = "O" ] || [ $rep = "o" ] || [ $rep = "Oui" ]  || [ $rep = "oui" ]  || [ $rep = "OUI" ]; then
     		echo "Ajout de quelques utilisateurs supplementaires dans la base"
     		cat ./Insert_FakeUsers.sql >> ./build.sql
-    		#sed -e "s/mydb/$bddName/" -i ./build.sql
 	fi
 fi
-    #sed -e "s/mydb/$bddName/" -i ./build.sql
-
-#cd ..
-echo
-#if [ $SQL = "Oui" ]; then
-#if [ $BDD = "Oui" ]; then
-    #sed -i "s/mydb/$bddName/" ./database/build.sql
-    #sed -e "s/mydb/$bddName/" -i ./database/build.sql
     sed -e "s/mydb/$bddName/" -i ./build.sql
     echo "Creation base de donnees (Attention, votre serveur de BD doit etre demarre)"
-    ##mysql --user=$bddUserName --password=$bddPassword -h $bddIp $bddName < ./database/build.sql
-    #mysql --user=$bddAdminName --password=$bddAdminPass -h $bddIp < ./database/build.sql
     mysql --user=$bddAdminName --password=$bddAdminPass -h $bddIp < ./build.sql
     echo "Base creee (a verifier)"
-#fi
 cd ../
@@ -355,14 +356,13 @@ echo &quot;Si vous voulez le conserver, le script de creation de la BD est database/b
 echo
 echo "MAINTENANT :"
 echo "1) Verifiez que la BD d'inventaire ($bddName) a bien ete cree (avec phpmyadmin par exemple)"
-echo "2) Verifiez le contenu de votre fichier de configuration de la BD (cakephp/app/Config/database.php)"
+echo "2) Allez sur l'application, vous devriez arriver par défaut sur un mode install vous donnant des informations sur la configuration de votre application, vérifiez que tout les points soit validé, sinon rajouter les extensions manquantes..."
 echo "3) Testez l'accès à l'application par le web"
-echo "Pour cela, suivez la suite des instructions qui sont dans le fichier INSTALLATION.txt (à la racine du projet), que vous avez normalement deja commence a lire."
+echo "Pour aller sur l'application, suivez la suite des instructions qui sont dans le fichier INSTALLATION.txt (à la racine du projet), que vous avez normalement deja commence a lire."
 echo
 echo "N'oubliez pas 3 choses importantes (voir la doc INSTALLATION.txt pour plus de details) :"
 echo "1) Passer en mode LDAP (si vous le souhaitez et si ca n'est pas deja fait)"
 echo "2) Personnaliser les 2 fichiers logos suivants dans webroot/img/ :"
 echo "- logo_entity.jpg : le logo du laboratoire"
 echo "- logo_software.jpg : le logo du logiciel"
-echo "3) Personnaliser le logiciel pour votre entite (laboratoire) (via le fichier de configuration config/app.php"
-echo
+echo "3) Personnaliser le logiciel pour votre entite (laboratoire) (via le menu de configuration dans la section outils de l'application)"
@@ -16,6 +16,7 @@ namespace App\Controller;
 use Cake\Controller\Controller;
 use Cake\Event\Event;
+use Cake\ORM\TableRegistry;
 /**
  * Application Controller
@@ -104,5 +105,8 @@ class AppController extends Controller
             $this->set('_serialize', true);
         }
         $this->set('username', $this->Auth->user('username'));
+        
+        $configuration = TableRegistry::get('Configurations')->find()->where(['id =' => 1])->first();
+        $this->set('configuration', $configuration);
     }
 }
@@ -0,0 +1,120 @@
+<?php
+namespace App\Controller;
+
+use App\Controller\AppController;
+
+/**
+ * Configurations Controller
+ *
+ * @property \App\Model\Table\ConfigurationsTable $Configurations
+ */
+class ConfigurationsController extends AppController
+{
+    /**
+     * View method
+     *
+     * @param string|null $id Configuration id.
+     * @return \Cake\Network\Response|null
+     * @throws \Cake\Datasource\Exception\RecordNotFoundException When record not found.
+     */
+    public function view($id = null)
+    {
+        $configuration = $this->Configurations->get($id, [
+            'contain' => []
+        ]);
+
+        $this->set('configuration', $configuration);
+        $this->set('_serialize', ['configuration']);
+    }
+
+
+    /**
+     * Edit method
+     *
+     * @param string|null $id Configuration id.
+     * @return \Cake\Network\Response|void Redirects on successful edit, renders view otherwise.
+     * @throws \Cake\Network\Exception\NotFoundException When record not found.
+     */
+    public function edit($id = null)
+    {
+        $configuration = $this->Configurations->get($id, [
+            'contain' => []
+        ]);
+        if ($this->request->is(['patch', 'post', 'put'])) {
+            $configuration = $this->Configurations->patchEntity($configuration, $this->request->data);
+            if ($this->Configurations->save($configuration)) {
+                $this->Flash->success(__('La configuration a bien été sauvegardé.'));
+                return $this->redirect(['action' => 'view', $id]);
+            } else {
+                $this->Flash->error(__('La configuration n\'a pas pu être sauvegardé.'));
+            }
+        }
+        $this->set(compact('configuration'));
+        $this->set('_serialize', ['configuration']);
+        
+    }
+
+    
+    /**
+     * Activate debug mode
+     *
+     * @return \Cake\Network\Response|NULL
+     */
+    public function debugOn() {
+    	$config = $this->Configurations->get('1')->set('mode_debug', 1);
+    
+    	if ($this->Configurations->save($config)) {
+    		$this->Flash->success(__('Le mode debug a bien été démarrer.'));
+    	}
+    
+    	return $this->redirect(['controller' => 'pages', 'action' => 'tools']);
+    }
+    
+    /**
+     * Desactivate debug mode
+     *
+     * @return \Cake\Network\Response|NULL
+     */
+    public function debugOff() {
+    	$config = $this->Configurations->get('1')->set('mode_debug', 0);
+    
+    	if ($this->Configurations->save($config)) {
+    		$this->Flash->success(__('Le mode debug a bien été arréter.'));
+    	}
+    
+    	return $this->redirect(['controller' => 'pages', 'action' => 'tools']);
+    }
+    
+    
+    /**
+     * Activate install mode
+     *
+     * @return \Cake\Network\Response|NULL
+     */
+    public function installOn() {
+    	$config = $this->Configurations->get('1')->set('mode_install', 1);
+    	 
+    	if ($this->Configurations->save($config)) {
+    		$this->Flash->success(__('Le mode install a bien été démarrer.'));
+    	}
+    	 
+    	return $this->redirect(['controller' => 'pages', 'action' => 'home']);
+    }
+    
+    /**
+     * Desactivate install mode
+     *
+     * @return \Cake\Network\Response|NULL
+     */
+    public function installOff() {
+        $config = $this->Configurations->get('1')->set('mode_install', 0);
+    	 
+    	if ($this->Configurations->save($config)) {
+    		$this->Flash->success(__('Le mode install a bien été arréter.'));
+    	}
+    
+    	return $this->redirect(['controller' => 'pages', 'action' => 'tools']);
+    }
+    
+    
+}
@@ -324,29 +324,6 @@ class MaterielsController extends AppController
     }
-    /**
-     * Activate install mode
-     * 
-     * @return \Cake\Network\Response|NULL
-     */
-    public function installOn() {
-    	//Configure::write('install',true);
-    	$this->request->session()->write('install',true);
-    	
-    	return $this->redirect(['controller' => 'pages', 'action' => 'home']);	
-    }
-    
-    /**
-     * Desactivate install mode
-     * 
-     * @return \Cake\Network\Response|NULL
-     */
-    public function installOff() {
-    	//Configure::write('install', false);
-    	$this->request->session()->write('install',false);
-
-    	return $this->redirect(['controller' => 'pages', 'action' => 'tools']);
-    }
@@ -0,0 +1,44 @@
+<?php
+namespace App\Model\Entity;
+
+use Cake\ORM\Entity;
+
+/**
+ * Configuration Entity.
+ *
+ * @property int $id
+ * @property string $nom
+ * @property bool $mode_install
+ * @property bool $mode_debug
+ * @property bool $use_ldap
+ * @property string $host_ldap
+ * @property string $port_ldap
+ * @property string $authentificationType_ldap
+ * @property string $baseDn_ldap
+ * @property string $filter_ldap
+ * @property string $labName
+ * @property string $labNameShort
+ * @property string $labPresent
+ * @property string $labUmr
+ * @property bool $hasPrinter
+ * @property string $emailGuest1
+ * @property string $emailGuest2
+ * @property string $emailGuest3
+ */
+class Configuration extends Entity
+{
+
+    /**
+     * Fields that can be mass assigned using newEntity() or patchEntity().
+     *
+     * Note that when '*' is set to true, this allows all unspecified fields to
+     * be mass assigned. For security purposes, it is advised to set '*' to false
+     * (or remove it), and explicitly make individual fields accessible as needed.
+     *
+     * @var array
+     */
+    protected $_accessible = [
+        '*' => true,
+        'id' => false,
+    ];
+}
@@ -0,0 +1,116 @@
+<?php
+namespace App\Model\Table;
+
+use App\Model\Entity\Configuration;
+use Cake\ORM\Query;
+use Cake\ORM\RulesChecker;
+use Cake\ORM\Table;
+use Cake\Validation\Validator;
+
+/**
+ * Configurations Model
+ *
+ */
+class ConfigurationsTable extends Table
+{
+
+    /**
+     * Initialize method
+     *
+     * @param array $config The configuration for the Table.
+     * @return void
+     */
+    public function initialize(array $config)
+    {
+        parent::initialize($config);
+
+        $this->table('configurations');
+        $this->displayField('id');
+        $this->primaryKey('id');
+    }
+
+    /**
+     * Default validation rules.
+     *
+     * @param \Cake\Validation\Validator $validator Validator instance.
+     * @return \Cake\Validation\Validator
+     */
+    public function validationDefault(Validator $validator)
+    {
+        $validator
+            ->integer('id')
+            ->allowEmpty('id', 'create');
+
+        $validator
+            ->requirePresence('nom', 'create')
+            ->notEmpty('nom')
+            ->add('nom', 'unique', ['rule' => 'validateUnique', 'provider' => 'table']);
+
+        $validator
+            ->boolean('mode_install')
+            ->allowEmpty('mode_install');
+
+        $validator
+            ->boolean('mode_debug')
+            ->allowEmpty('mode_debug');
+
+        $validator
+            ->boolean('use_ldap')
+            ->allowEmpty('use_ldap');
+
+        $validator
+            ->allowEmpty('host_ldap');
+
+        $validator
+            ->allowEmpty('port_ldap');
+
+        $validator
+            ->allowEmpty('authentificationType_ldap');
+
+        $validator
+            ->allowEmpty('baseDn_ldap');
+
+        $validator
+            ->allowEmpty('filter_ldap');
+
+        $validator
+            ->allowEmpty('labName');
+
+        $validator
+            ->allowEmpty('labNameShort');
+
+        $validator
+            ->allowEmpty('labPresent');
+
+        $validator
+            ->allowEmpty('labUmr');
+
+        $validator
+            ->boolean('hasPrinter')
+            ->allowEmpty('hasPrinter');
+
+        $validator
+            ->allowEmpty('emailGuest1');
+
+        $validator
+            ->allowEmpty('emailGuest2');
+
+        $validator
+            ->allowEmpty('emailGuest3');
+
+        return $validator;
+    }
+
+    /**
+     * Returns a rules checker object that will be used for validating
+     * application integrity.
+     *
+     * @param \Cake\ORM\RulesChecker $rules The rules object to be modified.
+     * @return \Cake\ORM\RulesChecker
+     */
+    public function buildRules(RulesChecker $rules)
+    {
+        $rules->add($rules->isUnique(['nom']));
+        return $rules;
+    }
+}
@@ -255,16 +255,16 @@ class MaterielsTable extends AppTable
     	// numero_laboratoire generator (QC changed this in Jan 2015)
     	if (empty($entity->get('numero_laboratoire')) && !empty($entity->get('date_acquisition'))) {
     		$year = substr($entity->get('date_acquisition'), 6, 4);
-    		$labName = 'IRAP';
-    		
+    		$labShortName = TableRegistry::get('Configurations')->find()->first()->labNameShort;
+
     		$num = TableRegistry::get('Materiels')->find('all', [
     				'fields' => ['numero_laboratoire'],
-    				'conditions' => ['Materiels.numero_laboratoire LIKE' => $labName.'-'.$year.'%'],
+    				'conditions' => ['Materiels.numero_laboratoire LIKE' => $labShortName.'-'.$year.'%'],
     				'order' => ['Materiels.numero_laboratoire DESC']
     		])->first()['numero_laboratoire'];
     		$newId = substr($num, -4)+1;
-    		$labNumber = $labName.'-'.$year.'-'.sprintf("%04d", $newId);
+    		$labNumber = $labShortName.'-'.$year.'-'.sprintf("%04d", $newId);
     		$entity->set('numero_laboratoire', $labNumber);
     	}
@@ -0,0 +1,35 @@
+
+<div class="configurations form">
+    <?= $this->Form->create($configuration) ?>
+    <fieldset>
+        <h2><i class="icon-edit"></i> Editer la configuration</h2>
+        <?php
+            echo $this->Form->input('mode_install');
+            echo $this->Form->input('mode_debug');
+            echo $this->Form->input('use_ldap', ['label' => 'Utilisation du LDAP']);
+            echo $this->Form->input('host_ldap', ['label' => 'Host du LDAP']);
+            echo $this->Form->input('port_ldap', ['label' => 'Port du LDAP']);
+            echo $this->Form->input('authentificationType_ldap', ['label' => 'Type d\'authentification du LDAP']);
+            echo $this->Form->input('baseDn_ldap', ['label' => 'Base DN du LDAP']);
+            echo $this->Form->input('filter_ldap', ['label' => 'Filtre du LDAP']);
+            echo $this->Form->input('labName', ['label' => 'Nom complet du Labo']);
+            echo $this->Form->input('labNameShort', ['label' => 'Nom court du Labo']);
+            echo $this->Form->input('labPresent', ['label' => 'Liaison présentation nom du Labo']);
+            echo $this->Form->input('labUmr', ['label' => 'UMR du Labo']);
+            echo $this->Form->input('hasPrinter', ['label' => 'Imprimante disponible']);
+            echo $this->Form->input('emailGuest1', ['label' => 'Mail guest 1']);
+            echo $this->Form->input('emailGuest2', ['label' => 'Mail guest 2']);
+            echo $this->Form->input('emailGuest3', ['label' => 'Mail guest 3']);
+        ?>
+    </fieldset>
+    <?= $this->Form->submit(__('Valider')) ?>
+    <?= $this->Form->end() ?>
+</div>
+
+
+<div class="actions">
+	<?php 
+		echo $this->element('menu');
+		echo $this->element('menu_form', [ 'pluralHumanName' => 'Configuration générale' ]);
+	?>
+</div>
 \ No newline at end of file
@@ -0,0 +1,68 @@
+<?php 
+function displayElement($nom, $valeur) {
+		echo '<tr><td><strong>'.$nom.' </strong></td><td>'.$valeur.'</td></tr>';
+}
+?>
+
+<div class="configurations view">
+    <h2>Configuration générale de l'application</h2>
+    <table style="margin-bottom: 30px;">
+    
+    <?php 
+    echo $this->Html->link(__('<i class="icon-pencil"></i> Editer la configuration'),
+    		['action' => 'edit', $configuration->id],
+    		['escape' => false,'onclick' => 'return true;']
+    		);
+    
+    if(h($configuration->mode_install) == 1) {
+    	$install="Oui";
+    }else {
+    	$install="Non";
+    }
+    displayElement(__('Mode install'), $install);
+    
+    if(h($configuration->mode_debug) == 1) {
+    	$debug="Oui";
+    }else {
+    	$debug="Non";
+    }
+    displayElement(__('Mode debug'), $debug);
+    
+    if(h($configuration->use_ldap) == 1) {
+    	$ldap="Oui";
+    }else {
+    	$ldap="Non";
+    }
+    displayElement(__('Utilisation du LDAP'), $ldap);
+    
+    displayElement(__('Host du LDAP'), h($configuration->host_ldap));
+    displayElement(__('Port du LDAP'), h($configuration->port_ldap));
+    displayElement(__('Type d\'authentification du LDAP'), h($configuration->authentificationType_ldap));
+    displayElement(__('Base DN du LDAP'), h($configuration->baseDn_ldap));
+    displayElement(__('Filtre du LDAP'), h($configuration->filter_ldap));
+    
+    displayElement(__('Nom complet du Labo'), h($configuration->labName));
+    displayElement(__('Nom court du Labo'), h($configuration->labNameShort));
+    displayElement(__('Liaison présentation nom du Labo'), h($configuration->labPresent));
+    displayElement(__('UMR du Labo'), h($configuration->labUmr));
+
+    if(h($configuration->hasPrinter) == 1) {
+    	$print="Oui";
+    }else {
+    	$print="Non";
+    }
+    displayElement(__('Imprimante disponible'), $print);
+    
+    displayElement(__('Mail guest 1'), h($configuration->emailGuest1));
+    displayElement(__('Mail guest 2'), h($configuration->emailGuest2));
+    displayElement(__('Mail guest 3'), h($configuration->emailGuest3));
+    
+    ?>
+        
+        
+    </table>
+</div>
+
+   <div class="actions">
+		<?php echo $this->element('menu') ?>
+		</div>
@@ -93,7 +93,7 @@ $cakeDescription = &#39;Labinvent 2.0&#39;;
 					</i></td>
 					<td id="version">
 						<!-- VERSION M.m.f.b (version (M)ajeure, version (m)ineure, numero de nouvelle (f)onctionnalite, numero de (b)ugfix) -->
-						<font color="black">VERSION 2.0.3.1 (08/05/2016)</font>
+						<font color="black">VERSION 2.0.5.1 (09/05/2016)</font>
 					</td>
 				</tr>
 			</table>
@@ -40,8 +40,8 @@
         echo $this->Form->input('date_reception', ['type' => 'text', 'label' => 'Date de réception', 'class' => 'datepicker', 'placeholder' => 'A éditer lors de la réception uniquement.', 'empty' => true]);
         echo $this->Form->input('numero_serie', ['label' => 'Numéro de série']);
-        echo $this->Form->input('groupes_thematique_id', ['label' => 'Groupe thématique', 'options' => $groupesThematiques]);
-        echo $this->Form->input('groupes_metier_id', ['label' => 'Groupe métier', 'options' => $groupesMetiers]);
+        echo $this->Form->input('groupes_thematique_id', ['label' => 'Groupe thématique', 'empty' => 'Choisir un groupe thématique', 'options' => $groupesThematiques]);
+        echo $this->Form->input('groupes_metier_id', ['label' => 'Groupe métier', 'empty' => 'Choisir un groupe métier', 'options' => $groupesMetiers]);
         echo $this->Form->input('nom_responsable', [
         		'label' => 'Nom du responsable',
@@ -150,10 +150,12 @@ if (IS_VALIDATED)
         ]);
         echo $this->Form->input('groupes_thematique_id', [
         		'label' => 'Groupe thématique', 
+        		'empty' => 'Choisir un groupe thématique',
         		'disabled' => isReadonlyField('groupes_thematique_id', $myReadonlyFields),
         		'options' => $groupesThematiques]);
         echo $this->Form->input('groupes_metier_id', [
         		'label' => 'Groupe métier', 
+        		'empty' => 'Choisir un groupe métier',
         		'disabled' => isReadonlyField('groupes_metier_id', $myReadonlyFields),
         		'options' => $groupesMetiers]);
@@ -3,7 +3,7 @@
 use Cake\Core\Configure;
 //if (Configure::read('debug')) {
-if ($this->request->session()->read('install')) {
+if ($configuration->mode_install) {
 	include("home_install.ctp");
 }
 else {
@@ -2,7 +2,7 @@
 <div class="index">
 	<h2><i class="icon-home"></i> Accueil</h2>
-<p>Bienvenue sur l'inventaire administratif et technique de l'<b>IRAP</b>.</p>
+<p>Bienvenue sur l'inventaire administratif et technique <?= $configuration->labPresent.' <b>'.$configuration->labName ?></b>.</p>
 	<?php
 			//Utilisateur connecté
@@ -40,7 +40,7 @@ $this-&gt;layout = false;
     <div id="content">
         <div class="row">
             <div class="columns large-12 ctp-warning checks", style="text-align: center">
-              <?php echo $this->Form->postLink("Stop Install mode", ['controller' => 'materiels', 'action'=>'installOff'], ['confirm' => __('Êtes-vous sur ?')]); ?>
+              <?php echo $this->Form->postLink("Stop Install mode", ['controller' => 'configurations', 'action'=>'installOff'], ['confirm' => __('Êtes-vous sur ?')]); ?>
             </div>
             <?php Debugger::checkSecurityKeys(); ?>
             <div id="url-rewriting-warning" class="columns large-12 url-rewriting checks">
@@ -19,7 +19,7 @@
 			echo '</td></tr>';
 			echo '<tr><td>';
-			echo $this->Html->link('Configuration  générale de l\'application', ['controller' => 'configuration', 'action' => 'view', 0]);
+			echo $this->Html->link('Configuration  générale de l\'application', ['controller' => 'configurations', 'action' => 'view', 1]);
 			echo '</td></tr>';
 			echo '<tr><td>';
@@ -38,11 +38,23 @@
 			 * Mode debug
 			 */
 			echo '<tr><td>';
-			if ($this->request->session()->read('install')) {
-				echo $this->Form->postLink("Stopper le mode INSTALL", ['controller' => 'materiels', 'action'=>'installOff'], ['confirm' => __('Êtes-vous sur ?')]);
+			if ($configuration->mode_debug) {
+				echo $this->Form->postLink("Stopper le mode DEBUG", ['controller' => 'configurations', 'action'=>'debugOff'], ['confirm' => __('Êtes-vous sur ?')]);
 			}
 			else {
-				echo $this->Form->postLink("Passer en mode INSTALL", ['controller' => 'materiels', 'action'=>'installOn'], ['confirm' => __('Êtes-vous sur ?')]);
+				echo $this->Form->postLink("Passer en mode DEBUG", ['controller' => 'configurations', 'action'=>'debugOn'], ['confirm' => __('Êtes-vous sur ?')]);
+			}
+			echo '</td></tr>';
+			
+			/*
+			 * Mode install
+			 */
+			echo '<tr><td>';
+			if ($configuration->mode_install) {
+				echo $this->Form->postLink("Stopper le mode INSTALL", ['controller' => 'configurations', 'action'=>'installOff'], ['confirm' => __('Êtes-vous sur ?')]);
+			}
+			else {
+				echo $this->Form->postLink("Passer en mode INSTALL", ['controller' => 'configurations', 'action'=>'installOn'], ['confirm' => __('Êtes-vous sur ?')]);
 			}
 			echo '</td></tr>';
@@ -0,0 +1,76 @@
+<?php
+namespace App\Test\Fixture;
+
+use Cake\TestSuite\Fixture\TestFixture;
+
+/**
+ * ConfigurationsFixture
+ *
+ */
+class ConfigurationsFixture extends TestFixture
+{
+
+    /**
+     * Fields
+     *
+     * @var array
+     */
+    // @codingStandardsIgnoreStart
+    public $fields = [
+        'id' => ['type' => 'integer', 'length' => 11, 'unsigned' => false, 'null' => false, 'default' => null, 'comment' => '', 'autoIncrement' => true, 'precision' => null],
+        'nom' => ['type' => 'string', 'length' => 45, 'null' => false, 'default' => null, 'comment' => 'obligatoire (et unique)', 'precision' => null, 'fixed' => null],
+        'mode_install' => ['type' => 'boolean', 'length' => null, 'null' => true, 'default' => null, 'comment' => '', 'precision' => null],
+        'mode_debug' => ['type' => 'boolean', 'length' => null, 'null' => true, 'default' => null, 'comment' => '', 'precision' => null],
+        'use_ldap' => ['type' => 'boolean', 'length' => null, 'null' => true, 'default' => null, 'comment' => '', 'precision' => null],
+        'host_ldap' => ['type' => 'string', 'length' => 30, 'null' => true, 'default' => null, 'comment' => '', 'precision' => null, 'fixed' => null],
+        'port_ldap' => ['type' => 'string', 'length' => 10, 'null' => true, 'default' => null, 'comment' => '', 'precision' => null, 'fixed' => null],
+        'authentificationType_ldap' => ['type' => 'string', 'length' => 30, 'null' => true, 'default' => null, 'comment' => '', 'precision' => null, 'fixed' => null],
+        'baseDn_ldap' => ['type' => 'string', 'length' => 30, 'null' => true, 'default' => null, 'comment' => '', 'precision' => null, 'fixed' => null],
+        'filter_ldap' => ['type' => 'string', 'length' => 30, 'null' => true, 'default' => null, 'comment' => '', 'precision' => null, 'fixed' => null],
+        'labName' => ['type' => 'string', 'length' => 30, 'null' => true, 'default' => null, 'comment' => '', 'precision' => null, 'fixed' => null],
+        'labNameShort' => ['type' => 'string', 'length' => 20, 'null' => true, 'default' => null, 'comment' => '', 'precision' => null, 'fixed' => null],
+        'labPresent' => ['type' => 'string', 'length' => 10, 'null' => true, 'default' => null, 'comment' => '', 'precision' => null, 'fixed' => null],
+        'labUmr' => ['type' => 'string', 'length' => 30, 'null' => true, 'default' => null, 'comment' => '', 'precision' => null, 'fixed' => null],
+        'hasPrinter' => ['type' => 'boolean', 'length' => null, 'null' => true, 'default' => null, 'comment' => '', 'precision' => null],
+        'emailGuest1' => ['type' => 'string', 'length' => 45, 'null' => true, 'default' => null, 'comment' => '', 'precision' => null, 'fixed' => null],
+        'emailGuest2' => ['type' => 'string', 'length' => 45, 'null' => true, 'default' => null, 'comment' => '', 'precision' => null, 'fixed' => null],
+        'emailGuest3' => ['type' => 'string', 'length' => 45, 'null' => true, 'default' => null, 'comment' => '', 'precision' => null, 'fixed' => null],
+        '_constraints' => [
+            'primary' => ['type' => 'primary', 'columns' => ['id'], 'length' => []],
+            'nom_UNIQUE' => ['type' => 'unique', 'columns' => ['nom'], 'length' => []],
+        ],
+        '_options' => [
+            'engine' => 'InnoDB',
+            'collation' => 'latin1_swedish_ci'
+        ],
+    ];
+    // @codingStandardsIgnoreEnd
+
+    /**
+     * Records
+     *
+     * @var array
+     */
+    public $records = [
+        [
+            'id' => 1,
+            'nom' => 'Lorem ipsum dolor sit amet',
+            'mode_install' => 1,
+            'mode_debug' => 1,
+            'use_ldap' => 1,
+            'host_ldap' => 'Lorem ipsum dolor sit amet',
+            'port_ldap' => 'Lorem ip',
+            'authentificationType_ldap' => 'Lorem ipsum dolor sit amet',
+            'baseDn_ldap' => 'Lorem ipsum dolor sit amet',
+            'filter_ldap' => 'Lorem ipsum dolor sit amet',
+            'labName' => 'Lorem ipsum dolor sit amet',
+            'labNameShort' => 'Lorem ipsum dolor ',
+            'labPresent' => 'Lorem ip',
+            'labUmr' => 'Lorem ipsum dolor sit amet',
+            'hasPrinter' => 1,
+            'emailGuest1' => 'Lorem ipsum dolor sit amet',
+            'emailGuest2' => 'Lorem ipsum dolor sit amet',
+            'emailGuest3' => 'Lorem ipsum dolor sit amet'
+        ],
+    ];
+}
@@ -1,56 +0,0 @@
-<?php
-namespace App\Test\Fixture;
-
-use Cake\TestSuite\Fixture\TestFixture;
-
-/**
- * UtilisateursFixture
- *
- */
-class UtilisateursFixture extends TestFixture
-{
-
-    /**
-     * Fields
-     *
-     * @var array
-     */
-    // @codingStandardsIgnoreStart
-    public $fields = [
-        'id' => ['type' => 'integer', 'length' => 11, 'unsigned' => false, 'null' => false, 'default' => null, 'comment' => '', 'autoIncrement' => true, 'precision' => null],
-        'nom' => ['type' => 'string', 'length' => 45, 'null' => true, 'default' => null, 'comment' => '', 'precision' => null, 'fixed' => null],
-        'login' => ['type' => 'string', 'length' => 45, 'null' => true, 'default' => null, 'comment' => '', 'precision' => null, 'fixed' => null],
-        'email' => ['type' => 'string', 'length' => 45, 'null' => true, 'default' => null, 'comment' => '', 'precision' => null, 'fixed' => null],
-        'role' => ['type' => 'string', 'length' => 45, 'null' => true, 'default' => null, 'comment' => '', 'precision' => null, 'fixed' => null],
-        'groupes_metier_id' => ['type' => 'integer', 'length' => 11, 'unsigned' => false, 'null' => true, 'default' => null, 'comment' => '', 'precision' => null, 'autoIncrement' => null],
-        '_indexes' => [
-            'fk_utilisateurs_groupes_travails1' => ['type' => 'index', 'columns' => ['groupes_metier_id'], 'length' => []],
-        ],
-        '_constraints' => [
-            'primary' => ['type' => 'primary', 'columns' => ['id'], 'length' => []],
-            'login_UNIQUE' => ['type' => 'unique', 'columns' => ['login'], 'length' => []],
-            'fk_utilisateurs_groupes_travails1' => ['type' => 'foreign', 'columns' => ['groupes_metier_id'], 'references' => ['groupes_metiers', 'id'], 'update' => 'noAction', 'delete' => 'noAction', 'length' => []],
-        ],
-        '_options' => [
-            'engine' => 'InnoDB',
-            'collation' => 'latin1_swedish_ci'
-        ],
-    ];
-    // @codingStandardsIgnoreEnd
-
-    /**
-     * Records
-     *
-     * @var array
-     */
-    public $records = [
-        [
-            'id' => 1,
-            'nom' => 'Lorem ipsum dolor sit amet',
-            'login' => 'Lorem ipsum dolor sit amet',
-            'email' => 'Lorem ipsum dolor sit amet',
-            'role' => 'Lorem ipsum dolor sit amet',
-            'groupes_metier_id' => 1
-        ],
-    ];
-}
 <?php
 namespace App\Test\TestCase\Controller;
-use App\Controller\UtilisateursController;
+use App\Controller\ConfigurationsController;
 use Cake\TestSuite\IntegrationTestCase;
 /**
- * App\Controller\UtilisateursController Test Case
+ * App\Controller\ConfigurationsController Test Case
  */
-class UtilisateursControllerTest extends IntegrationTestCase
+class ConfigurationsControllerTest extends IntegrationTestCase
 {
     /**
@@ -16,9 +16,7 @@ class UtilisateursControllerTest extends IntegrationTestCase
      * @var array
      */
     public $fixtures = [
-        'app.utilisateurs',
-        'app.groupes_metiers',
-        'app.materiels'
+        'app.configurations'
     ];
     /**
 <?php
 namespace App\Test\TestCase\Model\Table;
-use App\Model\Table\UtilisateursTable;
+use App\Model\Table\ConfigurationsTable;
 use Cake\ORM\TableRegistry;
 use Cake\TestSuite\TestCase;
 /**
- * App\Model\Table\UtilisateursTable Test Case
+ * App\Model\Table\ConfigurationsTable Test Case
  */
-class UtilisateursTableTest extends TestCase
+class ConfigurationsTableTest extends TestCase
 {
     /**
      * Test subject
      *
-     * @var \App\Model\Table\UtilisateursTable
+     * @var \App\Model\Table\ConfigurationsTable
      */
-    public $Utilisateurs;
+    public $Configurations;
     /**
      * Fixtures
@@ -24,9 +24,7 @@ class UtilisateursTableTest extends TestCase
      * @var array
      */
     public $fixtures = [
-        'app.utilisateurs',
-        'app.groupes_metiers',
-        'app.materiels'
+        'app.configurations'
     ];
     /**
@@ -37,8 +35,8 @@ class UtilisateursTableTest extends TestCase
     public function setUp()
     {
         parent::setUp();
-        $config = TableRegistry::exists('Utilisateurs') ? [] : ['className' => 'App\Model\Table\UtilisateursTable'];
-        $this->Utilisateurs = TableRegistry::get('Utilisateurs', $config);
+        $config = TableRegistry::exists('Configurations') ? [] : ['className' => 'App\Model\Table\ConfigurationsTable'];
+        $this->Configurations = TableRegistry::get('Configurations', $config);
     }
     /**
@@ -48,7 +46,7 @@ class UtilisateursTableTest extends TestCase
      */
     public function tearDown()
     {
-        unset($this->Utilisateurs);
+        unset($this->Configurations);
         parent::tearDown();
     }