From c8880183982c84c8bd04a43ebd2c483ca1d42deb Mon Sep 17 00:00:00 2001
From: ktalbi <khaled_talbi@hotmail.com>
Date: Tue, 30 Aug 2016 15:27:33 +0200
Subject: [PATCH 01/30] traduction: reconciliation demo/master

in progress
---
 Front/app/base/header/tpl-header.html         |  2 +-
 Front/app/base/home/tpl/tpl-graph.html        |  4 +-
 Front/app/base/home/tpl/tpl-home.html         |  6 +--
 Front/app/locales/en/translation.json         | 37 +++++++++++++++++--
 Front/app/locales/fr/translation.json         | 36 ++++++++++++++++--
 .../modules/importFile/gpx/lyt-step1-gpx.js   |  1 +
 .../modules/importFile/gpx/lyt-step2-gpx.js   |  1 +
 .../gpx/templates/tpl-step2-gpx.html          |  9 +++--
 Front/app/modules/importFile/lyt-step0.js     |  3 +-
 Front/app/modules/importFile/tpl-step0.html   |  8 ++--
 .../sensors/templates/tpl-sensors.html        | 12 +++---
 .../stations/layouts/lyt-station-detail.js    |  3 +-
 .../stations/layouts/lyt-station-new.js       |  1 +
 .../modules/stations/layouts/lyt-stations.js  |  1 +
 .../stations/templates/tpl-station-new.html   |  8 ++--
 .../stations/templates/tpl-stations.html      | 20 +++++-----
 16 files changed, 108 insertions(+), 44 deletions(-)

diff --git a/Front/app/base/header/tpl-header.html b/Front/app/base/header/tpl-header.html
index 95c2b0499..9b94c3c93 100644
--- a/Front/app/base/header/tpl-header.html
+++ b/Front/app/base/header/tpl-header.html
@@ -40,7 +40,7 @@
 			</li>
 			<li>
 				<a id="logout"> 
-					logout&nbsp;
+					<span data-i18n="button.logout">logout</span>&nbsp;
 					<i class="glyphicon glyphicon-log-out"></i>
 				</a>
 			</li>
diff --git a/Front/app/base/home/tpl/tpl-graph.html b/Front/app/base/home/tpl/tpl-graph.html
index 14ea85124..ff98efc48 100644
--- a/Front/app/base/home/tpl/tpl-graph.html
+++ b/Front/app/base/home/tpl/tpl-graph.html
@@ -1,3 +1,3 @@
 
-    <h3>Number of new stations</h3>
-    <canvas id="canvasGraph" height="250" width="500" class='center-block hidden-xs'></canvas>
\ No newline at end of file
+    <h3 data-i18n="home.graph-label">Number of new stations</h3>
+    <canvas id="canvasGraph" height="250" width="500" class='center-block hidden-xs'></canvas>
diff --git a/Front/app/base/home/tpl/tpl-home.html b/Front/app/base/home/tpl/tpl-home.html
index 5a27f3315..1730867aa 100644
--- a/Front/app/base/home/tpl/tpl-home.html
+++ b/Front/app/base/home/tpl/tpl-home.html
@@ -1,5 +1,5 @@
 <div class="container">
-	<div class="mid-height clearfix hidden-xs hidden-sm">
+	<div class="mid-height clearfix hidden-xs hidden-sm hidden-md">
 		<div class="col-lg-6">
 			<br>
 			<div id="info" class="col-lg-12 col-lg-offset-0" style = "text-align:center;">
@@ -29,7 +29,7 @@
 				<a href="#stations/new" class="tile small_tile last tile-pumpkin">
 					<p>
 						<i class="reneco reneco-entrykey "></i> 
-						<span>New station</span>
+						<span data-i18n="tiles.new-station">New station</span>
 					</p>
 				</a>
 
@@ -93,7 +93,7 @@
 				<a href="#sensors" class="tile small_tile first tile-green">
 					<p>
 						<i class="reneco reneco-sensors"></i>
-						<span>Sensors</span>
+						<span data-i18n="tiles.sensors">Sensors</span>
 					</p>
 				</a>
 
diff --git a/Front/app/locales/en/translation.json b/Front/app/locales/en/translation.json
index 3208ef573..6d020e9e8 100644
--- a/Front/app/locales/en/translation.json
+++ b/Front/app/locales/en/translation.json
@@ -9,7 +9,10 @@
 		"validation" : "Validate",
 		"data" : "My data",
 		"stations" : "Stations",
-		"objects" : "Objects"
+		"objects" : "Objects",
+		"new-station" :"New station",
+		"sensors" :"Sensors",
+		"release" :"Release"
 	},
 	"header" : {
 
@@ -30,7 +33,11 @@
 		"delete" : "Delete",
 		"addObserver" : "Add an observer",
 		"removeObserver" : "Remove an observer",
-		"geolocation" : "Get current position"
+		"geolocation" : "Get current position",
+		"grid" :"grid",
+		"map" : "map",
+		"logout" : "logout",
+		"back" : "Back"
 
 	},
 	"shared" : {
@@ -117,7 +124,29 @@
 		"ImportingDataAlert" : "Importing data",
 		"loadingDataAlert" : "Loading data error",
 		"importingDataWarning" : "Selected waypoint(s) are already imported",
-		"importServerError" : "Error sending gpx data to the server."
-	}
+		"importServerError" : "Error sending gpx data to the server.",
+		"gpx" :"gpx file",
+		"rfid" : "rfid file",
+		"gsm" : "gsm files",
+		"argos" : "argos files",
+		"label-selected" :"selected data"
+	},
+	"home" : {
+		"hello" : "Hello",
+		"graph-label" : "Number of new stations"
+	},
+	"stations" : {
+			"search" :"Search",
+			"all-tab" : "All stations",
+			"imported-tab" : "Imported stations",
+			"coords-tab" : "With coordinates",
+			"no-coords-tab" : "Without coordinates",
+			"total-label" : "Stations total :",
+			"new-station-btn" :"New station",
+			"export-btn" :"Export data"
+	},
+	"sensors" : {
+			"new" : "New sensor"
+ 	}
 
 }
diff --git a/Front/app/locales/fr/translation.json b/Front/app/locales/fr/translation.json
index bf7d9b9bf..ed598b628 100644
--- a/Front/app/locales/fr/translation.json
+++ b/Front/app/locales/fr/translation.json
@@ -9,7 +9,10 @@
 		"validation" : "Validation",
 		"data" : "Mes données",
 		"stations" : "Stations",
-		"objects" : "Objets"
+		"objects" : "Objets",
+		"new-station" :"Nouvelle station",
+		"sensors" :"Capteurs",
+		"release" :"Relaché"
 	},
 	"stepper" : {
 			"btnNext" : "Suivant",
@@ -26,7 +29,12 @@
 		"delete" : "Supprimer",
 		"addObserver" : "Ajouter un observateur",
 		"removeObserver" : "Enlever un observateur",
-		"geolocation" : "Position courante"
+		"geolocation" : "Position courante",
+		"grid" :"grille",
+		"map" : "carte",
+		"logout" : "Se déconnecter",
+		"export" :"Exporter",
+		"back" : "Retour"
 	},
 	"shared" : {
 		"fieldworker" : "Observateur",
@@ -113,6 +121,28 @@
 		"importingDataWarning" : "Les points sélectionnés sont déjà importés",
 		"importServerError" : "Erreur de transfert de données vers le serveur.",
 		"fieldWorkerNameErr" : "Erreur de nom",
-		"fieldWorkerNameErrMsg" : "Ce nom est déjà sélectionné. Merci de choisir un autre nom."
+		"fieldWorkerNameErrMsg" : "Ce nom est déjà sélectionné. Merci de choisir un autre nom.",
+		"gpx" :"fichier gpx",
+		"rfid" : "fichier rfid",
+		"gsm" : "fichier gsm",
+		"argos" : "fichier argos",
+		"label-selected" :"point(s) séléctionné(s)"
+
+	},
+		"home" : {
+			"hello" : "Bonjour",
+			"graph-label" : "Nombre des nouvelles stations"
+	  },
+	"stations" : {
+			"search" :"Rechercher",
+			"all-tab" : "Toutes les stations",
+			"imported-tab" : "Stations importées",
+			"coords-tab" : "Avec coordonnées",
+			"no-coords-tab" : "Sans coordonnées",
+			"total-label" : "Total :",
+			"new-station-btn" :"Nouvelle station"
+		},
+	"sensors" : {
+			"new" : "Nouveau capteur"
 	}
 }
diff --git a/Front/app/modules/importFile/gpx/lyt-step1-gpx.js b/Front/app/modules/importFile/gpx/lyt-step1-gpx.js
index 3b9da495b..b56314e55 100644
--- a/Front/app/modules/importFile/gpx/lyt-step1-gpx.js
+++ b/Front/app/modules/importFile/gpx/lyt-step1-gpx.js
@@ -56,6 +56,7 @@ define([
       $('.fieldactivity').addClass('hidden');
       this.fieldworkers = $('label[for*="FieldWorkers"]').parent();
       $(this.fieldworkers).addClass('hidden');
+      this.$el.i18n();
     },
 
     importFile: function(e) {
diff --git a/Front/app/modules/importFile/gpx/lyt-step2-gpx.js b/Front/app/modules/importFile/gpx/lyt-step2-gpx.js
index d52fcadec..5a8b5b653 100644
--- a/Front/app/modules/importFile/gpx/lyt-step2-gpx.js
+++ b/Front/app/modules/importFile/gpx/lyt-step2-gpx.js
@@ -49,6 +49,7 @@ define([
     },
 
     onShow: function() {
+      this.$el.i18n();
       this.displayGrid();
       this.displayFilters();
       this.displayMap();
diff --git a/Front/app/modules/importFile/gpx/templates/tpl-step2-gpx.html b/Front/app/modules/importFile/gpx/templates/tpl-step2-gpx.html
index ce63cdea3..326a684bb 100644
--- a/Front/app/modules/importFile/gpx/templates/tpl-step2-gpx.html
+++ b/Front/app/modules/importFile/gpx/templates/tpl-step2-gpx.html
@@ -1,18 +1,19 @@
 <did class="col-xs-12 col-md-6 full-height">
 	<br>
-	<legend>Search</legend>
+	<legend data-i18n="button.search">Search</legend>
 	<div id="filters"></div>
 	<br>
 	<div class="col-xs-12">
-	<button id="clear" class="btn btn-default pull-left">Clear</button>
-	<button id="filter" class="btn btn-success pull-right"><span class="reneco reneco-search"></span>&nbsp;Search
+	<button id="clear" class="btn btn-default pull-left" data-i18n="button.clear">Clear</button>
+	<button id="filter" class="btn btn-success pull-right"><span data-i18n="button.search">Search</span>&nbsp;
+			<span class="reneco reneco-search"></span>
 	</button>
 	</div>
 	<br>
 	<br>
 	<legend class="pull-left">Stations</legend>
 	<legend class="pull-right">
-		<span id="totalSelected" class="">0</span> selected data
+		<span id="totalSelected" class="">0</span> <span data-i18n="import.label-selected">selected data</span>
 	</legend>
 	<div id="grid"></div>
 	<div id="paginator"></div>
diff --git a/Front/app/modules/importFile/lyt-step0.js b/Front/app/modules/importFile/lyt-step0.js
index 8624c011f..5b5953de3 100644
--- a/Front/app/modules/importFile/lyt-step0.js
+++ b/Front/app/modules/importFile/lyt-step0.js
@@ -20,7 +20,7 @@ define([
       'change input': 'changeValue',
     },
 
-    name: 'File type selection',
+    name:'File type selection',
 
     initialize: function() {
 		},
@@ -28,6 +28,7 @@ define([
     onShow: function() {
       this.$el.find('.tile-inside:first input').prop('checked', true).change();
       this.$el.find('.tile-inside:first').addClass('active');
+      this.$el.i18n();
 		},
 
     validate: function() {
diff --git a/Front/app/modules/importFile/tpl-step0.html b/Front/app/modules/importFile/tpl-step0.html
index cddd304b8..2814b702b 100644
--- a/Front/app/modules/importFile/tpl-step0.html
+++ b/Front/app/modules/importFile/tpl-step0.html
@@ -7,28 +7,28 @@
 	<label for="gpx" class="tile-inside text-center">
 		<i class="icon-five reneco reneco-gpx_format "></i>
 		<br>
-		<span>GPX file</span><br>
+		<span data-i18n="import.gpx">GPX file</span><br>
 		<input name="file" id="gpx" type="radio" value="gpx">
 	</label>
 	
 	<label for="rfid" class="tile-inside text-center">
 		<i class="icon-five reneco reneco-rfid_format"></i><br>
 		<br>
-		<span>RFID file</span><br>
+		<span data-i18n="import.rfid">RFID file</span><br>
 		<input name="file" id="rfid" type="radio" value="rfid">
 	</label>
 	
 	<label for="gsm" class="js-superUser tile-inside text-center">
 		<i class="icon-five reneco reneco-gsm_format"></i><br>
 		<br>
-		<span>GSM files</span><br>
+		<span data-i18n="import.gsm">GSM files</span><br>
 		<input name="file" id="gsm" type="radio" value="gsm">
 	</label>
 
 	<label for="argos" class="js-superUser tile-inside text-center">
 		<i class="icon-five reneco reneco-argos_format"></i><br>
 		<br>
-		<span>Argos files</span><br>
+		<span data-i18n="import.argos">Argos files</span><br>
 		<input name="file" id="argos" type="radio" value="argos">
 	</label>
 </div>
diff --git a/Front/app/modules/sensors/templates/tpl-sensors.html b/Front/app/modules/sensors/templates/tpl-sensors.html
index a078b209d..734d11381 100644
--- a/Front/app/modules/sensors/templates/tpl-sensors.html
+++ b/Front/app/modules/sensors/templates/tpl-sensors.html
@@ -2,7 +2,7 @@
 <div class="clearfix full-height ">
 	<div id="sensorLeft"  class="col-xs-4 full-height no-padding">
 		<div class="toolbar top">
-			<legend>Search</legend>
+			<legend data-i18n="button.search">Search</legend>
 		</div>
 		
 		<div class="crop2">
@@ -11,8 +11,8 @@
 		</div>
 
 		<div class="toolbar bottom">
-			<button id="clear" class="btn pull-left">Clear</button>
-			<button id="btnFilter" class="btn btn-success pull-right">Search&nbsp;
+			<button id="clear" class="btn pull-left" data-i18n="button.clear">Clear</button>
++			<button id="btnFilter" class="btn btn-success pull-right"><span data-i18n="button.search">Search</span>&nbsp;
 				<span class="reneco reneco-search"></span>
 			</button>
 		</div>
@@ -20,7 +20,7 @@
 
 	<div id="sensorRight" class="col-xs-8 full-height dark no-padding">
 		<div class="toolbar top">
-			<legend class="text-right">Total sensors : <span id="totalEntries"></span></legend>
+			<legend class="text-right">Total: <span id="totalEntries"></span></legend>
 			<div class="clearfix pull-right">
 				<div id="rowSelectorSensor"  class="pull-left"></div>
 				<legend class="pull-right"> &nbsp;rows/page</legend>
@@ -36,11 +36,11 @@
 
 		<div class="toolbar bottom">
 			<button class="btn btn-success pull-left" id="btn-export">
-				Export data&nbsp;
+				<span data-i18n="button.export">Export data</span>&nbsp;
 				<span class="reneco reneco-export"></span>
 			</button>
 			<button class="js-admin btn btn-success pull-right" id="btnNew">
-				New sensor&nbsp;
+				<span data-i18n="sensors.new">New sensor</span>&nbsp;
 				<span class="reneco reneco-entrykey"></span>
 			</button>
 		</div>
diff --git a/Front/app/modules/stations/layouts/lyt-station-detail.js b/Front/app/modules/stations/layouts/lyt-station-detail.js
index ff85435cf..6826ffb58 100644
--- a/Front/app/modules/stations/layouts/lyt-station-detail.js
+++ b/Front/app/modules/stations/layouts/lyt-station-detail.js
@@ -65,8 +65,7 @@ define([
         this.display(this.model);
         //this.feedProtoList();
       }
-      //this.$el.i18n();
-      //this.translater = Translater.getTranslater();
+      this.$el.i18n();
     },
 
     reloadFromNavbar: function(model) {
diff --git a/Front/app/modules/stations/layouts/lyt-station-new.js b/Front/app/modules/stations/layouts/lyt-station-new.js
index 4a43d2977..defb771c7 100644
--- a/Front/app/modules/stations/layouts/lyt-station-new.js
+++ b/Front/app/modules/stations/layouts/lyt-station-new.js
@@ -55,6 +55,7 @@ define([
         zoom: 2,
         element: 'map',
       });
+      this.$el.i18n();
     },
 
     onDestroy: function() {
diff --git a/Front/app/modules/stations/layouts/lyt-stations.js b/Front/app/modules/stations/layouts/lyt-stations.js
index 802bcdd5c..259177ba2 100644
--- a/Front/app/modules/stations/layouts/lyt-stations.js
+++ b/Front/app/modules/stations/layouts/lyt-stations.js
@@ -104,6 +104,7 @@ define([
         }));
         this.ui.detail.removeClass('hidden');
       }
+      this.$el.i18n();
     },
 
     initGrid: function(url) {
diff --git a/Front/app/modules/stations/templates/tpl-station-new.html b/Front/app/modules/stations/templates/tpl-station-new.html
index a119abf97..764a48444 100644
--- a/Front/app/modules/stations/templates/tpl-station-new.html
+++ b/Front/app/modules/stations/templates/tpl-station-new.html
@@ -2,8 +2,8 @@
 <div id="inputStLeft"  class=" no-padding col-xs-12 col-md-7 ns-full-height">
 	<div class="toolbar top">
 	<ul class="nav nav-tabs">
-		 <li class="active tab-ele"><a href="#stWithCoords" class="tab-link">With coordinates</a></li>
-		 <li class="tab-ele"><a href="#stWithoutCoords" class="tab-link">Without coordinates</a></li>
+		 <li class="active tab-ele"><a href="#stWithCoords" class="tab-link" data-i18n="stations.coords-tab">With coordinates</a></li>
+		 <li class="tab-ele"><a href="#stWithoutCoords" class="tab-link" data-i18n="stations.no-coords-tab">Without coordinates</a></li>
 	</ul>
 	</div>
 	<div class="crop2">
@@ -17,11 +17,11 @@
 	</div>
 	<div class="toolbar bottom">
 			<button id="getCurrentPosition" class="btn btn-success pull-left">
-				Get location&nbsp;
+				<span data-i18n="button.geolocation">Get location</span>&nbsp;
 				<span class="reneco reneco-pin"></span>
 			</button>
 			<button id="save" class="btn btn-success pull-right">
-				Save&nbsp;
+				<span data-i18n="button.save">Save</span>&nbsp;
 				<span class="reneco reneco-write"></span>
 			</button>
 	</div>
diff --git a/Front/app/modules/stations/templates/tpl-stations.html b/Front/app/modules/stations/templates/tpl-stations.html
index 700f07e17..543f454bf 100644
--- a/Front/app/modules/stations/templates/tpl-stations.html
+++ b/Front/app/modules/stations/templates/tpl-stations.html
@@ -1,14 +1,14 @@
 
 <div id="leftZone"  class="col-xs-12 col-md-4 no-padding ns-full-height">
 	<div class="toolbar top">
-		<legend class="inherit">Search</legend>
+		<legend class="inherit"><span data-i18n="stations.search">Search</span></legend>
 	</div>
 
 	<div class="crop2">
 		<br>
 		<ul id="stationType" class=" nav nav-tabs grid-padding">
-			 <li class="tab-ele activeTab"><a class="tab-link" name="allSt">All stations</a></li>
-			 <li class="tab-ele "><a id="tab-impSt" class="tab-link"  name="impSt">Imported stations</a></li>
+			 <li class="tab-ele activeTab"><a class="tab-link" name="allSt" data-i18n="stations.all-tab">All stations</a></li>
+			 <li class="tab-ele "><a id="tab-impSt" class="tab-link"  name="impSt" data-i18n="stations.imported-tab">Imported stations</a></li>
 		</ul>
 		<div class="tab-content all-stations">
 			<div id="allSt" class="tab-pane fade in active tab-ele"></div>
@@ -19,9 +19,9 @@
 	</div>
 
 	<div class="toolbar bottom">
-		<button id="clear" class="pull-left btn" >Clear</button>
+		<button id="clear" class="pull-left btn" data-i18n="button.clear" >Clear</button>
 		<button id="submit" class="btn btn-success pull-right">
-			Search&nbsp;
+			<span data-i18n="button.search">Search</span>&nbsp;
 			<span class="reneco reneco-search"></span>
 		</button>
 	</div>
@@ -30,7 +30,7 @@
 <div id="rightZone" class=" no-padding col-md-8 ns-full-height dark">
 
 	<div class="toolbar top">
-		<legend class="pull-left">Stations total : <span id="totalEntries"></span></legend>
+		<legend class="pull-left"><span data-i18n="stations.total-label">Stations total :</span> <span id="totalEntries"></span></legend>
 		<div class="ctrls pull-right">
 		<div class="clearfix pull-left">
 				<div id="rowSelectorSta"  class="pull-left"></div>
@@ -38,11 +38,11 @@
 		</div>
 		<button id="activeGridPanel" class="small btn btn-labeled btn-success active ">
 			<span class="reneco reneco-sites"></span>
-			&nbsp;Grid
+			&nbsp;<span data-i18n="button.grid">Grid</span>&nbsp;<span data-i18n="button.grid">Grid</span>
 		</button>
 		<button id="activeMapPanel" class="small btn btn-labeled btn-success">
 			<span class="reneco reneco-map"></span>
-			&nbsp;Map
+			&nbsp;<span data-i18n="button.map">Map</span>
 		</button>
 		</div>
 	</div>
@@ -63,12 +63,12 @@
 
 	<div class="toolbar bottom">
 		<button class="btn btn-success pull-left" id="btn-export">
-				Export data&nbsp;
+				<span data-i18n="button.export">Export data</span>&nbsp;
 				<span class="reneco reneco-export"></span>
 		</button>
 		<a href="#stations/new" id="newStation" class="pull-right btn btn-default btn-success whitev">
 			<i class="reneco reneco-entrykey "></i>&nbsp;
-			New station
+			<span data-i18n="stations.new-station-btn">New station</span>
 		</a>
 	</div>
 

From 8bb429b5c0d720df746150695c5b8df00f9e582d Mon Sep 17 00:00:00 2001
From: ktalbi <khaled_talbi@hotmail.com>
Date: Tue, 30 Aug 2016 17:21:39 +0200
Subject: [PATCH 02/30] traduction individuals

---
 Front/app/base/header/lyt-header.js              |  1 +
 Front/app/base/home/tpl/tpl-info.html            |  2 +-
 Front/app/locales/en/translation.json            |  9 +++++++++
 Front/app/locales/fr/translation.json            | 11 ++++++++++-
 .../individuals/layouts/lyt-individuals.js       |  3 +--
 .../templates/tpl-individuals-detail.html        |  8 ++++----
 .../individuals/templates/tpl-individuals.html   | 16 ++++++++--------
 .../modules/monitoredSites/templates/tpl-ms.html |  2 +-
 .../modules/sensors/templates/tpl-sensors.html   |  4 ++--
 9 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/Front/app/base/header/lyt-header.js b/Front/app/base/header/lyt-header.js
index c6ff24639..5db6190f5 100644
--- a/Front/app/base/header/lyt-header.js
+++ b/Front/app/base/header/lyt-header.js
@@ -37,6 +37,7 @@ function($,Marionette, config, Breadcrumb) {
           _this.ui.userName.html(window.app.user.get('fullname'));
         }
       });
+      this.$el.i18n();
     },
   });
 });
diff --git a/Front/app/base/home/tpl/tpl-info.html b/Front/app/base/home/tpl/tpl-info.html
index 4cd7f4eb5..76e821a2a 100644
--- a/Front/app/base/home/tpl/tpl-info.html
+++ b/Front/app/base/home/tpl/tpl-info.html
@@ -1,5 +1,5 @@
 
-<h1 class="big"><%= nbIndiv %> individuals</h1>
+<h1 class="big"><%= nbIndiv %> <span data-i18n="shared.individuals">individuals</span></h1>
 <p class="medium fnt-normal" id="siteName"><%= siteName %></p>
 <p class="medium fnt-normal" id="date"><%= date %></p>
 
diff --git a/Front/app/locales/en/translation.json b/Front/app/locales/en/translation.json
index 6d020e9e8..1e660b07f 100644
--- a/Front/app/locales/en/translation.json
+++ b/Front/app/locales/en/translation.json
@@ -55,6 +55,8 @@
 		"accuracy" : "accuracy(m)",
 		"distanceObs" :"distance from obs",
 		"date" : "time",
+		"rows" : "rows",
+		"individuals" : "individuals",
 		"option" : {
 			"is" : "Is",
 			"isNot" : "Is not",
@@ -147,6 +149,13 @@
 	},
 	"sensors" : {
 			"new" : "New sensor"
+ 	},
+ 	"individuals" : {
+ 		"advanced " :"Advanced",
+ 		"new" :"New individual",
+ 		"history" : "Historique",
+ 		"equipment" : "Equipement",
+ 		"locations" : "Positions"
  	}
 
 }
diff --git a/Front/app/locales/fr/translation.json b/Front/app/locales/fr/translation.json
index ed598b628..5acbbb369 100644
--- a/Front/app/locales/fr/translation.json
+++ b/Front/app/locales/fr/translation.json
@@ -51,6 +51,8 @@
 		"accuracy" : "précision(m)",
 		"distanceObs" :"distance de l'observateur",
 		"date" : "date",
+		"rows" : "lignes",
+		"individuals" : "individus",
 		"option" : {
 			"is" : "est",
 			"isNot" : "n'est pas",
@@ -144,5 +146,12 @@
 		},
 	"sensors" : {
 			"new" : "Nouveau capteur"
-	}
+	},
+ 	"individuals" : {
+ 		"advanced" :"Avancé",
+ 		"new" :"Nouvel individu",
+ 		"history" : "Historique",
+ 		"equipment" : "Equipement",
+ 		"locations" : "Positions"
+ 	}
 }
diff --git a/Front/app/modules/individuals/layouts/lyt-individuals.js b/Front/app/modules/individuals/layouts/lyt-individuals.js
index de60e3b54..c23d65a3e 100644
--- a/Front/app/modules/individuals/layouts/lyt-individuals.js
+++ b/Front/app/modules/individuals/layouts/lyt-individuals.js
@@ -65,11 +65,10 @@ define([
 
     onRender: function() {
       //$('#starDate2').datetimepicker({format : "DD/MM/YYYY HH:mm:ss"});
-      this.$el.i18n();
     },
 
     onShow: function() {
-      console.log(this.$el.find('#datetimepicker2'))
+      this.$el.i18n();
       this.$el.find('#datetimepicker2').datetimepicker({format : "DD/MM/YYYY HH:mm:ss"});
       this.displayFilter();
       this.displayGrid();
diff --git a/Front/app/modules/individuals/templates/tpl-individuals-detail.html b/Front/app/modules/individuals/templates/tpl-individuals-detail.html
index d15debda2..4ba7aeda0 100644
--- a/Front/app/modules/individuals/templates/tpl-individuals-detail.html
+++ b/Front/app/modules/individuals/templates/tpl-individuals-detail.html
@@ -16,11 +16,11 @@
     <br>
     <div id = "ongletGrid">
       <ul class="nav nav-tabs">
-        <li class="active tab-ele"><a id="" href="#Site_history" class="tab-link">History</a>
+        <li class="active tab-ele"><a id="" href="#Site_history" class="tab-link"><span data-i18n="individuals.history">History</span></a>
         </li>
-        <li class="tab-ele"><a href="#Site_equipment" class="tab-link">Equipment</a>
+        <li class="tab-ele"><a href="#Site_equipment" class="tab-link"><span data-i18n="individuals.equipment">Equipment</span></a>
         </li>
-        <li class="tab-ele"><a href="#locations" class="tab-link">Locations</a>
+        <li class="tab-ele"><a href="#locations" class="tab-link"><span data-i18n="individuals.locations">Locations</span></a>
         </li>
       </ul>
     </div>
@@ -59,7 +59,7 @@
 
 <div id="mapContainer" class=" no-padding col-xs-12 col-md-7 ns-full-height">
   <div class="toolbar top dark">
-    <legend class="pull-left">Locations : <span id="totalLocations"></span></legend>
+    <legend class="pull-left"><span data-i18n="individuals.locations">Locations</span> : <span id="totalLocations"></span></legend>
   </div>
   <div class = "crop1 overflowXH full-height no-padding">
     <div id="map" >
diff --git a/Front/app/modules/individuals/templates/tpl-individuals.html b/Front/app/modules/individuals/templates/tpl-individuals.html
index 0d0fb51e9..90cfb13fc 100644
--- a/Front/app/modules/individuals/templates/tpl-individuals.html
+++ b/Front/app/modules/individuals/templates/tpl-individuals.html
@@ -1,10 +1,10 @@
 
 	<div class="col-xs-4 full-height no-padding">
 		<div class="toolbar top">
-			<legend>Search</legend>
+			<legend data-i18n="button.search">Search</legend>
 			<ul id="indivSearchTabs" class="nav nav-tabs pull-right">
                <li class="tab-ele activeTab"><a id="standardTab" class="tab-link" name="standard">Standard</a></li>
-               <li class="tab-ele"><a id="advancedTab" class="tab-link" name="advanced">Advanced</a></li>
+               <li class="tab-ele"><a id="advancedTab" class="tab-link" name="advanced"><span data-i18n="individuals.advanced">Advanced</span></a></li>
                <br>
             </ul>
 		</div>
@@ -28,8 +28,8 @@
 			<div id="filter" class="filter-no-padding filter-indiv"></div>
 		</div>
 		<div class="toolbar bottom">
-			<button id="clear" class="btn pull-left">Clear</button>
-			<button id="btnFilter" class="btn btn-success pull-right">Search&nbsp;
+			<button id="clear" class="btn pull-left" data-i18n="button.clear">Clear</button>
+			<button id="btnFilter" class="btn btn-success pull-right"><span data-i18n="button.search">Search</span>&nbsp;
 				<span class="reneco reneco-search"></span>
 			</button>
 		</div>
@@ -37,10 +37,10 @@
 
 	<div class="col-xs-8 full-height dark no-padding">
 		<div class="toolbar top">
-			<legend class="text-right">Total individuals : <span id="totalEntries"></span></legend>
+			<legend class="text-right">Total: <span id="totalEntries"></span></legend>
 			<div class="clearfix pull-right">
 				<div id="rowSelector"  class="pull-left"></div>
-				<legend class="pull-right"> &nbsp;rows/page</legend>
+				<legend class="pull-right"> &nbsp;<span data-i18n="shared.rows">rows</span>/page</legend>
 			</div>
 		</div>
 
@@ -55,11 +55,11 @@
 
 		<div class="toolbar bottom" id="toolbar">
 			<button class="btn btn-success pull-left" id="btn-export">
-				Export data&nbsp;
+				<span data-i18n="button.export">Export data</span>&nbsp;
 				<span class="reneco reneco-export"></span>
 			</button>
 			<button class="js-admin btn btn-success pull-right" id="createNew">
-				New individual&nbsp;
+				<span data-i18n="individuals.new">New individual</span>&nbsp;
 				<span class="reneco reneco-entrykey"></span>
 			</button>
 		</div>
diff --git a/Front/app/modules/monitoredSites/templates/tpl-ms.html b/Front/app/modules/monitoredSites/templates/tpl-ms.html
index 41bc797c3..7b6eae6cc 100644
--- a/Front/app/modules/monitoredSites/templates/tpl-ms.html
+++ b/Front/app/modules/monitoredSites/templates/tpl-ms.html
@@ -23,7 +23,7 @@
 			<legend class="text-right">Monitored sites total: <span id="totalEntries"></span></legend>
 			<div class="clearfix pull-right">
 				<div id="rowSelectorSite"  class="pull-left"></div>
-				<legend class="pull-right"> &nbsp;rows/page</legend>
+				<legend class="pull-right"> &nbsp;<span data-i18n="shared.rows">rows</span>/page</legend>
 			</div>
 		</div>
 		<div class="crop2 crop-paginator">
diff --git a/Front/app/modules/sensors/templates/tpl-sensors.html b/Front/app/modules/sensors/templates/tpl-sensors.html
index 734d11381..883b7b447 100644
--- a/Front/app/modules/sensors/templates/tpl-sensors.html
+++ b/Front/app/modules/sensors/templates/tpl-sensors.html
@@ -12,7 +12,7 @@
 
 		<div class="toolbar bottom">
 			<button id="clear" class="btn pull-left" data-i18n="button.clear">Clear</button>
-+			<button id="btnFilter" class="btn btn-success pull-right"><span data-i18n="button.search">Search</span>&nbsp;
+			<button id="btnFilter" class="btn btn-success pull-right"><span data-i18n="button.search">Search</span>&nbsp;
 				<span class="reneco reneco-search"></span>
 			</button>
 		</div>
@@ -23,7 +23,7 @@
 			<legend class="text-right">Total: <span id="totalEntries"></span></legend>
 			<div class="clearfix pull-right">
 				<div id="rowSelectorSensor"  class="pull-left"></div>
-				<legend class="pull-right"> &nbsp;rows/page</legend>
+				<legend class="pull-right"> &nbsp;<span data-i18n="shared.rows">rows</span>/page</legend>
 			</div>
 		</div>
 	

From 83b3efdaad1c55994dd9a9b9468c8b3a0ced1d3b Mon Sep 17 00:00:00 2001
From: ktalbi <khaled_talbi@hotmail.com>
Date: Tue, 30 Aug 2016 17:22:19 +0200
Subject: [PATCH 03/30] fix grid label duplicated

---
 Front/app/modules/stations/templates/tpl-stations.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Front/app/modules/stations/templates/tpl-stations.html b/Front/app/modules/stations/templates/tpl-stations.html
index 543f454bf..3e0c017e6 100644
--- a/Front/app/modules/stations/templates/tpl-stations.html
+++ b/Front/app/modules/stations/templates/tpl-stations.html
@@ -34,11 +34,11 @@
 		<div class="ctrls pull-right">
 		<div class="clearfix pull-left">
 				<div id="rowSelectorSta"  class="pull-left"></div>
-				<legend class="pull-right"> &nbsp;rows/page</legend>
+				<legend class="pull-right"> &nbsp;<span data-i18n="shared.rows">rows</span>/page</legend>
 		</div>
 		<button id="activeGridPanel" class="small btn btn-labeled btn-success active ">
 			<span class="reneco reneco-sites"></span>
-			&nbsp;<span data-i18n="button.grid">Grid</span>&nbsp;<span data-i18n="button.grid">Grid</span>
+			&nbsp;<span data-i18n="button.grid">Grid</span>
 		</button>
 		<button id="activeMapPanel" class="small btn btn-labeled btn-success">
 			<span class="reneco reneco-map"></span>

From ddf1d5be6583809d2ab7020d61df76490e1cc77a Mon Sep 17 00:00:00 2001
From: ktalbi <khaled_talbi@hotmail.com>
Date: Wed, 31 Aug 2016 11:44:24 +0200
Subject: [PATCH 04/30] export traduction

---
 Front/app/locales/en/translation.json                | 12 +++++++++++-
 Front/app/locales/fr/translation.json                | 12 +++++++++++-
 Front/app/modules/export/lyt-export-step1.js         |  1 +
 Front/app/modules/export/lyt-export-step2.js         |  1 +
 Front/app/modules/export/lyt-export-step3.js         |  1 +
 .../modules/export/templates/tpl-export-step1.html   |  4 ++--
 .../modules/export/templates/tpl-export-step2.html   |  4 ++--
 .../modules/export/templates/tpl-export-step3.html   | 10 +++++-----
 Front/app/modules/stations/layouts/lyt-protocol.js   |  2 +-
 9 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/Front/app/locales/en/translation.json b/Front/app/locales/en/translation.json
index 1e660b07f..a624d2627 100644
--- a/Front/app/locales/en/translation.json
+++ b/Front/app/locales/en/translation.json
@@ -37,7 +37,9 @@
 		"grid" :"grid",
 		"map" : "map",
 		"logout" : "logout",
-		"back" : "Back"
+		"back" : "Back",
+		"select-all" : "Select all",
+		"unselect-all" :"Unselect all"
 
 	},
 	"shared" : {
@@ -156,6 +158,14 @@
  		"history" : "Historique",
  		"equipment" : "Equipement",
  		"locations" : "Positions"
+ 	},
+ 	"export" : {
+ 		"legend-theme" : "Choose your theme",
+ 		"legend-view"  :"Choose your view",
+ 		"legend-columns" : "Choose your columns",
+ 		"legend-preview" : "Preview",
+ 		"legend-rows" : "first rows"
+
  	}
 
 }
diff --git a/Front/app/locales/fr/translation.json b/Front/app/locales/fr/translation.json
index 5acbbb369..30a4fb6e3 100644
--- a/Front/app/locales/fr/translation.json
+++ b/Front/app/locales/fr/translation.json
@@ -34,7 +34,9 @@
 		"map" : "carte",
 		"logout" : "Se déconnecter",
 		"export" :"Exporter",
-		"back" : "Retour"
+		"back" : "Retour",
+		"select-all" : "Selectionner tout",
+		"unselect-all" :"annuler"
 	},
 	"shared" : {
 		"fieldworker" : "Observateur",
@@ -153,5 +155,13 @@
  		"history" : "Historique",
  		"equipment" : "Equipement",
  		"locations" : "Positions"
+ 	},
+ 	"export" : {
+ 		"legend-theme" : "Choisissez votre thème",
+ 		"legend-view"  :"Choisissez votre vue/protocole",
+ 		"legend-columns" : "Choisissez vos colonnes",
+ 		"legend-preview" : "Aperçu",
+ 		"legend-rows" : "premières lignes"
+
  	}
 }
diff --git a/Front/app/modules/export/lyt-export-step1.js b/Front/app/modules/export/lyt-export-step1.js
index 8c7377b00..02d4a275f 100644
--- a/Front/app/modules/export/lyt-export-step1.js
+++ b/Front/app/modules/export/lyt-export-step1.js
@@ -43,6 +43,7 @@ define([
           _this.ui.themes.append(line);
         });
       });
+      this.$el.i18n();
     },
 
     getViews: function(e) {
diff --git a/Front/app/modules/export/lyt-export-step2.js b/Front/app/modules/export/lyt-export-step2.js
index d89931c3c..cde42e709 100644
--- a/Front/app/modules/export/lyt-export-step2.js
+++ b/Front/app/modules/export/lyt-export-step2.js
@@ -42,6 +42,7 @@ define([
       this.getFieldsListForSelectedView();
       this.displayMap();
       this.displayFilters();
+      this.$el.i18n();
     },
 
     addFilter: function() {
diff --git a/Front/app/modules/export/lyt-export-step3.js b/Front/app/modules/export/lyt-export-step3.js
index 1387a636a..844f42126 100644
--- a/Front/app/modules/export/lyt-export-step3.js
+++ b/Front/app/modules/export/lyt-export-step3.js
@@ -35,6 +35,7 @@ define([
 
     onShow: function() {
       this.displayGrid();
+      this.$el.i18n();
     },
 
     displayGrid: function() {
diff --git a/Front/app/modules/export/templates/tpl-export-step1.html b/Front/app/modules/export/templates/tpl-export-step1.html
index c4b5b119b..b61c455cf 100644
--- a/Front/app/modules/export/templates/tpl-export-step1.html
+++ b/Front/app/modules/export/templates/tpl-export-step1.html
@@ -1,6 +1,6 @@
 <div class="col-xs-4 full-height">
   <br>
-  <legend>Choose your theme</legend>
+  <legend data-i18n="export.legend-theme">Choose your theme</legend>   
   <br>
   <div id="themes"></div>
 </div>
@@ -8,7 +8,7 @@
 <div class="col-xs-8 full-height dark">
   <input id="requirement" type="text" class="required hidden">
   <br>
-  <legend>Choose your view</legend>
+  <legend data-i18n="export.legend-view">Choose your view</legend>
   <br>
   <div id="views"></div>
 </div>
diff --git a/Front/app/modules/export/templates/tpl-export-step2.html b/Front/app/modules/export/templates/tpl-export-step2.html
index 6966d6950..92c6fbd76 100644
--- a/Front/app/modules/export/templates/tpl-export-step2.html
+++ b/Front/app/modules/export/templates/tpl-export-step2.html
@@ -1,6 +1,6 @@
 <div class="col-xs-4 full-height no-padding">
   <div class="toolbar top">
-    <legend class="inherit">Search</legend>
+    <legend class="inherit" data-i18n="button.search">Search</legend>
     <legend class="pull-right inherit">Total : <span id="total">_</span></legend>
   </div>
   <div class="crop2">
@@ -11,7 +11,7 @@
   </div>
   <div class="toolbar bottom">
     <button id="filter" class="btn pull-right btn-success">
-      Search&nbsp;
+      <span data-i18n="button.search">Search</span>&nbsp;
       <span class="reneco reneco-search"></span>
     </button>
   </div>
diff --git a/Front/app/modules/export/templates/tpl-export-step3.html b/Front/app/modules/export/templates/tpl-export-step3.html
index 32953b6f5..930080c25 100644
--- a/Front/app/modules/export/templates/tpl-export-step3.html
+++ b/Front/app/modules/export/templates/tpl-export-step3.html
@@ -1,6 +1,6 @@
 <div class="col-xs-4 full-height no-padding">
   <div class="toolbar top">
-    <legend>Choose your columns</legend>
+    <legend data-i18n="export.legend-columns">Choose your columns</legend>
   </div>
   <div class="crop2">
     <br>
@@ -9,8 +9,8 @@
   </div>
   <div class="toolbar bottom">
     <div class="pull-right">
-      <button class="btn" id="none">Unselect All</button>
-      <button class="btn" id="all">Select All</button>
+      <button class="btn" id="all" data-i18n="button.select-all">Select All</button>
+      <button class="btn" id="none" data-i18n="button.unselect-all">Unselect All</button>
     </div>
   </div>
 </div>
@@ -18,8 +18,8 @@
 <div class="col-xs-8 full-height no-padding dark">
   <div class="toolbar top">
     <legend class="">
-      <span class="pull-left">Preview (20 first rows)</span>
-      <span class="pull-right">Total : <span id="total"></span> rows</span>
+      <span class="pull-left"> <span data-i18n="export.legend-preview">Preview </span>&nbsp;(20 <span data-i18n="export.legend-rows">first rows</span>)</span>
+      <span class="pull-right">.&nbsp;Total : <span id="total"></span> <span data-i18n="shared.rows">rows</span></span>
     </legend>
   </div>
     <div class="crop1">
diff --git a/Front/app/modules/stations/layouts/lyt-protocol.js b/Front/app/modules/stations/layouts/lyt-protocol.js
index 24af79bb7..745c625cd 100644
--- a/Front/app/modules/stations/layouts/lyt-protocol.js
+++ b/Front/app/modules/stations/layouts/lyt-protocol.js
@@ -238,4 +238,4 @@ define([
     },
 
   });
-});
\ No newline at end of file
+});

From da322baa24aaa08cf16714c4ff65713b3a8b7fe3 Mon Sep 17 00:00:00 2001
From: ktalbi <khaled_talbi@hotmail.com>
Date: Thu, 1 Sep 2016 15:45:02 +0200
Subject: [PATCH 05/30] export traduction 2

---
 Front/app/locales/en/translation.json                 | 11 +++++++++--
 Front/app/locales/fr/translation.json                 | 11 +++++++++--
 Front/app/modules/export/lyt-export-step1.js          |  7 ++++++-
 Front/app/modules/export/lyt-export-step2.js          |  4 +++-
 Front/app/modules/export/lyt-export-step3.js          |  5 ++++-
 .../modules/export/templates/tpl-export-step4.html    |  8 ++++----
 6 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/Front/app/locales/en/translation.json b/Front/app/locales/en/translation.json
index a624d2627..8b429d949 100644
--- a/Front/app/locales/en/translation.json
+++ b/Front/app/locales/en/translation.json
@@ -164,8 +164,15 @@
  		"legend-view"  :"Choose your view",
  		"legend-columns" : "Choose your columns",
  		"legend-preview" : "Preview",
- 		"legend-rows" : "first rows"
-
+ 		"legend-rows" : "first rows",
+ 		"pdf-file" : "Get PDF File",
+ 		"csv-file" :"Get CSV File",
+ 		"excel-file" : "Get Excel File",
+ 		"gpx-file" : "Get GPX File",
+ 		"step1-label" :"Choose the view to export",
+ 		"step2-label" :"Filter",
+ 		"step3-label" :"Preview",
+ 		"step4-label" :"File type"
  	}
 
 }
diff --git a/Front/app/locales/fr/translation.json b/Front/app/locales/fr/translation.json
index 30a4fb6e3..143765fa5 100644
--- a/Front/app/locales/fr/translation.json
+++ b/Front/app/locales/fr/translation.json
@@ -161,7 +161,14 @@
  		"legend-view"  :"Choisissez votre vue/protocole",
  		"legend-columns" : "Choisissez vos colonnes",
  		"legend-preview" : "Aperçu",
- 		"legend-rows" : "premières lignes"
-
+ 		"legend-rows" : "premières lignes",
+ 		"pdf-file" : "fichier PDF",
+ 		"csv-file" :"fichier CSV",
+ 		"excel-file" : "fichier Excel",
+ 		"gpx-file" : "fichier GPX",
+ 		"step1-label" :"Choix de vue/protocole",
+ 		"step2-label" :"Filtre",
+ 		"step3-label" :"Aperçu",
+ 		"step4-label" :"Type de fichier"
  	}
 }
diff --git a/Front/app/modules/export/lyt-export-step1.js b/Front/app/modules/export/lyt-export-step1.js
index 02d4a275f..bec0d38c6 100644
--- a/Front/app/modules/export/lyt-export-step1.js
+++ b/Front/app/modules/export/lyt-export-step1.js
@@ -12,7 +12,10 @@ define([
     className: 'full-height',
     template: 'app/modules/export/templates/tpl-export-step1.html',
 
-    name: ' Choose the view to export',
+    name : '<span class="export-step1"></span>',
+    /*name : (function () {
+        return i18n.translate('export.step1-label'); 
+    })(),*/
 
     ui: {
       'themes': '#themes',
@@ -44,6 +47,8 @@ define([
         });
       });
       this.$el.i18n();
+      var stepName = i18n.translate('export.step1-label');
+      $('.export-step1').html(stepName);
     },
 
     getViews: function(e) {
diff --git a/Front/app/modules/export/lyt-export-step2.js b/Front/app/modules/export/lyt-export-step2.js
index cde42e709..f4636c0ae 100644
--- a/Front/app/modules/export/lyt-export-step2.js
+++ b/Front/app/modules/export/lyt-export-step2.js
@@ -30,7 +30,7 @@ define([
       'click button#filter': 'filter',
     },
 
-    name: ' Filter',
+    name : '<span class="export-step2"></span>',
 
     initialize: function(options) {
       this.com = new Com();
@@ -43,6 +43,8 @@ define([
       this.displayMap();
       this.displayFilters();
       this.$el.i18n();
+      var stepName = i18n.translate('export.step2-label');
+      $('.export-step2').html(stepName);
     },
 
     addFilter: function() {
diff --git a/Front/app/modules/export/lyt-export-step3.js b/Front/app/modules/export/lyt-export-step3.js
index 844f42126..e2e07cbc9 100644
--- a/Front/app/modules/export/lyt-export-step3.js
+++ b/Front/app/modules/export/lyt-export-step3.js
@@ -13,7 +13,8 @@ define([
     className: 'full-height',
     template: 'app/modules/export/templates/tpl-export-step3.html',
 
-    name: ' Preview',
+
+    name : '<span class="export-step3"></span>',
 
     ui: {
       'grid': '#grid',
@@ -36,6 +37,8 @@ define([
     onShow: function() {
       this.displayGrid();
       this.$el.i18n();
+      var stepName = i18n.translate('export.step3-label');
+      $('.export-step3').html(stepName);
     },
 
     displayGrid: function() {
diff --git a/Front/app/modules/export/templates/tpl-export-step4.html b/Front/app/modules/export/templates/tpl-export-step4.html
index 04a9b5577..d9a077d6c 100644
--- a/Front/app/modules/export/templates/tpl-export-step4.html
+++ b/Front/app/modules/export/templates/tpl-export-step4.html
@@ -2,28 +2,28 @@
 	<label for="pdf" id="pdfTile" class="tile-inside text-center">
 			<i class="icon-five reneco reneco-pdf_format"></i><br>
 			<br>
-			<span>Get PDF File</span><br>
+			<span data-i18n="export.pdf-file">Get PDF File</span><br>
 			<input name="file" id="pdf" type="radio" value="pdf">
 	</label>
 	
 	<label for="csv" id="csvTile" class="tile-inside text-center">
 			<i class="icon-five reneco reneco-csv_format"></i><br>
 			<br>
-			<span>Get CSV File</span><br>
+			<span data-i18n="export.csv-file">Get CSV File</span><br>
 			<input name="file" id="csv" type="radio" value="csv">
 	</label>
 
 	<label for="excel" id="excelTile" class="tile-inside text-center">
 			<i class="icon-five reneco reneco-csv_format"></i><br>
 			<br>
-			<span>Get Excel File</span><br>
+			<span data-i18n="export.excel-file">Get Excel File</span><br>
 			<input name="file" id="excel" type="radio" value="excel">
 	</label>
 	
 	<label for="gpx" id="gpxTile" class="tile-inside text-center">
 			<i class="icon-five reneco reneco-gpx_format"></i><br>
 			<br>
-			<span>Get GPX File</span><br>
+			<span data-i18n="export.gpx-file">Get GPX File</span><br>
 			<input name="file" id="gpx" type="radio" value="gpx">
 	</label>
 </div>

From 51355c632027ae6630e2563ab1e2a71ab56ad249 Mon Sep 17 00:00:00 2001
From: ktalbi <khaled_talbi@hotmail.com>
Date: Thu, 1 Sep 2016 15:45:32 +0200
Subject: [PATCH 06/30] export traduction 3

---
 Front/app/modules/export/lyt-export-step4.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Front/app/modules/export/lyt-export-step4.js b/Front/app/modules/export/lyt-export-step4.js
index 2059f387c..402748eaf 100644
--- a/Front/app/modules/export/lyt-export-step4.js
+++ b/Front/app/modules/export/lyt-export-step4.js
@@ -15,7 +15,8 @@ define([
     className: 'full-height export-layout',
     template: 'app/modules/export/templates/tpl-export-step4.html',
 
-    name: 'File type',
+
+    name : '<span class="export-step4"></span>',
 
     ui:  {
       'pdfTile': '#pdfTile',
@@ -41,6 +42,9 @@ define([
     onShow: function() {
       this.$el.find('.tile-inside:first input').prop('checked', true).change();
       this.$el.find('.tile-inside:first').addClass('active');
+      this.$el.i18n();
+      var stepName = i18n.translate('export.step4-label');
+      $('.export-step4').html(stepName);
     },
 
     changeValue: function(e) {

From 6d14ba7bab22b892fd66c96a316a5ea9db4b4130 Mon Sep 17 00:00:00 2001
From: ktalbi <khaled_talbi@hotmail.com>
Date: Thu, 1 Sep 2016 16:22:23 +0200
Subject: [PATCH 07/30] import gpx traduction

---
 Front/app/locales/en/translation.json             | 5 ++++-
 Front/app/locales/fr/translation.json             | 5 ++++-
 Front/app/modules/importFile/gpx/lyt-step1-gpx.js | 4 +++-
 Front/app/modules/importFile/gpx/lyt-step2-gpx.js | 4 +++-
 Front/app/modules/importFile/lyt-step0.js         | 4 +++-
 5 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/Front/app/locales/en/translation.json b/Front/app/locales/en/translation.json
index 8b429d949..8b1b41100 100644
--- a/Front/app/locales/en/translation.json
+++ b/Front/app/locales/en/translation.json
@@ -107,7 +107,10 @@
 		"stepper" : {
 			"step1GPXLabel" : "Data",
 			"step2GPXLabel" : "Details",
-			"step3GPXLabel" : "Metadata"
+			"step3GPXLabel" : "Metadata",
+			"step0-label" : "File type selection",
+			"step1-gpxlabel" : "GPX file upload",
+			"step2-gpxlabel" : "Datas Selection"
 		},
 		"gpxHelp" : "GPX, or GPS eXchange Format is an XML schema designed as a common GPS data format. It can be used to describe waypoints, tracks, and routes.",
 		"fileSelection" : "select a file*",
diff --git a/Front/app/locales/fr/translation.json b/Front/app/locales/fr/translation.json
index 143765fa5..ab73444bb 100644
--- a/Front/app/locales/fr/translation.json
+++ b/Front/app/locales/fr/translation.json
@@ -103,7 +103,10 @@
 		"stepper" : {
 			"step1GPXLabel" : "Données",
 			"step2GPXLabel" : "Details",
-			"step3GPXLabel" : "Metadonnées"
+			"step3GPXLabel" : "Metadonnées",
+			"step0-label" : "Type de fichier",
+			"step1-gpxlabel" : "Chargement du fichier GPX",
+			"step2-gpxlabel" : "Sélection de données"
 		},
 		"gpxHelp" : "GPX ou GPS eXchange Format est un format d'échange de données GPS. Il peut être utilisé pour décrire des points d'intéret (waypoints), des tracés et des itinéraires .",
 		"fileSelection" : "Sélectionnez un fichier",
diff --git a/Front/app/modules/importFile/gpx/lyt-step1-gpx.js b/Front/app/modules/importFile/gpx/lyt-step1-gpx.js
index b56314e55..c99c51014 100644
--- a/Front/app/modules/importFile/gpx/lyt-step1-gpx.js
+++ b/Front/app/modules/importFile/gpx/lyt-step1-gpx.js
@@ -24,7 +24,7 @@ define([
     className: 'full-height',
     template: 'app/modules/importFile/gpx/templates/tpl-step1-gpx.html',
 
-    name: 'GPX file upload',
+    name : '<span class="import-step1"></span>',
 
     events: {
       'change input[type="file"]': 'importFile',
@@ -57,6 +57,8 @@ define([
       this.fieldworkers = $('label[for*="FieldWorkers"]').parent();
       $(this.fieldworkers).addClass('hidden');
       this.$el.i18n();
+      var stepName = i18n.translate('import.stepper.step1-gpxlabel');
+      $('.import-step1').html(stepName);
     },
 
     importFile: function(e) {
diff --git a/Front/app/modules/importFile/gpx/lyt-step2-gpx.js b/Front/app/modules/importFile/gpx/lyt-step2-gpx.js
index 5a8b5b653..5976687aa 100644
--- a/Front/app/modules/importFile/gpx/lyt-step2-gpx.js
+++ b/Front/app/modules/importFile/gpx/lyt-step2-gpx.js
@@ -23,7 +23,7 @@ define([
     className: 'full-height',
     template: 'app/modules/importFile/gpx/templates/tpl-step2-gpx.html',
 
-    name: 'Datas Selection',
+    name : '<span class="import-step2"></span>',
 
     ui: {
       'grid': '#grid',
@@ -53,6 +53,8 @@ define([
       this.displayGrid();
       this.displayFilters();
       this.displayMap();
+      var stepName = i18n.translate('import.stepper.step2-gpxlabel');
+      $('.import-step2').html(stepName);
     },
 
     displayMap: function() {
diff --git a/Front/app/modules/importFile/lyt-step0.js b/Front/app/modules/importFile/lyt-step0.js
index 5b5953de3..d9b9916c6 100644
--- a/Front/app/modules/importFile/lyt-step0.js
+++ b/Front/app/modules/importFile/lyt-step0.js
@@ -20,7 +20,7 @@ define([
       'change input': 'changeValue',
     },
 
-    name:'File type selection',
+    name : '<span class="import-step0"></span>',
 
     initialize: function() {
 		},
@@ -29,6 +29,8 @@ define([
       this.$el.find('.tile-inside:first input').prop('checked', true).change();
       this.$el.find('.tile-inside:first').addClass('active');
       this.$el.i18n();
+      var stepName = i18n.translate('import.stepper.step0-label');
+      $('.import-step0').html(stepName);
 		},
 
     validate: function() {

From 9caf4ec5044cd3f31aa3058609fdfe3013e4dae3 Mon Sep 17 00:00:00 2001
From: ktalbi <khaled_talbi@hotmail.com>
Date: Thu, 1 Sep 2016 17:04:58 +0200
Subject: [PATCH 08/30] fix bug translation btnNext stepper

---
 Front/app/ns_modules/ns_stepper/lyt-newStepper.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Front/app/ns_modules/ns_stepper/lyt-newStepper.js b/Front/app/ns_modules/ns_stepper/lyt-newStepper.js
index 8e50a6176..87dfb7a74 100644
--- a/Front/app/ns_modules/ns_stepper/lyt-newStepper.js
+++ b/Front/app/ns_modules/ns_stepper/lyt-newStepper.js
@@ -5,7 +5,7 @@ define([
 	'backbone',
 	'marionette',
 	'sweetAlert',
-	'translater',
+	'i18n',
 ], function($, _, Backbone, Marionette, Swal, Translater
 ){
 
@@ -60,7 +60,7 @@ define([
 		},
 
 		initialize: function(){
-			this.translater = Translater.getTranslater();
+			//this.translater = Translater.getTranslater();
 			this.currentStepIndex = 0;
 			this.models = [];
 			this.initSteps();
@@ -82,6 +82,7 @@ define([
 		onShow : function(){
 			this.displayStepNav();
 			this.displayStep(0);
+			this.$el.i18n();
 		},
 
 		//clean the stored datas from current Step

From 6b03420af146840e6def74295b34a028dab1af9f Mon Sep 17 00:00:00 2001
From: ktalbi <khaled_talbi@hotmail.com>
Date: Fri, 2 Sep 2016 15:25:24 +0200
Subject: [PATCH 09/30] home: disable not allowed fonctionnalities

---
 Front/app/app.js                          | 11 +++++--
 Front/app/base/header/lyt-breadcrumb.js   |  9 +++++-
 Front/app/base/header/tpl-breadcrumb.html |  4 +--
 Front/app/base/home/lyt-home.js           | 12 ++++++++
 Front/app/base/home/tpl/tpl-home.html     |  8 ++---
 Front/app/router.js                       | 36 ++++++++++++++++++++++-
 6 files changed, 70 insertions(+), 10 deletions(-)

diff --git a/Front/app/app.js b/Front/app/app.js
index f8aa09447..d0518c5d4 100644
--- a/Front/app/app.js
+++ b/Front/app/app.js
@@ -1,4 +1,4 @@
-define(['marionette', 'lyt-rootview', 'router', 'controller','sweetAlert',
+define(['marionette', 'lyt-rootview', 'router', 'controller','sweetAlert',  'config',
   //circular dependencies, I don't konw where to put it 4 the moment
   'ns_modules/ns_bbfe/bbfe-number',
   'ns_modules/ns_bbfe/bbfe-timePicker',
@@ -20,7 +20,7 @@ define(['marionette', 'lyt-rootview', 'router', 'controller','sweetAlert',
   'ns_modules/ns_cell/bg-integerCell',
 
   ],
-  function( Marionette, LytRootView, Router, Controller,Swal) {
+  function( Marionette, LytRootView, Router, Controller,Swal,config) {
 
     var app = {};
     var JST = window.JST = window.JST || {};
@@ -103,6 +103,13 @@ define(['marionette', 'lyt-rootview', 'router', 'controller','sweetAlert',
 
     window.formChange = false;
     window.formEdition = false;
+    // get not allowed urls in config.js
+    var disabled = config.disabledFunc ; 
+    window.notAllowedUrl = [];
+    for (var i=0; i< disabled.length;i++){
+        window.notAllowedUrl.push(disabled[i]);
+    }
+
     window.checkExitForm = function(confirmCallback,cancelCallback) {
       if(window.formChange && window.formEdition){
         Swal({
diff --git a/Front/app/base/header/lyt-breadcrumb.js b/Front/app/base/header/lyt-breadcrumb.js
index 6af02d08f..d00114ddc 100644
--- a/Front/app/base/header/lyt-breadcrumb.js
+++ b/Front/app/base/header/lyt-breadcrumb.js
@@ -19,7 +19,14 @@ function(Marionette, config) {
     },
 
     onShow: function() {
-
+      var disabled = config.disabledFunc ; 
+      if (! disabled){
+        return ;
+      }
+      for (var i=0; i< disabled.length;i++){
+        var functionnality = disabled[i];
+        $("." + functionnality).addClass('disabled');
+      }
     },
   });
 });
diff --git a/Front/app/base/header/tpl-breadcrumb.html b/Front/app/base/header/tpl-breadcrumb.html
index ec7aca243..c043e898b 100644
--- a/Front/app/base/header/tpl-breadcrumb.html
+++ b/Front/app/base/header/tpl-breadcrumb.html
@@ -19,7 +19,7 @@
 			</a>
 		</li>
 
-		<li>
+		<li class="release">
 			<a href="#release">
 				<i class=" reneco reneco-to_release"></i>
 				&nbsp;&nbsp;Release
@@ -56,7 +56,7 @@
 			</a>
 		</li>
 
-		<li>
+		<li class="monitoredSites">
 			<a href="#monitoredSites">
 				<i class=" reneco reneco-sensors"></i>
 				&nbsp;&nbsp;Monitored sites
diff --git a/Front/app/base/home/lyt-home.js b/Front/app/base/home/lyt-home.js
index 140f3af11..6dae354dc 100644
--- a/Front/app/base/home/lyt-home.js
+++ b/Front/app/base/home/lyt-home.js
@@ -82,10 +82,22 @@ function(Marionette, NsMap, CurveGraphView, DonutGraphView, InfoView, config, Tp
     },
 
     onShow: function(options) {
+      this.disableTiles();
       this.info.show(this.infoStat);
       this.ui.donuts.html(this.donutGraphs.el);
       this.graph.show(this.curveGraph);
       this.$el.i18n();
+    },
+    disableTiles : function(){
+      // disable tiles for disabled fonctionalities in config.js
+      var disabled = config.disabledFunc ; 
+      if (! disabled){
+        return ;
+      }
+      for (var i=0; i< disabled.length;i++){
+        var functionnality = disabled[i];
+        $("." + functionnality).addClass('tile-locked');
+      }
     }
   });
 });
diff --git a/Front/app/base/home/tpl/tpl-home.html b/Front/app/base/home/tpl/tpl-home.html
index 5a27f3315..5af0f8b74 100644
--- a/Front/app/base/home/tpl/tpl-home.html
+++ b/Front/app/base/home/tpl/tpl-home.html
@@ -33,7 +33,7 @@
 					</p>
 				</a>
 
-				<a href="#release" class="js-admin tile small_tile tile-pumpkin">
+				<a href="#release" class="js-admin tile small_tile tile-pumpkin release">
 					<p>
 						<i class="reneco reneco-to_release"></i>
 						<span data-i18n="tiles.release">Release</span>
@@ -41,7 +41,7 @@
 				</a>
 				
 
-				<a href="#" class="tile small_tile tile-alizarin tile-locked ">
+				<a href="#" class="tile small_tile tile-alizarin autoImport">
 					<p>
 						<i class="reneco reneco-sensorimport"></i>
 						<span data-i18n="tiles.auto-import">Automatic import</span>
@@ -83,7 +83,7 @@
 					</p>
 				</a>
 
-				<a href="#" class="tile small_tile last tile-teal tile-locked">
+				<a href="#" class="tile small_tile last tile-teal myData">
 					<p>
 						<i class="reneco reneco-mydata"></i>
 						<span data-i18n="tiles.data">My data</span>
@@ -97,7 +97,7 @@
 					</p>
 				</a>
 
-				<a href="#monitoredSites" class="tile small_tile tile-green">
+				<a href="#monitoredSites" class="tile small_tile tile-green monitoredSites">
 					<p>
 						<i class="reneco reneco-sensors"></i>
 						<span data-i18n="tiles.sites">Monitored sites</span>
diff --git a/Front/app/router.js b/Front/app/router.js
index 06209a5ff..ba762e879 100644
--- a/Front/app/router.js
+++ b/Front/app/router.js
@@ -55,6 +55,14 @@ define(['jquery', 'marionette', 'backbone', 'config', 'sweetAlert', 'controller'
 
     execute: function(callback, args) {
       // get current route
+      var route = Backbone.history.fragment;
+
+      if ((route != '') && (route != '#')){
+        var allowed = this.checkRoute();
+        if(!allowed) {
+            return false;
+        }
+      } 
       this.history.push(Backbone.history.fragment);
       var _this= this;
       window.checkExitForm(function(){
@@ -64,11 +72,18 @@ define(['jquery', 'marionette', 'backbone', 'config', 'sweetAlert', 'controller'
       });
     },
     onRoute: function(url, patern, params) {
+      var notAllowed = window.notAllowedUrl ;
       patern = patern.replace(/\(/g, '');
       patern = patern.replace(/\)/g, '');
       patern = patern.replace(/\:/g, '');
       patern = patern.split('/');
 
+      for (var i=0; i< notAllowed.length;i++){
+            if (notAllowed[i] == patern[0]) {
+                return ; 
+            }
+      }
+
       if (patern[0] == '*route') {
         $('#arial').html('');
         $('#arialSub').html('');
@@ -106,6 +121,9 @@ define(['jquery', 'marionette', 'backbone', 'config', 'sweetAlert', 'controller'
         return result;
     },
     setNav : function(patern){
+
+        var url = patern[0];
+
         var md = this.collection.findWhere({href: patern[0]});
         $('#arial').html('<a href="#' + md.get('href') + '">| &nbsp; ' + md.get('label') + '</a>');
         if (patern[1] && patern[1] != 'id' && patern[1] != 'type') {
@@ -113,6 +131,22 @@ define(['jquery', 'marionette', 'backbone', 'config', 'sweetAlert', 'controller'
         }else {
           $('#arialSub').html('');
         }
-     }
+     },
+     checkRoute : function(){
+        var route = Backbone.history.fragment;
+        var notAllowed = window.notAllowedUrl ;
+        route = route.replace(/\(/g, '');
+        route = route.replace(/\)/g, '');
+        route = route.replace(/\:/g, '');
+        route = route.split('/');
+        for (var i=0; i< notAllowed.length;i++){
+            if (notAllowed[i] == route[0]) {
+              $('#arialSub').html('');
+              Backbone.history.navigate("#",true);
+              return false;
+            }
+        }
+        return true;
+      }
   });
 });

From 0ffbd12d056cbd6a987b21c7081ff89c5a73c370 Mon Sep 17 00:00:00 2001
From: ktalbi <khaled_talbi@hotmail.com>
Date: Mon, 5 Sep 2016 15:24:14 +0200
Subject: [PATCH 10/30] home, in progress...

---
 Front/app/base/home/lyt-home.js       | 65 +++++++++++++++++++++++----
 Front/app/base/home/tpl/tpl-home.html |  1 +
 Front/app/base/home/tpl/tpl-info.html |  2 +-
 Front/app/base/home/views/info.js     | 17 ++++---
 4 files changed, 69 insertions(+), 16 deletions(-)

diff --git a/Front/app/base/home/lyt-home.js b/Front/app/base/home/lyt-home.js
index 6dae354dc..bc6dcb307 100644
--- a/Front/app/base/home/lyt-home.js
+++ b/Front/app/base/home/lyt-home.js
@@ -22,7 +22,9 @@ function(Marionette, NsMap, CurveGraphView, DonutGraphView, InfoView, config, Tp
     },
 
     ui: {
-      'donuts': '#donuts'
+      'donuts': '#donuts',
+      'userFirst': '#userFirst',
+      'userLast': '#userLast',
     },
 
     animateIn: function() {
@@ -47,6 +49,7 @@ function(Marionette, NsMap, CurveGraphView, DonutGraphView, InfoView, config, Tp
     },
 
     initStats: function() {
+      var isDomoInstance = config.instance ;
       var collGraphObj = [{
         url: config.coreUrl + 'sensor/uncheckedDatas/graph',
         ele: '#validate',
@@ -67,26 +70,61 @@ function(Marionette, NsMap, CurveGraphView, DonutGraphView, InfoView, config, Tp
 				template : 'app/base/home/tpl/tpl-dounutGraph3.html'
 			}*/];
       var collGraph = new Backbone.Collection(collGraphObj);
-      var GraphViews = Backbone.Marionette.CollectionView.extend({
-        childView: DonutGraphView,
-      });
+      
 
-      this.donutGraphs = new GraphViews({collection: collGraph});
-      this.curveGraph = new CurveGraphView();
+      if(!isDomoInstance || (isDomoInstance != 'demo')) {
+          var GraphViews = Backbone.Marionette.CollectionView.extend({
+            childView: DonutGraphView,
+          });
+          this.donutGraphs = new GraphViews({collection: collGraph});
+          
+          
+          
+      }
       this.infoStat = new InfoView();
+      this.curveGraph = new CurveGraphView();
+
     },
 
     onRender: function() {
       this.initStats();
-      this.donutGraphs.render();
+      var isDomoInstance = config.instance ;
+      if(!isDomoInstance || (isDomoInstance != 'demo')) {
+        this.donutGraphs.render();
+      }
     },
 
     onShow: function(options) {
+      var isDomoInstance = config.instance ;
       this.disableTiles();
+      
+      if(!isDomoInstance || (isDomoInstance != 'demo')) {
+        
+        this.ui.donuts.html(this.donutGraphs.el);
+        $('.hello').addClass('masqued');
+      } else {
+        this.getUser();
+        $('#siteName').addClass('masqued');
+      }
       this.info.show(this.infoStat);
-      this.ui.donuts.html(this.donutGraphs.el);
       this.graph.show(this.curveGraph);
+      
       this.$el.i18n();
+      // mobile compatibility
+      var isMobile = window.matchMedia("only screen and (max-width: 760px)");
+      if (isMobile.matches && (!window.alertMobile)) {
+          Swal({
+              title: 'Mobile compatibility',
+              text: 'This application is not adapted to mobile browsers yet',
+              type: 'warning',
+              showCancelButton: false,
+              confirmButtonColor: 'rgb(221, 107, 85)',
+              confirmButtonText: 'OK',
+              closeOnConfirm: true
+          });
+          $('.sweet-alert.showSweetAlert.visible').css('margin-left', '0px;');
+          window.alertMobile = true;
+      }
     },
     disableTiles : function(){
       // disable tiles for disabled fonctionalities in config.js
@@ -98,6 +136,17 @@ function(Marionette, NsMap, CurveGraphView, DonutGraphView, InfoView, config, Tp
         var functionnality = disabled[i];
         $("." + functionnality).addClass('tile-locked');
       }
+    },
+    getUser : function(){
+      var _this = this;
+      var user  = new Backbone.Model();
+      user.url = config.coreUrl + 'currentUser';
+      user.fetch({
+        success: function(md) {
+          _this.ui.userFirst.html(user.get('Firstname'));
+          _this.ui.userLast.html(user.get('Lastname'));
+        }
+      });
     }
   });
 });
diff --git a/Front/app/base/home/tpl/tpl-home.html b/Front/app/base/home/tpl/tpl-home.html
index 5af0f8b74..d8f0869ac 100644
--- a/Front/app/base/home/tpl/tpl-home.html
+++ b/Front/app/base/home/tpl/tpl-home.html
@@ -2,6 +2,7 @@
 	<div class="mid-height clearfix hidden-xs hidden-sm">
 		<div class="col-lg-6">
 			<br>
+			<h1 class="hello"><span data-i18n="home.hello">Hello,</span><br><span id="userFirst"></span> <span id="userLast"></span></h1>
 			<div id="info" class="col-lg-12 col-lg-offset-0" style = "text-align:center;">
 			</div>
 			<br>
diff --git a/Front/app/base/home/tpl/tpl-info.html b/Front/app/base/home/tpl/tpl-info.html
index 4cd7f4eb5..e62f59140 100644
--- a/Front/app/base/home/tpl/tpl-info.html
+++ b/Front/app/base/home/tpl/tpl-info.html
@@ -1,5 +1,5 @@
 
-<h1 class="big"><%= nbIndiv %> individuals</h1>
+<h1 class="big statIndiv" ><%= nbIndiv %> individuals</h1>
 <p class="medium fnt-normal" id="siteName"><%= siteName %></p>
 <p class="medium fnt-normal" id="date"><%= date %></p>
 
diff --git a/Front/app/base/home/views/info.js b/Front/app/base/home/views/info.js
index 5b4d467c5..d8410a151 100644
--- a/Front/app/base/home/views/info.js
+++ b/Front/app/base/home/views/info.js
@@ -21,13 +21,16 @@ define([
 
     initialize: function() {
       this.$el.hide();
-      $.ajax({
-        context: this,
-        url: config.coreUrl + 'individuals/count',
-      }).done(function(data) {
-        this.model.set('nbIndiv', data);
-        this.$el.fadeIn();
-      });
+      var isDomoInstance = config.instance ;
+      if(!isDomoInstance || (isDomoInstance != 'demo')) {
+          $.ajax({
+            context: this,
+            url: config.coreUrl + 'individuals/count',
+          }).done(function(data) {
+            this.model.set('nbIndiv', data);
+            this.$el.fadeIn();
+          });
+      }
     },
 
     onDestroy: function() {

From cfea8af4eb10a14b2aa9a96220ca6cd054e04cf1 Mon Sep 17 00:00:00 2001
From: ktalbi <khaled_talbi@hotmail.com>
Date: Mon, 5 Sep 2016 16:29:49 +0200
Subject: [PATCH 11/30] pipefy integration + user language

---
 Front/app/base/header/lyt-header.js   | 89 ++++++++++++++++++++++++---
 Front/app/base/header/tpl-header.html |  3 +
 Front/app/router.js                   | 10 +++
 Front/app/styles/base/_header.less    | 25 ++++++++
 Front/app/translater.js               | 29 +++++++--
 5 files changed, 142 insertions(+), 14 deletions(-)

diff --git a/Front/app/base/header/lyt-header.js b/Front/app/base/header/lyt-header.js
index c6ff24639..ff5017f73 100644
--- a/Front/app/base/header/lyt-header.js
+++ b/Front/app/base/header/lyt-header.js
@@ -7,13 +7,17 @@ function($,Marionette, config, Breadcrumb) {
     className: 'header',
     events: {
       'click #logout': 'logout',
+      'click #pipefy' : 'pipefyform',
+      'click .pipefyclose' :'closeform'
     },
     regions: {
       'breadcrumb': '#breadcrumb'
     },
 
     ui: {
-      'userName': '#userName'
+      'userName': '#userName',
+      'pypefy' : '#pipefy',
+      'pypefypanel' :'div.supportpanel'
     },
 
     logout: function() {
@@ -26,17 +30,84 @@ function($,Marionette, config, Breadcrumb) {
     },
 
     onShow: function() {
+      // activate pipefy if it is demo instance
       var _this = this;
+      var isDomoInstance = config.instance ;
+      if(isDomoInstance == 'demo') {
+        $('.pipefy-support').removeClass('hidden');
+        if(window.app.logged) {
+              this.getUser();
+        } else {
+                var func_rep = window.setInterval(function(){ 
+                  if(window.app.logged){
+                    _this.getUser();
+                    window.clearInterval(func_rep);
+                  } 
+              }, 50);
+        }
+            this.$el.i18n();
+      }
+      else {
+            window.app.user = new Backbone.Model();
+            window.app.user.url = config.coreUrl + 'currentUser';
+            window.app.user.fetch({
+              success: function(data) {
+                $('body').addClass(window.app.user.get('role'));
+                $.xhrPool.allowAbort = true;
+                _this.ui.userName.html(window.app.user.get('fullname'));
+              }
+            });
+      }
+
+
       this.breadcrumb.show(new Breadcrumb());
-      window.app.user = new Backbone.Model();
-      window.app.user.url = config.coreUrl + 'currentUser';
-      window.app.user.fetch({
-        success: function(data) {
-          $('body').addClass(window.app.user.get('role'));
-          $.xhrPool.allowAbort = true;
-          _this.ui.userName.html(window.app.user.get('fullname'));
+      
+
+
+
+    },
+     pipefyform : function(e){
+      // check id div is not integrated add it
+      var frmisinserted  = $('.supportpanel').length;
+      if (!frmisinserted) {
+        this.insertForm();
+      } else {
+        this.controlformdisplay();
+      }
+      
+    },
+    closeform : function(){
+      $('div.supportpanel').animate({ "right": "-=560px" }, "slow" ).addClass('hidden');
+    },
+    insertForm : function(){
+      var frm = '<div class="supportpanel hidden"><div class="supportheader">Support</div>'
+      frm +='<iframe width="560" height="800" src="https://beta.pipefy.com/public_form/49561?embedded=true" frameborder="0" id="iframe"></iframe></div>';
+      this.$el.append(frm);
+      this.controlformdisplay();
+    },
+    controlformdisplay : function(){
+      var notdisplayed = $('div.supportpanel').hasClass('hidden');
+      if(notdisplayed){
+        $('div.supportpanel').removeClass('hidden').animate({ 
+          "right": "+=560px"}, { duration: 700, 
+          complete: function() {
+              $('.supportpanel').append('<a class="pipefyclose"><span class="reneco reneco-close"></span></a>');
+          } 
         }
-      });
+       );
+      } else {
+        this.closeform();
+      }
     },
+    getUser : function(){
+      var _this = this;
+      var user  = new Backbone.Model();
+      user.url = config.coreUrl + 'currentUser';
+      user.fetch({
+        success: function(md) {
+           _this.ui.userName.html(user.get('Firstname') + ' ' + user.get('Lastname') );
+        }
+      });
+    }
   });
 });
diff --git a/Front/app/base/header/tpl-header.html b/Front/app/base/header/tpl-header.html
index 95c2b0499..0bf9773e6 100644
--- a/Front/app/base/header/tpl-header.html
+++ b/Front/app/base/header/tpl-header.html
@@ -32,6 +32,9 @@
 					</svg>
 				</a>
 			</li>
+			<li class="pipefy-support hidden">
+				<a id="pipefy"><span class="reneco reneco-support"></span></a>
+			</li>
 			<li class="hidden-xs">
 				<a href="#">
 					<i class="reneco reneco-user"></i>&nbsp;
diff --git a/Front/app/router.js b/Front/app/router.js
index ba762e879..91dbb7ba3 100644
--- a/Front/app/router.js
+++ b/Front/app/router.js
@@ -54,6 +54,16 @@ define(['jquery', 'marionette', 'backbone', 'config', 'sweetAlert', 'controller'
     },
 
     execute: function(callback, args) {
+      // for demo, user language is stored in database, we need to be sure that user is logged to send ajax query to get it,
+      // --> global var to have information ( see lyt-header.js to undersand )
+      window.app.logged = false;
+      $.ajax({
+        context: this,
+        url: config.coreUrl + 'security/has_access',
+        success : function(){
+           window.app.logged = true;
+        }
+      });
       // get current route
       var route = Backbone.history.fragment;
 
diff --git a/Front/app/styles/base/_header.less b/Front/app/styles/base/_header.less
index 36a2ade9f..ffd946076 100644
--- a/Front/app/styles/base/_header.less
+++ b/Front/app/styles/base/_header.less
@@ -59,6 +59,31 @@ header{
 	}
 }
 
+.supportpanel {
+    position: fixed;
+    right: -560px;
+    height: 95%;
+	top: 0px;
+}
+.supportheader {  
+height: 2.4em;
+    background-color: white;
+    color: black;
+    text-align: center;
+    padding-top: 0.5em;
+    font-size: 1.5em;
+}
+.pipefyclose {
+    left: 10px;
+    position: absolute;
+    top: 10px;
+}
+.pipefyclose:hover {
+	    color: #337ab7;
+	    cursor: pointer;
+
+}
+
 @media (max-width: 768px){
 	header{
 		.navbar-nav{
diff --git a/Front/app/translater.js b/Front/app/translater.js
index 62277c7a2..7d7d09681 100644
--- a/Front/app/translater.js
+++ b/Front/app/translater.js
@@ -8,11 +8,30 @@ define(['marionette','config','i18n'], function(Marionette, config) {
     },
 
     initi18n: function() {
-      i18n.init({
-        resGetPath: this.url,
-        getAsync: true,
-        lng: config.language || 'en' //navigator.language || navigator.userLanguagenavigator.language || navigator.userLanguage
-      });
+      var isDomoInstance = config.instance ;
+      if(isDomoInstance == 'demo') {
+      // get user language
+          $.ajax({
+              context: this,
+              url: config.coreUrl + 'currentUser',
+              success : function(data){
+                var language = data.Language;
+                i18n.init({
+                      resGetPath: this.url,
+                      getAsync: true,
+                      lng: language || 'en'
+                    });
+              }
+          });
+
+      } else {
+        i18n.init({
+          resGetPath: this.url,
+          getAsync: true,
+          lng: config.language || 'en' //navigator.language || navigator.userLanguagenavigator.language || navigator.userLanguage
+        });
+      }
+
     },
 
     getValueFromKey: function(key) {

From 66d432d66e11f63a89a803c5c6ce06cc59cd5182 Mon Sep 17 00:00:00 2001
From: ktalbi <khaled_talbi@hotmail.com>
Date: Tue, 6 Sep 2016 16:54:02 +0200
Subject: [PATCH 12/30] send user language

---
 Back/ecoreleve_server/Views/user.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Back/ecoreleve_server/Views/user.py b/Back/ecoreleve_server/Views/user.py
index 7daf8c06f..950af29db 100644
--- a/Back/ecoreleve_server/Views/user.py
+++ b/Back/ecoreleve_server/Views/user.py
@@ -16,7 +16,10 @@ def users(request):
     session = request.dbsession
     query = select([
         User.id.label('PK_id'),
-        User.Login.label('fullname')
+        User.Login.label('fullname'),
+        User.Firstname.label('Firstname'),
+        User.Language.label('Language'),
+        User.Lastname.label('Lastname')
     ]).order_by(User.Lastname, User.Firstname)
     return [dict(row) for row in session.execute(query).fetchall()]
 

From 9e4734b69649a0cc35daf696d6be21ff2902503c Mon Sep 17 00:00:00 2001
From: ktalbi <khaled_talbi@hotmail.com>
Date: Tue, 6 Sep 2016 17:21:07 +0200
Subject: [PATCH 13/30] fix_user_language

---
 Back/ecoreleve_server/Views/user.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Back/ecoreleve_server/Views/user.py b/Back/ecoreleve_server/Views/user.py
index 950af29db..2c0d6581b 100644
--- a/Back/ecoreleve_server/Views/user.py
+++ b/Back/ecoreleve_server/Views/user.py
@@ -16,10 +16,7 @@ def users(request):
     session = request.dbsession
     query = select([
         User.id.label('PK_id'),
-        User.Login.label('fullname'),
-        User.Firstname.label('Firstname'),
-        User.Language.label('Language'),
-        User.Lastname.label('Lastname')
+        User.Login.label('fullname')
     ]).order_by(User.Lastname, User.Firstname)
     return [dict(row) for row in session.execute(query).fetchall()]
 
@@ -48,7 +45,10 @@ def current_user(request):
 
     query = select([
         User.id.label('PK_id'),
-        User.Login.label('fullname')
+        User.Login.label('fullname'),
+        User.Firstname.label('Firstname'),
+        User.Language.label('Language'),
+        User.Lastname.label('Lastname')
     ]).where(User.id == request.authenticated_userid['iss'])
     response = dict(session.execute(query).fetchone())
     response['role'] = currentUserRole

From 6031a4c48d513fa39128d746ab96abba4ea7dcd3 Mon Sep 17 00:00:00 2001
From: ktalbi <khaled_talbi@hotmail.com>
Date: Tue, 6 Sep 2016 17:35:40 +0200
Subject: [PATCH 14/30] translation navbar menu

---
 Front/app/base/header/lyt-breadcrumb.js   |  3 ++-
 Front/app/base/header/tpl-breadcrumb.html | 16 ++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Front/app/base/header/lyt-breadcrumb.js b/Front/app/base/header/lyt-breadcrumb.js
index d00114ddc..90a0a16cf 100644
--- a/Front/app/base/header/lyt-breadcrumb.js
+++ b/Front/app/base/header/lyt-breadcrumb.js
@@ -1,4 +1,4 @@
-define(['marionette', 'config'],
+define(['marionette', 'config','i18n'],
 function(Marionette, config) {
   'use strict';
   return Marionette.LayoutView.extend({
@@ -19,6 +19,7 @@ function(Marionette, config) {
     },
 
     onShow: function() {
+       this.$el.i18n();
       var disabled = config.disabledFunc ; 
       if (! disabled){
         return ;
diff --git a/Front/app/base/header/tpl-breadcrumb.html b/Front/app/base/header/tpl-breadcrumb.html
index c043e898b..e8be30fd8 100644
--- a/Front/app/base/header/tpl-breadcrumb.html
+++ b/Front/app/base/header/tpl-breadcrumb.html
@@ -8,28 +8,28 @@
 		<li>
 			<a href="#importFile">
 				<i class=" reneco reneco-import"></i>
-				&nbsp;&nbsp;Manual import
+				&nbsp;&nbsp;<span data-i18n="tiles.manual-import">Manual import</span>
 			</a>
 		</li>
 		
 		<li>
 			<a href="#stations/new">
 				<i class=" reneco reneco-entrykey "></i>
-				&nbsp;&nbsp;New Station
+				&nbsp;&nbsp;<span data-i18n="tiles.new-station">New station</span>
 			</a>
 		</li>
 
 		<li class="release">
 			<a href="#release">
 				<i class=" reneco reneco-to_release"></i>
-				&nbsp;&nbsp;Release
+				&nbsp;&nbsp;<span data-i18n="tiles.release">Release</span>
 			</a>
 		</li>
 
 		<li>
 			<a href="#validate">
 				<i class=" reneco reneco-validate"></i>
-				&nbsp;&nbsp;Validate
+				&nbsp;&nbsp;<span data-i18n="tiles.validation">Validate</span>
 			</a>
 		</li>
 
@@ -45,21 +45,21 @@
 		<li>
 			<a href="#individuals">
 				<i class=" reneco reneco-individuals"></i>
-				&nbsp;&nbsp;Individuals
+				&nbsp;&nbsp;<span data-i18n="tiles.individuals">Individuals</span>
 			</a>
 		</li>
 
 		<li>
 			<a href="#sensors">
 				<i class=" reneco reneco-sensors"></i>
-				&nbsp;&nbsp;Sensors
+				&nbsp;&nbsp;<span data-i18n="tiles.sensors">Sensors</span>
 			</a>
 		</li>
 
 		<li class="monitoredSites">
 			<a href="#monitoredSites">
 				<i class=" reneco reneco-sensors"></i>
-				&nbsp;&nbsp;Monitored sites
+				&nbsp;&nbsp;<span data-i18n="tiles.sites">Monitored sites</span>
 			</a>
 		</li>
 
@@ -68,7 +68,7 @@
 		<li>
 			<a href="#export">
 				<i class=" reneco reneco-export"></i>
-				&nbsp;&nbsp;Exports
+				&nbsp;&nbsp;Export
 			</a>
 		</li>
 	</ul>

From 47ef9fcb82ef0ddaf5943b1075c8946304cae261 Mon Sep 17 00:00:00 2001
From: ktalbi <khaled_talbi@hotmail.com>
Date: Tue, 6 Sep 2016 17:49:50 +0200
Subject: [PATCH 15/30] translate Swal msg for forms

---
 Front/app/app.js                      | 10 +++++++---
 Front/app/locales/en/translation.json |  4 ++++
 Front/app/locales/fr/translation.json |  4 ++++
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/Front/app/app.js b/Front/app/app.js
index 9ad3db8ef..f2bc6ce01 100644
--- a/Front/app/app.js
+++ b/Front/app/app.js
@@ -20,6 +20,7 @@ define(['marionette', 'lyt-rootview', 'router', 'controller','sweetAlert','confi
   'ns_modules/ns_cell/bg-timestampCell',
   'ns_modules/ns_cell/autocompCell',
   'ns_modules/ns_cell/bg-integerCell',
+  'i18n'
 
   ],
 
@@ -117,15 +118,18 @@ function( Marionette, LytRootView, Router, Controller,Swal,config) {
 
     window.checkExitForm = function(confirmCallback,cancelCallback) {
       if(window.formChange && window.formEdition){
+        var title = i18n.translate('swal.savingForm-title');
+        var savingFormContent =  i18n.translate('swal.savingForm-content');
+        var cancelMsg = i18n.translate('button.cancel');
         Swal({
-          title: 'Saving form',
-          text: 'Current form is not yet saved. Would you like to continue without saving it?',
+          title: title,
+          text: savingFormContent,
           type: 'warning',
           showCancelButton: true,
           confirmButtonColor: 'rgb(221, 107, 85)',
           confirmButtonText: 'OK',
           cancelButtonColor: 'grey',
-          cancelButtonText: 'Cancel',
+          cancelButtonText: cancelMsg,
           closeOnConfirm: true,
         },
         function(isConfirm) {
diff --git a/Front/app/locales/en/translation.json b/Front/app/locales/en/translation.json
index 8b1b41100..bbfcf4340 100644
--- a/Front/app/locales/en/translation.json
+++ b/Front/app/locales/en/translation.json
@@ -176,6 +176,10 @@
  		"step2-label" :"Filter",
  		"step3-label" :"Preview",
  		"step4-label" :"File type"
+ 	},
+ 	"swal" : {
+ 		"savingForm-title" : "Saving form",
+ 		"savingForm-content" : "Current form is not yet saved. Would you like to continue without saving it?"
  	}
 
 }
diff --git a/Front/app/locales/fr/translation.json b/Front/app/locales/fr/translation.json
index ab73444bb..d851815bc 100644
--- a/Front/app/locales/fr/translation.json
+++ b/Front/app/locales/fr/translation.json
@@ -173,5 +173,9 @@
  		"step2-label" :"Filtre",
  		"step3-label" :"Aperçu",
  		"step4-label" :"Type de fichier"
+ 	},
+ 	"swal" : {
+ 		"savingForm-title" : "Enregistrement du formulaire",
+ 		"savingForm-content" : "Ce formulaire n'est pas encore enregistré. Voulez vous continuer sans le sauvegarder?"
  	}
 }

From cefb2489defccc07198add2d00c43c81a7b7cc96 Mon Sep 17 00:00:00 2001
From: ktalbi <khaled_talbi@hotmail.com>
Date: Wed, 7 Sep 2016 15:13:40 +0200
Subject: [PATCH 16/30] mask fieldworker field for demo instance in gpx import

---
 .../modules/importFile/gpx/lyt-step1-gpx.js    | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/Front/app/modules/importFile/gpx/lyt-step1-gpx.js b/Front/app/modules/importFile/gpx/lyt-step1-gpx.js
index c99c51014..cb6232417 100644
--- a/Front/app/modules/importFile/gpx/lyt-step1-gpx.js
+++ b/Front/app/modules/importFile/gpx/lyt-step1-gpx.js
@@ -71,6 +71,7 @@ define([
       var fileType = tab[1].toUpperCase();
       var fieldAfield = $('select[name="fieldActivity"]');
       var userBtn = $('button[data-action="add"]');
+      var instance = config.instance;
 
       if (fileType != 'GPX') {
         this.swalError('error file type');
@@ -100,8 +101,9 @@ define([
             $(userBtn).removeAttr('disabled');
             $('#importGpxMsg').addClass('hidden');
             $('.fieldactivity').removeClass('hidden');
-            $(_this.fieldworkers).removeClass('hidden');
-
+            if(instance!='demo') {
+              $(_this.fieldworkers).removeClass('hidden');
+            }
             if (errosList.length > 0) {
               for (var i = 0; i < errosList.length; i++) {
                 _this.displayErrors(errosList[i] + '<br/>');
@@ -171,14 +173,22 @@ define([
       if(error){
         return false;
       }else{
-        var fieldworkers = this.nsform.BBForm.model.get('FieldWorkers');
-        this.setFieldWorkers(fieldworkers);
+        var instance = config.instance;
+        if(instance != 'demo') {
+            var fieldworkers = this.nsform.BBForm.model.get('FieldWorkers');
+            this.setFieldWorkers(fieldworkers);
+        }
         window.app.checkFormSaved = false;
         return true;
       }
     },
     displayForm: function() {
       var model = new GpxForm();
+      // if instance is demo, fieldworker is not required, so hide input
+      var instance = config.instance;
+      if(instance == 'demo') {
+        model.__proto__.schema.FieldWorkers.subschema.FieldWorker.validators = [];
+      }
       this.nsform = new NsForm({
         //name: 'ImportGpxFileForm',
         //modelurl: config.coreUrl+'stations/fileImport',

From 9dc7d8637cfe32077c6165fd91abf4c26a48b978 Mon Sep 17 00:00:00 2001
From: ktalbi <khaled_talbi@hotmail.com>
Date: Wed, 7 Sep 2016 15:55:42 +0200
Subject: [PATCH 17/30] fix bug alert when form is not saved for import gpx

---
 Front/app/modules/importFile/gpx/lyt-step1-gpx.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Front/app/modules/importFile/gpx/lyt-step1-gpx.js b/Front/app/modules/importFile/gpx/lyt-step1-gpx.js
index cb6232417..f0a8c5b3a 100644
--- a/Front/app/modules/importFile/gpx/lyt-step1-gpx.js
+++ b/Front/app/modules/importFile/gpx/lyt-step1-gpx.js
@@ -62,7 +62,7 @@ define([
     },
 
     importFile: function(e) {
-
+      window.formEdition = false;
       var _this = this;
       var file = e.target.files[0];
       var reader = new FileReader();
@@ -82,7 +82,7 @@ define([
         $('#importGpxMsg').removeClass('hidden');
       } else {
         reader.onload = function(e, fileName) {
-          window.app.checkFormSaved = false;
+          window.formEdition = false;
           var xml = e.target.result;
 
           // get waypoints collection
@@ -153,7 +153,7 @@ define([
       var fieldActivity = $(e.target).val();
       this.wayPointList.each(function(model) {
         model.set('fieldActivity', fieldActivity);
-        window.app.checkFormSaved = false;
+         window.formEdition = false; 
       });
     },
     onDestroy: function() {
@@ -178,7 +178,7 @@ define([
             var fieldworkers = this.nsform.BBForm.model.get('FieldWorkers');
             this.setFieldWorkers(fieldworkers);
         }
-        window.app.checkFormSaved = false;
+         window.formEdition = false;
         return true;
       }
     },

From 1cf75d19e4201009369f025469228f6c596899bf Mon Sep 17 00:00:00 2001
From: romfabbro <romain_fabbro@natural-solutions.eu>
Date: Thu, 6 Oct 2016 12:56:33 +0200
Subject: [PATCH 18/30] Sensor detail: add history tab

---
 Back/ecoreleve_server/Views/__init__.py       | 187 +++++++-----
 Back/ecoreleve_server/Views/sensor.py         | 276 +++++++++++-------
 .../sensors/layouts/lyt-sensors-detail.js     |  59 +++-
 .../sensors/templates/tpl-sensors-detail.html |  16 +-
 4 files changed, 349 insertions(+), 189 deletions(-)

diff --git a/Back/ecoreleve_server/Views/__init__.py b/Back/ecoreleve_server/Views/__init__.py
index ce1ece368..10505aab0 100644
--- a/Back/ecoreleve_server/Views/__init__.py
+++ b/Back/ecoreleve_server/Views/__init__.py
@@ -4,49 +4,57 @@
 from pyramid.security import NO_PERMISSION_REQUIRED
 from ..Models import sendLog
 
+
 def add_cors_headers_response_callback(event):
     def cors_headers(request, response):
         response.headers.update({
-        'Access-Control-Allow-Origin': '*',
-        'Access-Control-Allow-Methods': 'POST,GET,DELETE,PUT,OPTIONS',
-        'Access-Control-Allow-Headers': 'Origin, Content-Type, Accept, Authorization',
-        'Access-Control-Allow-Credentials': 'true',
-        'Access-Control-Max-Age': '1728000',
+            'Access-Control-Allow-Origin': '*',
+            'Access-Control-Allow-Methods': 'POST,GET,DELETE,PUT,OPTIONS',
+            'Access-Control-Allow-Headers': 'Origin, Content-Type, Accept, Authorization',
+            'Access-Control-Allow-Credentials': 'true',
+            'Access-Control-Max-Age': '1728000',
         })
     event.request.add_response_callback(cors_headers)
 
-@view_config(context=Exception, permission = NO_PERMISSION_REQUIRED)
+
+@view_config(context=Exception, permission=NO_PERMISSION_REQUIRED)
 def error_view(exc, request):
-    sendLog(logLevel=5,domaine=3)
+    sendLog(logLevel=5, domaine=3)
     return exc
 
 
 def notfound(request):
     return HTTPNotFound('Not found')
 
-### test if the match url is integer
+# test if the match url is integer
+
+
 def integers(*segment_names):
     def predicate(info, request):
         match = info['match']
         for segment_name in segment_names:
             try:
                 match[segment_name] = int(match[segment_name])
-                if int(match[segment_name]) == 0 :
+                if int(match[segment_name]) == 0:
                     return False
             except (TypeError, ValueError):
                 return False
         return True
     return predicate
 
+
 def add_routes(config):
 
     config.add_route('weekData', 'ecoReleve-Core/weekData')
-    config.add_route('location_graph', 'ecoReleve-Core/individuals/location/graph')
+    config.add_route('location_graph',
+                     'ecoReleve-Core/individuals/location/graph')
     config.add_route('station_graph', 'ecoReleve-Core/stations/graph')
-    config.add_route('individual_graph', 'ecoReleve-Core/stats/individuals/graph')
-    config.add_route('individual_monitored', 'ecoReleve-Core/stats/individuals/monitored/graph')
-    config.add_route('uncheckedDatas_graph', 'ecoReleve-Core/sensor/uncheckedDatas/graph')
-
+    config.add_route('individual_graph',
+                     'ecoReleve-Core/stats/individuals/graph')
+    config.add_route('individual_monitored',
+                     'ecoReleve-Core/stats/individuals/monitored/graph')
+    config.add_route('uncheckedDatas_graph',
+                     'ecoReleve-Core/sensor/uncheckedDatas/graph')
 
     # ------------------------------------------------------------------------------------------------------------------------- #
     config.add_route('jsLog', 'ecoReleve-Core/log/error')
@@ -54,17 +62,20 @@ def add_routes(config):
     ##### Security routes #####
     config.add_route('security/login', 'ecoReleve-Core/security/login')
     config.add_route('security/logout', 'ecoReleve-Core/security/logout')
-    config.add_route('security/has_access', 'ecoReleve-Core/security/has_access')
+    config.add_route('security/has_access',
+                     'ecoReleve-Core/security/has_access')
 
     # ------------------------------------------------------------------------------------------------------------------------- #
     ##### User #####
     config.add_route('users/id', 'ecoReleve-Core/users/{id}')
     config.add_route('core/user', 'ecoReleve-Core/user')
     config.add_route('core/currentUser', 'ecoReleve-Core/currentUser')
-    config.add_route('autocomplete/onLoad', 'ecoReleve-Core/autocomplete/{obj}/{prop}/onLoad')
-    config.add_route('autocomplete', 'ecoReleve-Core/autocomplete/{obj}/{prop}')
-    config.add_route('autocomplete/ID', 'ecoReleve-Core/autocomplete/{obj}/{prop}/{valReturn}')
-
+    config.add_route('autocomplete/onLoad',
+                     'ecoReleve-Core/autocomplete/{obj}/{prop}/onLoad')
+    config.add_route(
+        'autocomplete', 'ecoReleve-Core/autocomplete/{obj}/{prop}')
+    config.add_route('autocomplete/ID',
+                     'ecoReleve-Core/autocomplete/{obj}/{prop}/{valReturn}')
 
     # ------------------------------------------------------------------------------------------------------------------------- #
     ##### Stations #####
@@ -72,96 +83,130 @@ def add_routes(config):
     config.add_route('locality', 'ecoReleve-Core/locality')
     config.add_route('stations', 'ecoReleve-Core/stations/')
     config.add_route('stations/export', 'ecoReleve-Core/stations/export')
-    #config.add_route('stations/fileImport', 'ecoReleve-Core/stations/fileImport/{id}') 
-    config.add_route('stations/id', 'ecoReleve-Core/stations/{id}',custom_predicates = (integers('id'),))
+    #config.add_route('stations/fileImport', 'ecoReleve-Core/stations/fileImport/{id}')
+    config.add_route(
+        'stations/id', 'ecoReleve-Core/stations/{id}', custom_predicates=(integers('id'),))
     config.add_route('stations/action', 'ecoReleve-Core/stations/{action}')
 
-
     # ------------------------------------------------------------------------------------------------------------------------- #
     ##### Stations/Protocols #####
-    config.add_route('stations/id/protocols', 'ecoReleve-Core/stations/{id}/protocols',custom_predicates = (integers('id'),))
-    config.add_route('stations/id/protocols/', 'ecoReleve-Core/stations/{id}/protocols/',custom_predicates = (integers('id'),))
-    config.add_route('stations/id/protocols/obs_id', 'ecoReleve-Core/stations/{id}/protocols/{obs_id}',custom_predicates = (integers('id', 'obs_id'),))
-    config.add_route('stations/id/protocols/action', 'ecoReleve-Core/stations/{id}/protocols/{action}')
+    config.add_route('stations/id/protocols',
+                     'ecoReleve-Core/stations/{id}/protocols', custom_predicates=(integers('id'),))
+    config.add_route('stations/id/protocols/',
+                     'ecoReleve-Core/stations/{id}/protocols/', custom_predicates=(integers('id'),))
+    config.add_route('stations/id/protocols/obs_id',
+                     'ecoReleve-Core/stations/{id}/protocols/{obs_id}', custom_predicates=(integers('id', 'obs_id'),))
+    config.add_route('stations/id/protocols/action',
+                     'ecoReleve-Core/stations/{id}/protocols/{action}')
 
     # ------------------------------------------------------------------------------------------------------------------------- #
     ##### Protocols #####
     # config.add_route('protocols', 'ecoReleve-Core/protocols')
     config.add_route('protocols', 'ecoReleve-Core/protocols/')
-    config.add_route('protocols/id', 'ecoReleve-Core/protocols/{id}',custom_predicates = (integers('id'),)) 
-    config.add_route('protocols/action', 'ecoReleve-Core/protocols/{action}') 
+    config.add_route(
+        'protocols/id', 'ecoReleve-Core/protocols/{id}', custom_predicates=(integers('id'),))
+    config.add_route('protocols/action', 'ecoReleve-Core/protocols/{action}')
 
     # ------------------------------------------------------------------------------------------------------------------------- #
     ##### Protocols types #####
     config.add_route('protocolTypes', 'ecoReleve-Core/protocolTypes')
 
     # ------------------------------------------------------------------------------------------------------------------------- #
-    ##### FieldActivity ##### 
+    ##### FieldActivity #####
     config.add_route('fieldActivity', 'ecoReleve-Core/fieldActivity')
-    
+
     # -----------------------------##### Sensors datas (Argos + GSM + RFID) #####----------------------------------------------------- #
-    
+
     config.add_route('sensors/datas', 'ecoReleve-Core/sensors/{type}/datas')
-    config.add_route('sensors/uncheckedDatas', 'ecoReleve-Core/sensors/{type}/uncheckedDatas')
-    config.add_route('sensors/uncheckedDatas/id_indiv/ptt', 'ecoReleve-Core/sensors/{type}/uncheckedDatas/{id_indiv}/{id_ptt}')
+    config.add_route('sensors/uncheckedDatas',
+                     'ecoReleve-Core/sensors/{type}/uncheckedDatas')
+    config.add_route('sensors/uncheckedDatas/id_indiv/ptt',
+                     'ecoReleve-Core/sensors/{type}/uncheckedDatas/{id_indiv}/{id_ptt}')
 
     # ------------------------------------------------------------------------------------------------------------------------- #
     ##### Sensors caracteristics(Argos + GSM + RFID) #####
-    
-    config.add_route('sensors', 'ecoReleve-Core/sensors/') 
-    config.add_route('sensors/insert', 'ecoReleve-Core/sensors') 
+
+    config.add_route('sensors', 'ecoReleve-Core/sensors/')
+    config.add_route('sensors/insert', 'ecoReleve-Core/sensors')
     config.add_route('sensors/export', 'ecoReleve-Core/sensors/export')
-    config.add_route('sensors/id', 'ecoReleve-Core/sensors/{id}',custom_predicates = (integers('id'),))
-    config.add_route('sensors/id/history', 'ecoReleve-Core/sensors/{id}/history',custom_predicates = (integers('id'),))
+    config.add_route(
+        'sensors/id', 'ecoReleve-Core/sensors/{id}', custom_predicates=(integers('id'),))
+    config.add_route('sensors/id/history',
+                     'ecoReleve-Core/sensors/{id}/history', custom_predicates=(integers('id'),))
+    config.add_route('sensors/id/equipment',
+                     'ecoReleve-Core/sensors/{id}/equipment', custom_predicates=(integers('id'),))
     config.add_route('sensors/action', 'ecoReleve-Core/sensors/{action}')
 
-
     # ------------------------------------------------------------------------------------------------------------------------- #
     ##### Individuals #####
-    config.add_route('individuals', 'ecoReleve-Core/individuals/') 
-    config.add_route('individuals/advanced', 'ecoReleve-Core/individuals/advanced/') 
+    config.add_route('individuals', 'ecoReleve-Core/individuals/')
+    config.add_route('individuals/advanced',
+                     'ecoReleve-Core/individuals/advanced/')
     config.add_route('individuals/insert', 'ecoReleve-Core/individuals')
     config.add_route('individuals/export', 'ecoReleve-Core/individuals/export')
-    config.add_route('individuals/id', 'ecoReleve-Core/individuals/{id}',custom_predicates = (integers('id'),))
-    config.add_route('individuals/id/history', 'ecoReleve-Core/individuals/{id}/history',custom_predicates = (integers('id'),))
-    config.add_route('individuals/id/equipment', 'ecoReleve-Core/individuals/{id}/equipment',custom_predicates = (integers('id'),))
-    config.add_route('individuals/id/location', 'ecoReleve-Core/individuals/{id}/locations',custom_predicates = (integers('id'),))
-    config.add_route('individuals/id/location/id_loc', 'ecoReleve-Core/individuals/{id}/locations/{id_loc}',custom_predicates = (integers('id','id_loc'),))
-    config.add_route('individuals/id/history/action', 'ecoReleve-Core/individuals/{id}/history/{action}',custom_predicates = (integers('id'),))
-    config.add_route('individuals/id/location/action', 'ecoReleve-Core/individuals/{id}/locations/{action}',custom_predicates = (integers('id'),))
-    config.add_route('individuals/id/equipment/action', 'ecoReleve-Core/individuals/{id}/equipment/{action}',custom_predicates = (integers('id'),))
-    config.add_route('individuals/advanced/action', 'ecoReleve-Core/individuals/advanced/{action}')
-    config.add_route('individuals/action', 'ecoReleve-Core/individuals/{action}')
+    config.add_route(
+        'individuals/id', 'ecoReleve-Core/individuals/{id}', custom_predicates=(integers('id'),))
+    config.add_route('individuals/id/history',
+                     'ecoReleve-Core/individuals/{id}/history', custom_predicates=(integers('id'),))
+    config.add_route('individuals/id/equipment',
+                     'ecoReleve-Core/individuals/{id}/equipment', custom_predicates=(integers('id'),))
+    config.add_route('individuals/id/location',
+                     'ecoReleve-Core/individuals/{id}/locations', custom_predicates=(integers('id'),))
+    config.add_route('individuals/id/location/id_loc',
+                     'ecoReleve-Core/individuals/{id}/locations/{id_loc}', custom_predicates=(integers('id', 'id_loc'),))
+    config.add_route('individuals/id/history/action',
+                     'ecoReleve-Core/individuals/{id}/history/{action}', custom_predicates=(integers('id'),))
+    config.add_route('individuals/id/location/action',
+                     'ecoReleve-Core/individuals/{id}/locations/{action}', custom_predicates=(integers('id'),))
+    config.add_route('individuals/id/equipment/action',
+                     'ecoReleve-Core/individuals/{id}/equipment/{action}', custom_predicates=(integers('id'),))
+    config.add_route('individuals/advanced/action',
+                     'ecoReleve-Core/individuals/advanced/{action}')
+    config.add_route('individuals/action',
+                     'ecoReleve-Core/individuals/{action}')
 
     # ------------------------------------------------------------------------------------------------------------------------- #
     ##### MonitoredSite #####
-    config.add_route('monitoredSites', 'ecoReleve-Core/monitoredSites/') 
-    config.add_route('monitoredSites/', 'ecoReleve-Core/monitoredSites') 
-    config.add_route('monitoredSites/export', 'ecoReleve-Core/monitoredSites/export') 
-    config.add_route('monitoredSites/id', 'ecoReleve-Core/monitoredSites/{id}',custom_predicates = (integers('id'),))
-    config.add_route('monitoredSites/id/history', 'ecoReleve-Core/monitoredSites/{id}/history/',custom_predicates = (integers('id'),))
-    config.add_route('monitoredSites/id/station', 'ecoReleve-Core/monitoredSites/{id}/stations',custom_predicates = (integers('id'),))
-    config.add_route('monitoredSites/id/equipment', 'ecoReleve-Core/monitoredSites/{id}/equipment',custom_predicates = (integers('id'),))
-    config.add_route('monitoredSites/id/history/action', 'ecoReleve-Core/monitoredSites/{id}/history/{action}',custom_predicates = (integers('id'),))
-    config.add_route('monitoredSites/id/station/action', 'ecoReleve-Core/monitoredSites/{id}/stations/{action}',custom_predicates = (integers('id'),))
-    config.add_route('monitoredSites/id/equipment/action', 'ecoReleve-Core/monitoredSites/{id}/equipment/{action}',custom_predicates = (integers('id'),))
-    config.add_route('monitoredSites/action', 'ecoReleve-Core/monitoredSites/{action}') 
+    config.add_route('monitoredSites', 'ecoReleve-Core/monitoredSites/')
+    config.add_route('monitoredSites/', 'ecoReleve-Core/monitoredSites')
+    config.add_route('monitoredSites/export',
+                     'ecoReleve-Core/monitoredSites/export')
+    config.add_route('monitoredSites/id',
+                     'ecoReleve-Core/monitoredSites/{id}', custom_predicates=(integers('id'),))
+    config.add_route('monitoredSites/id/history',
+                     'ecoReleve-Core/monitoredSites/{id}/history/', custom_predicates=(integers('id'),))
+    config.add_route('monitoredSites/id/station',
+                     'ecoReleve-Core/monitoredSites/{id}/stations', custom_predicates=(integers('id'),))
+    config.add_route('monitoredSites/id/equipment',
+                     'ecoReleve-Core/monitoredSites/{id}/equipment', custom_predicates=(integers('id'),))
+    config.add_route('monitoredSites/id/history/action',
+                     'ecoReleve-Core/monitoredSites/{id}/history/{action}', custom_predicates=(integers('id'),))
+    config.add_route('monitoredSites/id/station/action',
+                     'ecoReleve-Core/monitoredSites/{id}/stations/{action}', custom_predicates=(integers('id'),))
+    config.add_route('monitoredSites/id/equipment/action',
+                     'ecoReleve-Core/monitoredSites/{id}/equipment/{action}', custom_predicates=(integers('id'),))
+    config.add_route('monitoredSites/action',
+                     'ecoReleve-Core/monitoredSites/{action}')
 
     # ------------------------------------------------------------------------------------------------------------------------- #
     ##### Release #####
     config.add_route('release', 'ecoReleve-Core/release/')
-    config.add_route('release/individuals', 'ecoReleve-Core/release/individuals/')
-    config.add_route('release/individuals/action', 'ecoReleve-Core/release/individuals/{action}')
+    config.add_route('release/individuals',
+                     'ecoReleve-Core/release/individuals/')
+    config.add_route('release/individuals/action',
+                     'ecoReleve-Core/release/individuals/{action}')
     config.add_route('release/action', 'ecoReleve-Core/release/{action}')
 
     # ------------------------------------------------------------------------------------------------------------------------- #
     ##### Export #####
     config.add_route('export', 'ecoReleve-Core/export/')
     config.add_route('export/themes', 'ecoReleve-Core/export/themes')
-    config.add_route('export/themes/id/views', 'ecoReleve-Core/export/themes/{id}/views')
-    config.add_route('export/views/id', 'ecoReleve-Core/export/views/{id}/') #geo, datas
-    config.add_route('export/views/id/action', 'ecoReleve-Core/export/views/{id}/{action}') #filtres, cols, count
-    config.add_route('export/views/getFile', 'ecoReleve-Core/export/views/getFile') #getFile
-
-
-
+    config.add_route('export/themes/id/views',
+                     'ecoReleve-Core/export/themes/{id}/views')
+    config.add_route('export/views/id',
+                     'ecoReleve-Core/export/views/{id}/')  # geo, datas
+    # filtres, cols, count
+    config.add_route('export/views/id/action',
+                     'ecoReleve-Core/export/views/{id}/{action}')
+    config.add_route('export/views/getFile',
+                     'ecoReleve-Core/export/views/getFile')  # getFile
diff --git a/Back/ecoreleve_server/Views/sensor.py b/Back/ecoreleve_server/Views/sensor.py
index b528bbccd..b34fb7668 100644
--- a/Back/ecoreleve_server/Views/sensor.py
+++ b/Back/ecoreleve_server/Views/sensor.py
@@ -9,192 +9,246 @@
     MonitoredSite,
     Base,
     SensorList
-    )
+)
 from ..GenericObjets.FrontModules import FrontModules
 from ..GenericObjets import ListObjectWithDynProp
-import json, itertools
+import json
+import itertools
 from datetime import datetime
 import datetime as dt
 import pandas as pd
 import numpy as np
-from sqlalchemy import select, and_,cast, DATE,func,desc,join, distinct,outerjoin,asc
+from sqlalchemy import select, and_, cast, DATE, func, desc, join, distinct, outerjoin, asc
 from sqlalchemy.orm import aliased
 from pyramid.security import NO_PERMISSION_REQUIRED
 from traceback import print_exc
 from collections import OrderedDict
 from datetime import datetime
 import io
-from pyramid.response import Response ,FileResponse
+from pyramid.response import Response, FileResponse
 from ..controllers.security import routes_permission
 from sqlalchemy.exc import IntegrityError
 
 
-
-
 prefix = 'sensors'
 
 # ------------------------------------------------------------------------------------------------------------------------- #
-@view_config(route_name= prefix+'/action', renderer='json', request_method = 'GET')
+
+
+@view_config(route_name=prefix + '/action', renderer='json', request_method='GET')
 #@view_config(route_name= prefix+'/id/history/action', renderer='json', request_method = 'GET')
 def actionOnSensors(request):
     dictActionFunc = {
-    'count' : count_,
-    'forms' : getForms,
-    '0' : getForms,
-    'getFields': getFields,
-    'getFilters': getFilters,
-    'getModels' : getSensorModels,
-    'getCompany' : getCompany,
-    'getSerialNumber' : getSerialNumber,
-    'getType' : getSensorType,
-    'getUnicIdentifier' : getUnicIdentifier
+        'count': count_,
+        'forms': getForms,
+        '0': getForms,
+        'getFields': getFields,
+        'getFilters': getFilters,
+        'getModels': getSensorModels,
+        'getCompany': getCompany,
+        'getSerialNumber': getSerialNumber,
+        'getType': getSensorType,
+        'getUnicIdentifier': getUnicIdentifier
     }
     actionName = request.matchdict['action']
     return dictActionFunc[actionName](request)
 
-def count_ (request = None,listObj = None):
+
+def count_(request=None, listObj=None):
     session = request.dbsession
-    if request is not None : 
+    if request is not None:
         data = request.params
-        if 'criteria' in data: 
+        if 'criteria' in data:
             data['criteria'] = json.loads(data['criteria'])
-            if data['criteria'] != {} :
-                searchInfo['criteria'] = [obj for obj in data['criteria'] if obj['Value'] != str(-1) ]
+            if data['criteria'] != {}:
+                searchInfo['criteria'] = [obj for obj in data[
+                    'criteria'] if obj['Value'] != str(-1)]
 
         listObj = ListObjectWithDynProp(Sensor)
-        count = listObj.count(searchInfo = searchInfo)
-    else : 
+        count = listObj.count(searchInfo=searchInfo)
+    else:
         count = listObj.count()
-    return count 
+    return count
+
 
-def getFilters (request):
+def getFilters(request):
     ModuleType = 'SensorFilter'
     filtersList = Sensor().GetFilters(ModuleType)
     filters = {}
-    for i in range(len(filtersList)) :
+    for i in range(len(filtersList)):
         filters[str(i)] = filtersList[i]
     return filters
 
-def getForms(request) :
+
+def getForms(request):
     session = request.dbsession
     typeSensor = request.params['ObjectType']
     ModuleName = 'SensorForm'
-    Conf = session.query(FrontModules).filter(FrontModules.Name==ModuleName ).first()
-    newSensor = Sensor(FK_SensorType = typeSensor)
+    Conf = session.query(FrontModules).filter(
+        FrontModules.Name == ModuleName).first()
+    newSensor = Sensor(FK_SensorType=typeSensor)
     newSensor.init_on_load()
-    schema = newSensor.GetDTOWithSchema(Conf,'edit')
+    schema = newSensor.GetDTOWithSchema(Conf, 'edit')
 
     return schema
 
-def getFields(request) :
+
+def getFields(request):
     session = request.dbsession
     ModuleType = request.params['name']
-    if ModuleType == 'default' :
+    if ModuleType == 'default':
         ModuleType = 'SensorFilter'
     cols = Sensor().GetGridFields(ModuleType)
 
     return cols
 
+
 def getSensorModels(request):
     session = request.dbsession
     sensorType = request.params['sensorType']
-    query = select([distinct(Sensor.Model)]).where(Sensor.FK_SensorType == sensorType)
-    response = getData(query,session)
+    query = select([distinct(Sensor.Model)]).where(
+        Sensor.FK_SensorType == sensorType)
+    response = getData(query, session)
 
     return response
 
-def getCompany (request):
+
+def getCompany(request):
     session = request.dbsession
     sensorType = request.params['sensorType']
-    query = select([distinct(Sensor.Compagny)]).where(Sensor.FK_SensorType == sensorType)
-    response = getData(query,session)
+    query = select([distinct(Sensor.Compagny)]).where(
+        Sensor.FK_SensorType == sensorType)
+    response = getData(query, session)
 
     return response
 
-def getSerialNumber (request):
+
+def getSerialNumber(request):
     session = request.dbsession
     sensorType = request.params['sensorType']
-    query = select([distinct(Sensor.SerialNumber)]).where(Sensor.FK_SensorType == sensorType)
-    response = getData(query,session)
+    query = select([distinct(Sensor.SerialNumber)]).where(
+        Sensor.FK_SensorType == sensorType)
+    response = getData(query, session)
 
     return response
 
-def getUnicIdentifier (request):
+
+def getUnicIdentifier(request):
     session = request.dbsession
     sensorType = request.params['sensorType']
-    query = select([Sensor.UnicIdentifier.label('label'),Sensor.ID.label('val')]).where(Sensor.FK_SensorType == sensorType)
-    response = [ OrderedDict(row) for row in session.execute(query).fetchall()]
+    query = select([Sensor.UnicIdentifier.label('label'), Sensor.ID.label(
+        'val')]).where(Sensor.FK_SensorType == sensorType)
+    response = [OrderedDict(row) for row in session.execute(query).fetchall()]
 
     return response
 
-def getData(query,session):
+
+def getData(query, session):
     result = session.execute(query).fetchall()
     response = []
     for row in result:
         curRow = OrderedDict(row)
         dictRow = {}
-        for key in curRow :
-            if curRow[key] is not None :
+        for key in curRow:
+            if curRow[key] is not None:
                 response.append(curRow[key])
     return response
 
+
 def getSensorType(request):
     session = request.dbsession
-    query = select([SensorType.ID.label('val'), SensorType.Name.label('label')])
-    response = [ OrderedDict(row) for row in session.execute(query).fetchall()]
+    query = select([SensorType.ID.label('val'),
+                    SensorType.Name.label('label')])
+    response = [OrderedDict(row) for row in session.execute(query).fetchall()]
 
     return response
 
 # ------------------------------------------------------------------------------------------------------------------------- #
-@view_config(route_name= prefix+'/id', renderer='json', request_method = 'GET')
+
+
+@view_config(route_name=prefix + '/id', renderer='json', request_method='GET')
 def getSensor(request):
     session = request.dbsession
     id = request.matchdict['id']
     curSensor = session.query(Sensor).get(id)
     curSensor.LoadNowValues()
 
-    # if Form value exists in request --> return data with schema else return only data
-    if 'FormName' in request.params :
+    # if Form value exists in request --> return data with schema else return
+    # only data
+    if 'FormName' in request.params:
         ModuleName = request.params['FormName']
-        try :
+        try:
             DisplayMode = request.params['DisplayMode']
-        except : 
+        except:
             DisplayMode = 'display'
-        Conf = session.query(FrontModules).filter(FrontModules.Name=='SensorForm').first()
-        response = curSensor.GetDTOWithSchema(Conf,DisplayMode)
-    elif 'geo' in request.params :
-        geoJson=[]
-        result = {'type':'FeatureCollection', 'features':geoJson}
+        Conf = session.query(FrontModules).filter(
+            FrontModules.Name == 'SensorForm').first()
+        response = curSensor.GetDTOWithSchema(Conf, DisplayMode)
+    elif 'geo' in request.params:
+        geoJson = []
+        result = {'type': 'FeatureCollection', 'features': geoJson}
         response = result
-    else : 
-        response  = curSensor.GetFlatObject()
+    else:
+        response = curSensor.GetFlatObject()
 
     return response
 
 # ------------------------------------------------------------------------------------------------------------------------- #
 
-@view_config(route_name= prefix+'/id/history', renderer='json', request_method = 'GET')
+
+@view_config(route_name=prefix + '/id/history', renderer='json', request_method='GET', permission=routes_permission[prefix]['GET'])
 def getSensorHistory(request):
     session = request.dbsession
     id = request.matchdict['id']
+
+    tableJoin = join(SensorDynPropValue, SensorDynProp,
+                     SensorDynPropValue.FK_SensorDynProp == SensorDynProp.ID)
+    query = select([SensorDynPropValue, SensorDynProp.Name]).select_from(tableJoin).where(
+        SensorDynPropValue.FK_Sensor == id
+    ).order_by(desc(SensorDynPropValue.StartDate))
+
+    result = session.execute(query).fetchall()
+    response = []
+
+    for row in result:
+        curRow = OrderedDict(row)
+        dictRow = {}
+        for key in curRow:
+            if curRow[key] is not None:
+                if 'Value' in key:
+                    dictRow['value'] = curRow[key]
+                elif 'FK' not in key:
+                    dictRow[key] = curRow[key]
+        dictRow['StartDate'] = curRow[
+            'StartDate'].strftime('%Y-%m-%d %H:%M:%S')
+        response.append(dictRow)
+
+    return response
+
+
+@view_config(route_name=prefix + '/id/equipment', renderer='json', request_method='GET')
+def getSensorEquipment(request):
+    session = request.dbsession
+    id = request.matchdict['id']
     curSensor = session.query(Sensor).get(id)
     curSensorType = curSensor.GetType().Name
 
-    if ('RFID' in curSensorType.upper()) :
+    if ('RFID' in curSensorType.upper()):
         table = Base.metadata.tables['MonitoredSiteEquipment']
-        joinTable = join(table,Sensor, table.c['FK_Sensor'] == Sensor.ID)
-        joinTable = join(joinTable,MonitoredSite, table.c['FK_MonitoredSite'] == MonitoredSite.ID)
-        query = select([table.c['StartDate'],table.c['EndDate'],Sensor.UnicIdentifier,MonitoredSite.Name, MonitoredSite.ID.label('MonitoredSiteID')]).select_from(joinTable
-            ).where(table.c['FK_Sensor'] == id
-            ).order_by(desc(table.c['StartDate']))
-
-    elif (curSensorType.lower() in ['gsm','satellite','vhf']):
+        joinTable = join(table, Sensor, table.c['FK_Sensor'] == Sensor.ID)
+        joinTable = join(joinTable, MonitoredSite, table.c[
+                         'FK_MonitoredSite'] == MonitoredSite.ID)
+        query = select([table.c['StartDate'], table.c['EndDate'], Sensor.UnicIdentifier, MonitoredSite.Name, MonitoredSite.ID.label('MonitoredSiteID')]).select_from(joinTable
+                                                                                                                                                                     ).where(table.c['FK_Sensor'] == id
+                                                                                                                                                                             ).order_by(desc(table.c['StartDate']))
+
+    elif (curSensorType.lower() in ['gsm', 'satellite', 'vhf']):
         table = Base.metadata.tables['IndividualEquipment']
-        joinTable = join(table,Sensor, table.c['FK_Sensor'] == Sensor.ID)
-        query = select([table.c['StartDate'],table.c['EndDate'],table.c['FK_Individual'],Sensor.UnicIdentifier]).select_from(joinTable
-            ).where(table.c['FK_Sensor'] == id
-            ).order_by(desc(table.c['StartDate']))
-    else :
+        joinTable = join(table, Sensor, table.c['FK_Sensor'] == Sensor.ID)
+        query = select([table.c['StartDate'], table.c['EndDate'], table.c['FK_Individual'], Sensor.UnicIdentifier]).select_from(joinTable
+                                                                                                                                ).where(table.c['FK_Sensor'] == id
+                                                                                                                                        ).order_by(desc(table.c['StartDate']))
+    else:
         return 'bad request'
 
     result = session.execute(query).fetchall()
@@ -202,14 +256,17 @@ def getSensorHistory(request):
     for row in result:
         curRow = OrderedDict(row)
         curRow['StartDate'] = curRow['StartDate'].strftime('%Y-%m-%d %H:%M:%S')
-        curRow['EndDate'] = curRow['EndDate'].strftime('%Y-%m-%d %H:%M:%S') if curRow['EndDate'] is not None else None
+        curRow['EndDate'] = curRow['EndDate'].strftime(
+            '%Y-%m-%d %H:%M:%S') if curRow['EndDate'] is not None else None
         curRow['format'] = 'YYYY-MM-DD HH:mm:ss'
         response.append(curRow)
 
     return response
 
 # ------------------------------------------------------------------------------------------------------------------------- #
-@view_config(route_name= prefix+'/id', renderer='json', request_method = 'DELETE',permission = routes_permission[prefix]['DELETE'])
+
+
+@view_config(route_name=prefix + '/id', renderer='json', request_method='DELETE', permission=routes_permission[prefix]['DELETE'])
 def deleteSensor(request):
     session = request.dbsession
     id_ = request.matchdict['id']
@@ -219,7 +276,9 @@ def deleteSensor(request):
     return True
 
 # ------------------------------------------------------------------------------------------------------------------------- #
-@view_config(route_name= prefix+'/id', renderer='json', request_method = 'PUT',permission = routes_permission[prefix]['PUT'])
+
+
+@view_config(route_name=prefix + '/id', renderer='json', request_method='PUT', permission=routes_permission[prefix]['PUT'])
 def updateSensor(request):
     session = request.dbsession
     data = request.json_body
@@ -231,27 +290,33 @@ def updateSensor(request):
     return {}
 
 # ------------------------------------------------------------------------------------------------------------------------- #
-@view_config(route_name= prefix + '/insert', renderer='json', request_method = 'POST',permission = routes_permission[prefix]['POST'])
+
+
+@view_config(route_name=prefix + '/insert', renderer='json', request_method='POST', permission=routes_permission[prefix]['POST'])
 def insertSensor(request):
     data = request.json_body
-    if not isinstance(data,list):
+    if not isinstance(data, list):
         return insertOneNewSensor(request)
-    else :
+    else:
         print('_______INsert LIST')
-        #transaction.commit()
-        #return insertListNewSensord(request)
+        # transaction.commit()
+        # return insertListNewSensord(request)
 
 # ------------------------------------------------------------------------------------------------------------------------- #
-def insertOneNewSensor (request) :
+
+
+def insertOneNewSensor(request):
     session = request.dbsession
     data = {}
-    for items , value in request.json_body.items() :
+    for items, value in request.json_body.items():
         data[items] = value
 
     try:
         sensorType = int(data['FK_SensorType'])
-        newSensor = Sensor(FK_SensorType = sensorType , creationDate = datetime.now())
-        newSensor.SensorType = session.query(SensorType).filter(SensorType.ID== sensorType).first()
+        newSensor = Sensor(FK_SensorType=sensorType,
+                           creationDate=datetime.now())
+        newSensor.SensorType = session.query(SensorType).filter(
+            SensorType.ID == sensorType).first()
         newSensor.init_on_load()
         newSensor.UpdateFromJson(data)
 
@@ -269,53 +334,61 @@ def insertOneNewSensor (request) :
     return response
 
 # ------------------------------------------------------------------------------------------------------------------------- #
-@view_config(route_name= prefix, renderer='json', request_method = 'GET')
+
+
+@view_config(route_name=prefix, renderer='json', request_method='GET')
 def searchSensor(request):
     session = request.dbsession
     data = request.params.mixed()
     searchInfo = {}
     searchInfo['criteria'] = []
-    if 'criteria' in data: 
+    if 'criteria' in data:
         data['criteria'] = json.loads(data['criteria'])
-        if data['criteria'] != {} :
-            searchInfo['criteria'] = [obj for obj in data['criteria'] if obj['Value'] != str(-1) ]
+        if data['criteria'] != {}:
+            searchInfo['criteria'] = [obj for obj in data[
+                'criteria'] if obj['Value'] != str(-1)]
 
     searchInfo['order_by'] = json.loads(data['order_by'])
     searchInfo['offset'] = json.loads(data['offset'])
     searchInfo['per_page'] = json.loads(data['per_page'])
 
     ModuleType = 'SensorFilter'
-    moduleFront  = session.query(FrontModules).filter(FrontModules.Name == ModuleType).one()
+    moduleFront = session.query(FrontModules).filter(
+        FrontModules.Name == ModuleType).one()
 
     listObj = SensorList(moduleFront)
     dataResult = listObj.GetFlatDataList(searchInfo)
 
     countResult = listObj.count(searchInfo)
-    result = [{'total_entries':countResult}]
+    result = [{'total_entries': countResult}]
     result.append(dataResult)
 
     return result
 
+
 @view_config(route_name=prefix + '/export', renderer='json', request_method='GET')
 def sensors_export(request):
     session = request.dbsession
     data = request.params.mixed()
     searchInfo = {}
     searchInfo['criteria'] = []
-    if 'criteria' in data: 
+    if 'criteria' in data:
         data['criteria'] = json.loads(data['criteria'])
-        if data['criteria'] != {} :
-            searchInfo['criteria'] = [obj for obj in data['criteria'] if obj['Value'] != str(-1) ]
+        if data['criteria'] != {}:
+            searchInfo['criteria'] = [obj for obj in data[
+                'criteria'] if obj['Value'] != str(-1)]
 
     searchInfo['order_by'] = []
 
     ModuleType = 'SensorFilter'
-    moduleFront  = session.query(FrontModules).filter(FrontModules.Name == ModuleType).one()
+    moduleFront = session.query(FrontModules).filter(
+        FrontModules.Name == ModuleType).one()
 
     listObj = SensorList(moduleFront)
     dataResult = listObj.GetFlatDataList(searchInfo)
 
-    df = pd.DataFrame.from_records(dataResult, columns=dataResult[0].keys(), coerce_float=True)
+    df = pd.DataFrame.from_records(dataResult, columns=dataResult[
+                                   0].keys(), coerce_float=True)
 
     fout = io.BytesIO()
     writer = pd.ExcelWriter(fout)
@@ -324,9 +397,4 @@ def sensors_export(request):
     file = fout.getvalue()
 
     dt = datetime.now().strftime('%d-%m-%Y')
-    return Response(file,content_disposition= "attachment; filename=sensor_export_"+dt+".xlsx",content_type='application/vnd.openxmlformats-officedocument.spreadsheetml.sheet')
-
-
-
-
-
+    return Response(file, content_disposition="attachment; filename=sensor_export_" + dt + ".xlsx", content_type='application/vnd.openxmlformats-officedocument.spreadsheetml.sheet')
diff --git a/Front/app/modules/sensors/layouts/lyt-sensors-detail.js b/Front/app/modules/sensors/layouts/lyt-sensors-detail.js
index 3eac21b77..1662f0017 100644
--- a/Front/app/modules/sensors/layouts/lyt-sensors-detail.js
+++ b/Front/app/modules/sensors/layouts/lyt-sensors-detail.js
@@ -31,11 +31,11 @@ define([
       'click .tab-link': 'displayTab',
     },
     ui: {
-      'grid': '#grid',
+      'gridHistory': '#gridHistory',
       'gridEquipment': '#gridEquipment',
       'form': '#form',
       'map': '#map',
-      'paginator': '#paginator',
+      'paginatorHistory': '#paginatorHistory',
       'paginatorEquipment': '#paginatorEquipment',
       'details': '#sensorLeft',
       'mapContainer': '#sensorRight',
@@ -108,6 +108,17 @@ define([
       });
     },
 
+    displayTab: function(e) {
+      e.preventDefault();
+      var ele = $(e.target);
+      var tabLink = $(ele).attr('href');
+      var tabUnLink = $('li.active.tab-ele a').attr('href');
+      $('li.active.tab-ele').removeClass('active');
+      $(ele).parent().addClass('active');
+      $(tabLink).addClass('in active');
+      $(tabUnLink).removeClass('active in');
+    },
+
     displayForm: function(id) {
       this.nsform = new NsForm({
         name: 'SensorForm',
@@ -136,7 +147,7 @@ define([
 
     displayGrid: function(id) {
       var _this = this;
-      var cols = [{
+      var colsEquipment = [{
         name: 'FK_Individual',
         label: 'Individual id',
         editable: false,
@@ -147,8 +158,8 @@ define([
             var rawValue = this.model.get(this.column.get("name"));
             var formattedValue = this.formatter.fromRaw(rawValue, this.model);
 
-            if (this.model.get('FK_Individual')){ 
-              this.$el.append('<a target="_blank"' 
+            if (this.model.get('FK_Individual')){
+              this.$el.append('<a target="_blank"'
                 +'href= "http://'+window.location.hostname+window.location.pathname+'#individuals/'+this.model.get('FK_Individual')+'">\
                   '+rawValue +'&nbsp;&nbsp;&nbsp;<span class="reneco reneco-info" ></span>\
                 </a>');
@@ -170,7 +181,7 @@ define([
               var formattedValue = this.formatter.fromRaw(rawValue, this.model);
 
               if (this.model.get('Name')){
-                this.$el.append('<a target="_blank"' 
+                this.$el.append('<a target="_blank"'
                   +'href= "http://'+window.location.hostname+window.location.pathname+'#monitoredSites/'+this.model.get('MonitoredSiteID')+'">\
                     '+rawValue +'&nbsp;&nbsp;&nbsp;<span class="reneco reneco-info" ></span>\
                   </a>');
@@ -195,16 +206,44 @@ define([
         headerCell : null
       }
       ];
-      this.grid = new NsGrid({
+      this.gridEquipment = new NsGrid({
         pageSize: 20,
-        columns: cols,
+        columns: colsEquipment,
+        pagingServerSide: false,
+        url: config.coreUrl + 'sensors/' + id  + '/equipment',
+        urlParams: this.urlParams,
+        rowClicked: true,
+      });
+
+      var colsHisto = [{
+        name: 'Name',
+        label: 'Name',
+        editable: false,
+        cell: 'string'
+      }, {
+        name: 'value',
+        label: 'Value',
+        editable: false,
+        cell: 'string'
+      }, {
+        name: 'StartDate',
+        label: 'Start Date',
+        editable: false,
+        cell: 'stringDate',
+      },];
+      this.gridHistory = new NsGrid({
+        pageSize: 20,
+        columns: colsHisto,
         pagingServerSide: false,
         url: config.coreUrl + 'sensors/' + id  + '/history',
         urlParams: this.urlParams,
         rowClicked: true,
       });
-      this.ui.grid.html(this.grid.displayGrid());
-      this.ui.paginator.html(this.grid.displayPaginator());
+
+      this.ui.gridEquipment.html(this.gridEquipment.displayGrid());
+      this.ui.paginatorEquipment.html(this.gridEquipment.displayPaginator());
+      this.ui.gridHistory.html(this.gridHistory.displayGrid());
+      this.ui.paginatorHistory.html(this.gridHistory.displayPaginator());
     }
   });
 
diff --git a/Front/app/modules/sensors/templates/tpl-sensors-detail.html b/Front/app/modules/sensors/templates/tpl-sensors-detail.html
index bb76d7c44..5fa663ca6 100644
--- a/Front/app/modules/sensors/templates/tpl-sensors-detail.html
+++ b/Front/app/modules/sensors/templates/tpl-sensors-detail.html
@@ -17,17 +17,25 @@
   <br/>
   <div id = "ongletGrid">
     <ul class="nav nav-tabs">
-      <li class="active tab-ele"><a class= "tab-link">History</a>
+      <li class="active tab-ele"><a class= "tab-link" href="#Sensor_history">History</a>
+      </li>
+      <li class="tab-ele"><a class= "tab-link" href="#Sensor_equipment">Deployment</a>
       </li>
     </ul>
   </div>
     <div class="tab-content">
       <div id="Sensor_history" class="tab-pane fade in active">
-            <div id="grid"></div>
-          <div id="paginator"></div>
+            <div id="gridHistory"></div>
+          <div id="paginatorHistory"></div>
+      </div>
+
+      <div id="Sensor_equipment" class="tab-pane fade">
+        <div id="gridEquipment"></div>
+        <div id="paginatorEquipment"></div>
       </div>
+
   </div>
-  
+
   </div>
 </div>
 

From 5cc22bba396433919a2e16c7d9cef0d5b27dcb82 Mon Sep 17 00:00:00 2001
From: romfabbro <romain_fabbro@natural-solutions.eu>
Date: Thu, 6 Oct 2016 12:56:53 +0200
Subject: [PATCH 19/30] Individual details: add link to sensor in tab equipment

---
 Back/ecoreleve_server/Views/individual.py     | 364 ++++++++++--------
 .../layouts/lyt-individuals-detail.js         |  25 +-
 2 files changed, 224 insertions(+), 165 deletions(-)

diff --git a/Back/ecoreleve_server/Views/individual.py b/Back/ecoreleve_server/Views/individual.py
index 8a043b146..2aeb1ee23 100644
--- a/Back/ecoreleve_server/Views/individual.py
+++ b/Back/ecoreleve_server/Views/individual.py
@@ -12,16 +12,17 @@
     Base,
     IndivLocationList,
     Station
-    )
+)
 from ..GenericObjets.FrontModules import FrontModules
 from ..GenericObjets import ListObjectWithDynProp
 import transaction
-import json, itertools
+import json
+import itertools
 from datetime import datetime
 import datetime as dt
 import pandas as pd
 import numpy as np
-from sqlalchemy import select, and_,cast, DATE,func,desc,join,asc
+from sqlalchemy import select, and_, cast, DATE, func, desc, join, asc
 from sqlalchemy.orm import aliased
 from pyramid.security import NO_PERMISSION_REQUIRED
 from traceback import print_exc
@@ -29,128 +30,144 @@
 from ..utils.distance import haversine
 from ..utils.generator import Generator
 import io
-from pyramid.response import Response ,FileResponse
+from pyramid.response import Response, FileResponse
 from pyramid import threadlocal
 from ..controllers.security import routes_permission
 
 prefix = 'individuals'
 
 # ------------------------------------------------------------------------------------------------------------------------- #
-@view_config(route_name= prefix+'/action', renderer='json', request_method = 'GET',permission = routes_permission[prefix]['GET'])
-@view_config(route_name= prefix+'/id/history/action', renderer='json', request_method = 'GET',permission = routes_permission[prefix]['GET'])
-@view_config(route_name= prefix+'/id/equipment/action', renderer='json', request_method = 'GET',permission = routes_permission[prefix]['GET'])
+
+
+@view_config(route_name=prefix + '/action', renderer='json', request_method='GET', permission=routes_permission[prefix]['GET'])
+@view_config(route_name=prefix + '/id/history/action', renderer='json', request_method='GET', permission=routes_permission[prefix]['GET'])
+@view_config(route_name=prefix + '/id/equipment/action', renderer='json', request_method='GET', permission=routes_permission[prefix]['GET'])
 def actionOnIndividuals(request):
     dictActionFunc = {
-    'count' : count_,
-    'forms' : getForms,
-    '0' : getForms,
-    'getFields': getFields,
-    'getFilters': getFilters,
-    'getType': getIndividualType
+        'count': count_,
+        'forms': getForms,
+        '0': getForms,
+        'getFields': getFields,
+        'getFilters': getFilters,
+        'getType': getIndividualType
     }
     actionName = request.matchdict['action']
     return dictActionFunc[actionName](request)
 
-def count_ (request = None,listObj = None) :
+
+def count_(request=None, listObj=None):
     session = request.dbsession
     ModuleType = 'IndivFilter'
-    moduleFront  = session.query(FrontModules).filter(FrontModules.Name == ModuleType).one()
-    if request is not None : 
+    moduleFront = session.query(FrontModules).filter(
+        FrontModules.Name == ModuleType).one()
+    if request is not None:
         data = request.params
-        if 'criteria' in data: 
+        if 'criteria' in data:
             data['criteria'] = json.loads(data['criteria'])
-            if data['criteria'] != {} :
-                searchInfo['criteria'] = [obj for obj in data['criteria'] if obj['Value'] != str(-1) ]
-        else : 
-            searchInfo = {'criteria':[]}
-        searchInfo['criteria'].append({'Column':'FK_IndividualType','Operator': '=', 'Value':1})
-        listObj = ListObjectWithDynProp(Individual,moduleFront)
-        count = listObj.count(searchInfo = searchInfo)
-    else : 
+            if data['criteria'] != {}:
+                searchInfo['criteria'] = [obj for obj in data[
+                    'criteria'] if obj['Value'] != str(-1)]
+        else:
+            searchInfo = {'criteria': []}
+        searchInfo['criteria'].append(
+            {'Column': 'FK_IndividualType', 'Operator': '=', 'Value': 1})
+        listObj = ListObjectWithDynProp(Individual, moduleFront)
+        count = listObj.count(searchInfo=searchInfo)
+    else:
         count = listObj.count()
-    return count 
+    return count
+
 
-def getFilters (request):
+def getFilters(request):
     session = request.dbsession
-    if 'typeObj' in request.params :
+    if 'typeObj' in request.params:
         objType = request.params['typeObj']
-    else : 
+    else:
         objType = 1
     if 'FilterName' in request.params and request.params['FilterName'] != '':
         ModuleType = request.params['FilterName']
     else:
         ModuleType = 'IndivFilter'
 
-    filtersList = Individual(FK_IndividualType = objType).GetFilters(ModuleType)
+    filtersList = Individual(FK_IndividualType=objType).GetFilters(ModuleType)
     filters = {}
-    for i in range(len(filtersList)) :
+    for i in range(len(filtersList)):
         filters[str(i)] = filtersList[i]
     return filters
 
-def getForms(request) :
+
+def getForms(request):
     session = request.dbsession
     typeIndiv = request.params['ObjectType']
     ModuleName = 'IndivForm'
-    Conf = session.query(FrontModules).filter(FrontModules.Name==ModuleName ).first()
-    newIndiv = Individual(FK_IndividualType = typeIndiv)
+    Conf = session.query(FrontModules).filter(
+        FrontModules.Name == ModuleName).first()
+    newIndiv = Individual(FK_IndividualType=typeIndiv)
     newIndiv.init_on_load()
-    schema = newIndiv.GetDTOWithSchema(Conf,'edit')
+    schema = newIndiv.GetDTOWithSchema(Conf, 'edit')
     return schema
 
-def getFields(request) :
+
+def getFields(request):
     session = request.dbsession
 
-    if 'typeObj' in request.params :
+    if 'typeObj' in request.params:
         objType = request.params['typeObj']
-    else : 
+    else:
         objType = 1
 
     ModuleType = request.params['name']
-    if ModuleType in ['default','AdvancedIndivFilter'] :
+    if ModuleType in ['default', 'AdvancedIndivFilter']:
         ModuleType = 'IndivFilter'
-    cols = Individual(FK_IndividualType = objType).GetGridFields(ModuleType)
+    cols = Individual(FK_IndividualType=objType).GetGridFields(ModuleType)
     return cols
 
+
 def getIndividualType(request):
     session = request.dbsession
 
-    query = select([IndividualType.ID.label('val'), IndividualType.Name.label('label')])
-    response = [ OrderedDict(row) for row in session.execute(query).fetchall()]
+    query = select([IndividualType.ID.label('val'),
+                    IndividualType.Name.label('label')])
+    response = [OrderedDict(row) for row in session.execute(query).fetchall()]
     return response
 
 # ------------------------------------------------------------------------------------------------------------------------- #
-@view_config(route_name= prefix+'/id', renderer='json', request_method = 'GET',permission = routes_permission[prefix]['GET'])
+
+
+@view_config(route_name=prefix + '/id', renderer='json', request_method='GET', permission=routes_permission[prefix]['GET'])
 def getIndiv(request):
     session = request.dbsession
     id = request.matchdict['id']
     curIndiv = session.query(Individual).get(id)
     curIndiv.LoadNowValues()
 
-    # if Form value exists in request --> return data with schema else return only data
-    if 'FormName' in request.params :
+    # if Form value exists in request --> return data with schema else return
+    # only data
+    if 'FormName' in request.params:
         ModuleName = request.params['FormName']
-        try :
+        try:
             DisplayMode = request.params['DisplayMode']
-        except : 
+        except:
             DisplayMode = 'display'
-        Conf = session.query(FrontModules).filter(FrontModules.Name=='IndivForm').first()
-        response = curIndiv.GetDTOWithSchema(Conf,DisplayMode)
-
-    elif 'geo' in request.params :
-        geoJson=[]
-        joinTable = join(Individual_Location, Sensor, Individual_Location.FK_Sensor == Sensor.ID)
-        stmt = select([Individual_Location,Sensor.UnicIdentifier]).select_from(joinTable
-            ).where(Individual_Location.FK_Individual == id)
+        Conf = session.query(FrontModules).filter(
+            FrontModules.Name == 'IndivForm').first()
+        response = curIndiv.GetDTOWithSchema(Conf, DisplayMode)
+
+    elif 'geo' in request.params:
+        geoJson = []
+        joinTable = join(Individual_Location, Sensor,
+                         Individual_Location.FK_Sensor == Sensor.ID)
+        stmt = select([Individual_Location, Sensor.UnicIdentifier]).select_from(joinTable
+                                                                                ).where(Individual_Location.FK_Individual == id)
         dataResult = session.execute(stmt).fetchall()
 
         for row in dataResult:
-            geoJson.append({'type':'Feature', 'properties':{'type':row['type_']
-                , 'sensor':row['UnicIdentifier'],'date':row['Date'],'ID':row['ID']}
-                , 'geometry':{'type':'Point', 'coordinates':[row['LAT'],row['LON']]}})
-        result = {'type':'FeatureCollection', 'features':geoJson}
+            geoJson.append({'type': 'Feature', 'properties': {'type': row['type_'], 'sensor': row['UnicIdentifier'], 'date': row[
+                           'Date'], 'ID': row['ID']}, 'geometry': {'type': 'Point', 'coordinates': [row['LAT'], row['LON']]}})
+        result = {'type': 'FeatureCollection', 'features': geoJson}
         response = result
-    else : 
-        response  = curIndiv.GetFlatObject()
+    else:
+        response = curIndiv.GetFlatObject()
     # if 'geoDynamic' in request.params :
     #     geoJson=[]
     #     joinTable = join(Individual_Location, Sensor, Individual_Location.FK_Sensor == Sensor.ID)
@@ -158,14 +175,14 @@ def getIndiv(request):
     #         ).where(Individual_Location.FK_Individual == id
     #         ).where(Individual_Location.type_ == 'GSM').order_by(asc(Individual_Location.Date))
     #     dataResult = session.execute(stmt).fetchall()
-        
+
     #     df = pd.DataFrame.from_records(dataResult, columns=dataResult[0].keys(), coerce_float=True)
     #     X1 = df.iloc[:-1][['LAT', 'LON']].values
     #     X2 = df.iloc[1:][['LAT', 'LON']].values
     #     df['dist'] = np.append(haversine(X1, X2), 0).round(3)
     #     # Compute the speed
     #     df['speed'] = (df['dist'] / ((df['Date'] - df['Date'].shift(-1)).fillna(1) / np.timedelta64(1, 'h'))).round(3)
-    #     df['Date'] = df['Date'].apply(lambda row: np.datetime64(row).astype(datetime)) 
+    #     df['Date'] = df['Date'].apply(lambda row: np.datetime64(row).astype(datetime))
 
     #     for i in range(df.shape[0]):
     #         geoJson.append({'type':'Feature', 'properties':{'type':df.loc[i,'type_']
@@ -173,59 +190,65 @@ def getIndiv(request):
     #             , 'geometry':{'type':'Point', 'coordinates':[df.loc[i,'LAT'],df.loc[i,'LON']]}})
     #     result = {'type':'FeatureCollection', 'features':geoJson}
     #     response = result
-    # else : 
+    # else :
     #     response  = curIndiv.GetFlatObject()
     return response
 
 # ------------------------------------------------------------------------------------------------------------------------- #
-@view_config(route_name= prefix+'/id/history', renderer='json', request_method = 'GET',permission = routes_permission[prefix]['GET'])
+
+
+@view_config(route_name=prefix + '/id/history', renderer='json', request_method='GET', permission=routes_permission[prefix]['GET'])
 def getIndivHistory(request):
     session = request.dbsession
     id = request.matchdict['id']
 
-    tableJoin = join(IndividualDynPropValue,IndividualDynProp
-        ,IndividualDynPropValue.FK_IndividualDynProp == IndividualDynProp.ID)
-    query = select([IndividualDynPropValue,IndividualDynProp.Name]).select_from(tableJoin).where(
+    tableJoin = join(IndividualDynPropValue, IndividualDynProp,
+                     IndividualDynPropValue.FK_IndividualDynProp == IndividualDynProp.ID)
+    query = select([IndividualDynPropValue, IndividualDynProp.Name]).select_from(tableJoin).where(
         IndividualDynPropValue.FK_Individual == id
-        ).order_by(desc(IndividualDynPropValue.StartDate))
+    ).order_by(desc(IndividualDynPropValue.StartDate))
 
     result = session.execute(query).fetchall()
     response = []
     for row in result:
         curRow = OrderedDict(row)
         dictRow = {}
-        for key in curRow :
-            if curRow[key] is not None :
-                if 'Value' in key :
-                    dictRow['value'] = curRow[key] 
-                elif 'FK' not in key :
+        for key in curRow:
+            if curRow[key] is not None:
+                if 'Value' in key:
+                    dictRow['value'] = curRow[key]
+                elif 'FK' not in key:
                     dictRow[key] = curRow[key]
-        dictRow['StartDate'] = curRow['StartDate'].strftime('%Y-%m-%d %H:%M:%S')
+        dictRow['StartDate'] = curRow[
+            'StartDate'].strftime('%Y-%m-%d %H:%M:%S')
         response.append(dictRow)
 
     return response
 
 # ------------------------------------------------------------------------------------------------------------------------- #
-@view_config(route_name= prefix+'/id/equipment', renderer='json', request_method = 'GET',permission = routes_permission[prefix]['GET'])
+
+
+@view_config(route_name=prefix + '/id/equipment', renderer='json', request_method='GET', permission=routes_permission[prefix]['GET'])
 def getIndivEquipment(request):
     session = request.dbsession
     id_indiv = request.matchdict['id']
 
     table = Base.metadata.tables['IndividualEquipment']
-    joinTable = join(table,Sensor, table.c['FK_Sensor'] == Sensor.ID)
-    joinTable = join(joinTable,SensorType, Sensor.FK_SensorType == SensorType.ID)
-    query = select([table.c['StartDate'],table.c['EndDate'],Sensor.UnicIdentifier,table.c['FK_Individual'],SensorType.Name.label('Type')]
-        ).select_from(joinTable
-        ).where(table.c['FK_Individual'] == id_indiv
-        ).order_by(desc(table.c['StartDate']))
+    joinTable = join(table, Sensor, table.c['FK_Sensor'] == Sensor.ID)
+    joinTable = join(joinTable, SensorType,
+                     Sensor.FK_SensorType == SensorType.ID)
+    query = select([table.c['StartDate'], table.c['EndDate'], Sensor.UnicIdentifier, Sensor.ID.label('SensorID'), table.c['FK_Individual'], SensorType.Name.label('Type')]
+                   ).select_from(joinTable
+                                 ).where(table.c['FK_Individual'] == id_indiv
+                                         ).order_by(desc(table.c['StartDate']))
 
     result = session.execute(query).fetchall()
     response = []
     for row in result:
         curRow = OrderedDict(row)
         curRow['StartDate'] = curRow['StartDate'].strftime('%Y-%m-%d %H:%M:%S')
-        if curRow['EndDate'] is not None :
-            curRow['EndDate'] = curRow['EndDate'].strftime('%Y-%m-%d %H:%M:%S') 
+        if curRow['EndDate'] is not None:
+            curRow['EndDate'] = curRow['EndDate'].strftime('%Y-%m-%d %H:%M:%S')
         else:
             curRow['EndDate'] = ''
         response.append(curRow)
@@ -233,7 +256,9 @@ def getIndivEquipment(request):
     return response
 
 # ------------------------------------------------------------------------------------------------------------------------- #
-@view_config(route_name= prefix+'/id', renderer='json', request_method = 'DELETE',permission = routes_permission[prefix]['DELETE'])
+
+
+@view_config(route_name=prefix + '/id', renderer='json', request_method='DELETE', permission=routes_permission[prefix]['DELETE'])
 def deleteIndiv(request):
     session = request.dbsession
     id_ = request.matchdict['id']
@@ -243,7 +268,9 @@ def deleteIndiv(request):
     return True
 
 # ------------------------------------------------------------------------------------------------------------------------- #
-@view_config(route_name= prefix+'/id', renderer='json', request_method = 'PUT',permission = routes_permission[prefix]['PUT'])
+
+
+@view_config(route_name=prefix + '/id', renderer='json', request_method='PUT', permission=routes_permission[prefix]['PUT'])
 def updateIndiv(request):
     session = request.dbsession
     data = request.json_body
@@ -254,37 +281,43 @@ def updateIndiv(request):
     return {}
 
 # ------------------------------------------------------------------------------------------------------------------------- #
-@view_config(route_name= prefix  + '/insert', renderer='json', request_method = 'POST',permission = routes_permission[prefix]['POST'])
+
+
+@view_config(route_name=prefix + '/insert', renderer='json', request_method='POST', permission=routes_permission[prefix]['POST'])
 def insertIndiv(request):
     session = request.dbsession
     data = request.json_body
-    if not isinstance(data,list):
+    if not isinstance(data, list):
         return insertOneNewIndiv(request)
-    else :
+    else:
         print('_______INsert LIST')
-        #transaction.commit()
-        #return insertListNewIndivs(request)
+        # transaction.commit()
+        # return insertListNewIndivs(request)
 
 # ------------------------------------------------------------------------------------------------------------------------- #
-def insertOneNewIndiv (request) :
+
+
+def insertOneNewIndiv(request):
     session = request.dbsession
-    session.autoflush = False # if set True create automatically a new indiv  = not what we want 
+    # if set True create automatically a new indiv  = not what we want
+    session.autoflush = False
     data = {}
-    startDate = None 
+    startDate = None
 
-    for items , value in request.json_body.items() :
+    for items, value in request.json_body.items():
         data[items] = value
     existingIndivID = None
 
     if 'stationID' in data:
         curSta = session.query(Station).get(data['stationID'])
-        startDate=curSta.StationDate
+        startDate = curSta.StationDate
 
     indivType = int(data['FK_IndividualType'])
-    newIndiv = Individual(FK_IndividualType = indivType , creationDate = datetime.now(),Original_ID = '0')
+    newIndiv = Individual(FK_IndividualType=indivType,
+                          creationDate=datetime.now(), Original_ID='0')
     # newIndiv.IndividualType = session.execute(([IndividualType.ID]).where(IndividualType.ID==indivType)).fetchone()
     newIndiv.init_on_load()
-    newIndiv.UpdateFromJson(data,startDate=startDate)
+    newIndiv.UpdateFromJson(data, startDate=startDate)
 
     if indivType == 2:
         existingIndivID = checkExisting(newIndiv)
@@ -300,30 +333,35 @@ def insertOneNewIndiv (request) :
 
     return {'ID': indivID}
 
+
 def checkExisting(indiv):
     # session = threadlocal.get_current_registry().dbmaker.session_factory()
     session = threadlocal.get_current_registry().dbmaker()
     indivData = indiv.PropDynValuesOfNow
 
-    searchInfo = {'criteria':[{'Column':key,'Operator':'is','Value':val} for key,val in indivData.items()],'order_by':['ID:asc']}
- 
+    searchInfo = {'criteria': [{'Column': key, 'Operator': 'is', 'Value': val}
+                               for key, val in indivData.items()], 'order_by': ['ID:asc']}
+
     ModuleType = 'IndivFilter'
-    moduleFront  = session.query(FrontModules).filter(FrontModules.Name == ModuleType).one()
+    moduleFront = session.query(FrontModules).filter(
+        FrontModules.Name == ModuleType).one()
 
-    listObj = IndividualList(moduleFront,typeObj = 2)
+    listObj = IndividualList(moduleFront, typeObj=2)
     dataResult = listObj.GetFlatDataList(searchInfo)
 
-    if len(dataResult)>0:
+    if len(dataResult) > 0:
         existingID = dataResult[0]['ID']
-    else :
+    else:
         existingID = None
 
     return existingID
 
 # ------------------------------------------------------------------------------------------------------------------------- #
-@view_config(route_name= prefix, renderer='json', request_method = 'GET', permission = routes_permission[prefix]['GET'])
-@view_config(route_name= prefix, renderer='json', request_method = 'POST', permission = routes_permission[prefix]['GET'])
-def searchIndiv(request,searchInfo=None,noCount=False):
+
+
+@view_config(route_name=prefix, renderer='json', request_method='GET', permission=routes_permission[prefix]['GET'])
+@view_config(route_name=prefix, renderer='json', request_method='POST', permission=routes_permission[prefix]['GET'])
+def searchIndiv(request, searchInfo=None, noCount=False):
     session = request.dbsession
     history = False
     startDate = None
@@ -332,94 +370,103 @@ def searchIndiv(request,searchInfo=None,noCount=False):
         searchInfo = request.params.mixed()
         # searchInfo = {}
         # searchInfo['criteria'] = []
-        if 'criteria' in searchInfo: 
+        if 'criteria' in searchInfo:
             searchInfo['criteria'] = json.loads(searchInfo['criteria'])
-            if searchInfo['criteria'] != {} :
-                searchInfo['criteria'] = [obj for obj in searchInfo['criteria'] if obj['Value'] != str(-1) ]
-            else :
-                 searchInfo['criteria'] = []
+            if searchInfo['criteria'] != {}:
+                searchInfo['criteria'] = [obj for obj in searchInfo[
+                    'criteria'] if obj['Value'] != str(-1)]
+            else:
+                searchInfo['criteria'] = []
 
         searchInfo['order_by'] = json.loads(searchInfo['order_by'])
         searchInfo['offset'] = json.loads(searchInfo['offset'])
         searchInfo['per_page'] = json.loads(searchInfo['per_page'])
 
-    if 'startDate' in searchInfo and searchInfo['startDate']!='':
-        startDate = datetime.strptime(searchInfo['startDate'],'%d/%m/%Y %H:%M:%S')
+    if 'startDate' in searchInfo and searchInfo['startDate'] != '':
+        startDate = datetime.strptime(
+            searchInfo['startDate'], '%d/%m/%Y %H:%M:%S')
 
     if 'history' in searchInfo and searchInfo['history'] == '1':
         history = True
 
     if 'typeObj' in request.params:
         typeObj = request.params['typeObj']
-        searchInfo['criteria'].append({'Column':'FK_IndividualType','Operator': '=', 'Value':request.params['typeObj']})
+        searchInfo['criteria'].append(
+            {'Column': 'FK_IndividualType', 'Operator': '=', 'Value': request.params['typeObj']})
     else:
-        searchInfo['criteria'].append({'Column':'FK_IndividualType','Operator': '=', 'Value':1})
+        searchInfo['criteria'].append(
+            {'Column': 'FK_IndividualType', 'Operator': '=', 'Value': 1})
         typeObj = 1
 
     ModuleType = 'IndivFilter'
-    moduleFront  = session.query(FrontModules).filter(FrontModules.Name == ModuleType).one()
+    moduleFront = session.query(FrontModules).filter(
+        FrontModules.Name == ModuleType).one()
 
-    listObj = IndividualList(moduleFront,typeObj = typeObj,history=history,startDate=startDate)
+    listObj = IndividualList(moduleFront, typeObj=typeObj,
+                             history=history, startDate=startDate)
     dataResult = listObj.GetFlatDataList(searchInfo)
 
     if not noCount:
         countResult = listObj.count(searchInfo)
-        result = [{'total_entries':countResult}]
+        result = [{'total_entries': countResult}]
         result.append(dataResult)
-    else :
+    else:
         result = dataResult
     return result
 
 
-@view_config(route_name= prefix+'/id/location/action', renderer='json', request_method = 'GET',permission = routes_permission[prefix]['GET'])
+@view_config(route_name=prefix + '/id/location/action', renderer='json', request_method='GET', permission=routes_permission[prefix]['GET'])
 def actionOnIndividualsLoc(request):
     dictActionFunc = {
-    'getFields': getFieldsLoc,
-    'getFilters': getFiltersLoc,
+        'getFields': getFieldsLoc,
+        'getFilters': getFiltersLoc,
     }
     actionName = request.matchdict['action']
     return dictActionFunc[actionName](request)
 
-def getFieldsLoc(request) :
+
+def getFieldsLoc(request):
     session = request.dbsession
 
-    gene = IndivLocationList('Individual_Location',session,None)
+    gene = IndivLocationList('Individual_Location', session, None)
     return gene.get_col()
 # ------------------------------------------------------------------------------------------------------------------------- #
-@view_config(route_name= prefix+'/id/location', renderer='json',permission = routes_permission[prefix]['GET'])
+
+
+@view_config(route_name=prefix + '/id/location', renderer='json', permission=routes_permission[prefix]['GET'])
 def getIndivLocation(request):
 
     id_ = request.matchdict['id']
     session = request.dbsession
-    gene = IndivLocationList('Individual_Location',session,id_)
+    gene = IndivLocationList('Individual_Location', session, id_)
     response = None
 
     data = request.params.mixed()
-    if 'criteria' in data: 
+    if 'criteria' in data:
         criteria = json.loads(data['criteria'])
-    else : 
+    else:
         criteria = {}
-    
+
     if 'per_page' in data:
         offset = json.loads(data['offset'])
         per_page = json.loads(data['per_page'])
         order_by = json.loads(data['order_by'])
-    else :
-        offset= None 
-        per_page= None
-        order_by= None
+    else:
+        offset = None
+        per_page = None
+        order_by = None
 
-    if 'geo' in request.params :
-        result = gene.get_geoJSON(criteria,['ID','Date','type_'])
+    if 'geo' in request.params:
+        result = gene.get_geoJSON(criteria, ['ID', 'Date', 'type_'])
 
     else:
-        result = gene.search(criteria,offset=offset,per_page=per_page,order_by=['StationDate:desc'])
-        for row in result : 
+        result = gene.search(criteria, offset=offset,
+                             per_page=per_page, order_by=['StationDate:desc'])
+        for row in result:
             row['Date'] = row['Date'].strftime('%Y-%m-%d %H:%M:%S')
             row['format'] = 'YYYY-MM-DD HH:mm:ss'
 
-
-    # ************ POC Indiv location PLayer  **************** 
+    # ************ POC Indiv location PLayer  ****************
 
     # if 'geoDynamic' in request.params :
     #     geoJson=[]
@@ -428,14 +475,14 @@ def getIndivLocation(request):
     #         ).where(Individual_Location.FK_Individual == id
     #         ).where(Individual_Location.type_ == 'GSM').order_by(asc(Individual_Location.Date))
     #     dataResult = session.execute(stmt).fetchall()
-        
+
     #     df = pd.DataFrame.from_records(dataResult, columns=dataResult[0].keys(), coerce_float=True)
     #     X1 = df.iloc[:-1][['LAT', 'LON']].values
     #     X2 = df.iloc[1:][['LAT', 'LON']].values
     #     df['dist'] = np.append(haversine(X1, X2), 0).round(3)
     #     # Compute the speed
     #     df['speed'] = (df['dist'] / ((df['Date'] - df['Date'].shift(-1)).fillna(1) / np.timedelta64(1, 'h'))).round(3)
-    #     df['Date'] = df['Date'].apply(lambda row: np.datetime64(row).astype(datetime)) 
+    #     df['Date'] = df['Date'].apply(lambda row: np.datetime64(row).astype(datetime))
 
     #     for i in range(df.shape[0]):
     #         geoJson.append({'type':'Feature', 'properties':{'type':df.loc[i,'type_']
@@ -443,44 +490,48 @@ def getIndivLocation(request):
     #             , 'geometry':{'type':'Point', 'coordinates':[df.loc[i,'LAT'],df.loc[i,'LON']]}})
     #     result = {'type':'FeatureCollection', 'features':geoJson}
     #     response = result
-    # else : 
+    # else :
     #     response  = curIndiv.GetFlatObject()
 
     return result
 
 
-@view_config(route_name= prefix+'/id/location', renderer='json', request_method = 'PUT',permission = routes_permission[prefix]['PUT'])
+@view_config(route_name=prefix + '/id/location', renderer='json', request_method='PUT', permission=routes_permission[prefix]['PUT'])
 def delIndivLocationList(request):
     session = request.dbsession
 
     IdList = json.loads(request.params['IDs'])
-    session.query(Individual_Location).filter(Individual_Location.ID.in_(IdList)).delete(synchronize_session=False)
+    session.query(Individual_Location).filter(
+        Individual_Location.ID.in_(IdList)).delete(synchronize_session=False)
 
 
-@view_config(route_name= prefix+'/id/location/id_loc', renderer='json', request_method = 'GET',permission = routes_permission[prefix]['PUT'])
+@view_config(route_name=prefix + '/id/location/id_loc', renderer='json', request_method='GET', permission=routes_permission[prefix]['PUT'])
 def delIndivLocation(request):
     session = request.dbsession
     Id = request.matchdict['id_loc']
-    session.query(Individual_Location).filter(Individual_Location.ID == Id).delete(synchronize_session=False)
+    session.query(Individual_Location).filter(
+        Individual_Location.ID == Id).delete(synchronize_session=False)
 
 
 @view_config(route_name=prefix + '/export', renderer='json', request_method='GET')
 def individuals_export(request):
     session = request.dbsession
     searchInfo = request.params.mixed()
-    if 'criteria' in searchInfo: 
+    if 'criteria' in searchInfo:
         searchInfo['criteria'] = json.loads(searchInfo['criteria'])
-        if searchInfo['criteria'] != {} :
-            searchInfo['criteria'] = [obj for obj in searchInfo['criteria'] if obj['Value'] != str(-1) ]
+        if searchInfo['criteria'] != {}:
+            searchInfo['criteria'] = [obj for obj in searchInfo[
+                'criteria'] if obj['Value'] != str(-1)]
 
-    dataResult = searchIndiv(request,searchInfo=searchInfo,noCount=True)
+    dataResult = searchIndiv(request, searchInfo=searchInfo, noCount=True)
     # ModuleType = 'IndivFilter'
     # moduleFront  = session.query(FrontModules).filter(FrontModules.Name == ModuleType).one()
 
     # listObj = IndividualList(moduleFront)
     # dataResult = listObj.GetFlatDataList(searchInfo)
 
-    df = pd.DataFrame.from_records(dataResult, columns=dataResult[0].keys(), coerce_float=True)
+    df = pd.DataFrame.from_records(dataResult, columns=dataResult[
+                                   0].keys(), coerce_float=True)
 
     fout = io.BytesIO()
     writer = pd.ExcelWriter(fout)
@@ -489,11 +540,4 @@ def individuals_export(request):
     file = fout.getvalue()
 
     dt = datetime.now().strftime('%d-%m-%Y')
-    return Response(file,content_disposition= "attachment; filename=individuals_export_"+dt+".xlsx",content_type='application/vnd.openxmlformats-officedocument.spreadsheetml.sheet')
-
-
-
-
-
-
-
+    return Response(file, content_disposition="attachment; filename=individuals_export_" + dt + ".xlsx", content_type='application/vnd.openxmlformats-officedocument.spreadsheetml.sheet')
diff --git a/Front/app/modules/individuals/layouts/lyt-individuals-detail.js b/Front/app/modules/individuals/layouts/lyt-individuals-detail.js
index 9d3528512..813fa71fa 100644
--- a/Front/app/modules/individuals/layouts/lyt-individuals-detail.js
+++ b/Front/app/modules/individuals/layouts/lyt-individuals-detail.js
@@ -162,7 +162,22 @@ define([
         name: 'UnicIdentifier',
         label: 'Identifier',
         editable: false,
-        cell: 'string'
+        cell: Backgrid.StringCell.extend({
+          render: function () {
+            this.$el.empty();
+            var rawValue = this.model.get(this.column.get("name"));
+            var formattedValue = this.formatter.fromRaw(rawValue, this.model);
+
+            if (this.model.get('UnicIdentifier')){
+              this.$el.append('<a target="_blank"'
+                +'href= "http://'+window.location.hostname+window.location.pathname+'#sensors/'+this.model.get('SensorID')+'">\
+                  '+rawValue +'&nbsp;&nbsp;&nbsp;<span class="reneco reneco-info" ></span>\
+                </a>');
+              this.delegateEvents();
+           }
+            return this;
+          }
+        })
       }];
       this.gridEquip = new NsGrid({
         pageSize: 20,
@@ -280,7 +295,7 @@ define([
               }).text(formattedValue));*/
 
 
-               this.$el.append('<a target="_blank"' 
+               this.$el.append('<a target="_blank"'
                 +'href= "http://'+window.location.hostname+window.location.pathname+'#stations/'+this.model.get('ID').replace('sta_','')+'">\
                   '+rawValue +'&nbsp;&nbsp;&nbsp;<span class="reneco reneco-info" ></span>\
                 </a>');
@@ -318,7 +333,7 @@ define([
             rowClicked: true,
             com: _this.com,
             idName: 'ID',
-            affectTotalRecords : function(){  
+            affectTotalRecords : function(){
              var nbobs;
              if(this.paginator || this.pagingServerSide){
              nbobs = this.grid.collection.state.totalRecords || 0;
@@ -338,7 +353,7 @@ define([
 
           $('#totalLocations').html(_this.locationsColl.length);
           _this.nbLocations[0] = _this.locationsColl.length;
-      
+
         _this.locationsGrid.rowClicked = function(args) {
           _this.rowClicked(args);
         };
@@ -352,7 +367,7 @@ define([
 
         var tmp = _.clone(_this.locationsGrid.grid.collection.fullCollection);
         _this.com.setMotherColl(tmp);
-        
+
       });
 
         //url: config.coreUrl + 'individuals/' + this.indivId  + '/locations',

From 19b847426e74202ebf963e38fd48f86f88a24f1f Mon Sep 17 00:00:00 2001
From: romfabbro <romain_fabbro@natural-solutions.eu>
Date: Fri, 7 Oct 2016 11:07:20 +0200
Subject: [PATCH 20/30] quick fix get protocols

---
 Back/ecoreleve_server/Views/protocols.py | 300 +++++++++++++----------
 1 file changed, 175 insertions(+), 125 deletions(-)

diff --git a/Back/ecoreleve_server/Views/protocols.py b/Back/ecoreleve_server/Views/protocols.py
index 10a98aee5..43ce8eef0 100644
--- a/Back/ecoreleve_server/Views/protocols.py
+++ b/Back/ecoreleve_server/Views/protocols.py
@@ -7,119 +7,137 @@
     Station,
     ErrorAvailable,
     sendLog
-    )
+)
 from ..GenericObjets.FrontModules import FrontModules
 import json
 from datetime import datetime
-from sqlalchemy import func,select,and_, or_, join
+from sqlalchemy import func, select, and_, or_, join
 from pyramid.security import NO_PERMISSION_REQUIRED
 from collections import OrderedDict
 from traceback import print_exc
 from ..controllers.security import routes_permission
 
 
-
 prefixProt = 'protocols'
 prefix = 'stations'
 
 # ------------------------------------------------------------------------------------------------------------------------- #
-@view_config(route_name= prefix+'/id/protocols/', renderer='json', request_method = 'GET',permission = routes_permission[prefixProt]['GET'])
-@view_config(route_name= prefix+'/id/protocols', renderer='json', request_method = 'GET',permission = routes_permission[prefixProt]['GET'])
-def GetProtocolsofStation (request) :
-    session = request.dbsession
 
+
+@view_config(route_name=prefix + '/id/protocols/', renderer='json', request_method='GET', permission=routes_permission[prefixProt]['GET'])
+@view_config(route_name=prefix + '/id/protocols', renderer='json', request_method='GET', permission=routes_permission[prefixProt]['GET'])
+def GetProtocolsofStation(request):
+    session = request.dbsession
+    response = None
     sta_id = request.matchdict['id']
     data = {}
     searchInfo = {}
-    criteria = [{'Column': 'FK_Station', 'Operator':'=','Value':sta_id}]
+    criteria = [{'Column': 'FK_Station', 'Operator': '=', 'Value': sta_id}]
     response = []
     curSta = session.query(Station).get(sta_id)
-    try : 
-        if 'criteria' in request.params or request.params == {} :
+    try:
+        if 'criteria' in request.params or request.params == {}:
             searchInfo = data
             searchInfo['criteria'] = []
             searchInfo['criteria'].extend(criteria)
-            listObs = ListObjectWithDynProp(session,Observation,searchInfo)
+            listObs = ListObjectWithDynProp(session, Observation, searchInfo)
             response = listObs.GetFlatList()
-    except : 
+    except:
         pass
-    try :
-        if 'FormName' in request.params : 
+    try:
+        if 'FormName' in request.params:
             ModuleName = 'ObservationForm'
-            listObs = list(session.query(Observation).filter(and_(Observation.FK_Station == sta_id,Observation.Parent_Observation == None)))
-            listType =list(session.query(FieldActivity_ProtocoleType
-                ).filter(FieldActivity_ProtocoleType.FK_fieldActivity == curSta.fieldActivityId))
-            Conf = session.query(FrontModules).filter(FrontModules.Name == ModuleName ).first()
-            ### TODO : if protocols exists, append the new protocol form at the after : 2 loops, no choice
+            listObs = list(session.query(Observation).filter(
+                and_(Observation.FK_Station == sta_id, Observation.Parent_Observation == None)))
+            listType = list(session.query(FieldActivity_ProtocoleType
+                                          ).filter(FieldActivity_ProtocoleType.FK_fieldActivity == curSta.fieldActivityId))
+            Conf = session.query(FrontModules).filter(
+                FrontModules.Name == ModuleName).first()
+            # TODO : if protocols exists, append the new protocol form at the
+            # after : 2 loops, no choice
             if listObs or listType:
                 # max_iter = max(len(listObs),len(listType))
                 listProto = {}
-                for i in range(len(listObs)) :
-                    try : 
+                for i in range(len(listObs)):
+                    try:
                         DisplayMode = 'display'
                         obs = listObs[i]
-                        typeName = obs.GetType().Name.replace('_',' ')
+                        typeName = obs.GetType().Name.replace('_', ' ')
                         typeID = obs.GetType().ID
                         obs.LoadNowValues()
-                        try :
-                            listProto[typeID]['obs'].append(obs.GetDTOWithSchema(Conf,DisplayMode))
-                        except :
+                        try:
+                            listProto[typeID]['obs'].append(
+                                obs.GetDTOWithSchema(Conf, DisplayMode))
+                        except:
                             listObsWithSchema = []
-                            listObsWithSchema.append(obs.GetDTOWithSchema(Conf,DisplayMode))
-                            listProto[typeID] = {'Name': typeName,'obs':listObsWithSchema}
+                            listObsWithSchema.append(
+                                obs.GetDTOWithSchema(Conf, DisplayMode))
+                            listProto[typeID] = {
+                                'Name': typeName, 'obs': listObsWithSchema}
                             pass
-                    except Exception as e :
+                    except Exception as e:
                         print_exc()
                         pass
 
-                for i in range(len(listType)) :
-                    try : 
+                for i in range(len(listType)):
+                    try:
                         DisplayMode = 'edit'
-                       
+
                         virginTypeID = listType[i].FK_ProtocoleType
-                        virginObs = Observation(FK_ProtocoleType = virginTypeID)
-                        viginTypeName = virginObs.GetType().Name.replace('_',' ')
-                        try :
-                            if virginTypeID not in listProto :
+                        virginObs = Observation(FK_ProtocoleType=virginTypeID)
+                        viginTypeName = virginObs.GetType().Name.replace('_', ' ')
+                        try:
+                            if virginTypeID not in listProto:
                                 test_ = listProto[virginTypeID]
-                                virginForm = virginObs.GetDTOWithSchema(Conf,DisplayMode)
-                                virginForm['data']['FK_ProtocoleType'] = virginTypeID
-                                listProto[virginTypeID]['obs'].append(virginForm)
-                        except :
-                            if virginTypeID not in listProto :
+                                virginForm = virginObs.GetDTOWithSchema(
+                                    Conf, DisplayMode)
+                                virginForm['data'][
+                                    'FK_ProtocoleType'] = virginTypeID
+                                listProto[virginTypeID][
+                                    'obs'].append(virginForm)
+                        except:
+                            if virginTypeID not in listProto:
                                 listSchema = []
-                                virginForm = virginObs.GetDTOWithSchema(Conf,DisplayMode)
-                                virginForm['data']['FK_ProtocoleType'] = virginTypeID
+                                virginForm = virginObs.GetDTOWithSchema(
+                                    Conf, DisplayMode)
+                                virginForm['data'][
+                                    'FK_ProtocoleType'] = virginTypeID
                                 listSchema.append(virginForm)
-                                listProto[virginTypeID] = {'Name': viginTypeName,'obs':listSchema}
+                                listProto[virginTypeID] = {
+                                    'Name': viginTypeName, 'obs': listSchema}
                                 pass
-                    except :
+                    except:
                         print_exc()
                         pass
-            globalListProto = [{'ID':objID, 'Name':listProto[objID]['Name'],'obs':listProto[objID]['obs'] } for objID in listProto.keys()]
-            response = sorted(globalListProto, key=lambda k: k['Name'])
-    except Exception as e :
+                globalListProto = [{'ID': objID, 'Name': listProto[objID][
+                    'Name'], 'obs':listProto[objID]['obs']} for objID in listProto.keys()]
+                response = sorted(globalListProto, key=lambda k: k['Name'])
+    except Exception as e:
         print_exc()
-        print (e)
+        print(e)
         pass
     return response
 
 # ------------------------------------------------------------------------------------------------------------------------- #
-@view_config(route_name= prefix+'/id/protocols', renderer='json', request_method = 'POST',permission = routes_permission[prefixProt]['POST'])
-@view_config(route_name= prefix+'/id/protocols/', renderer='json', request_method = 'POST',permission = routes_permission[prefixProt]['POST'])
-def insertNewProtocol (request) :
+
+
+@view_config(route_name=prefix + '/id/protocols', renderer='json', request_method='POST', permission=routes_permission[prefixProt]['POST'])
+@view_config(route_name=prefix + '/id/protocols/', renderer='json', request_method='POST', permission=routes_permission[prefixProt]['POST'])
+def insertNewProtocol(request):
     session = request.dbsession
     data = {}
-    for items , value in request.json_body.items() :
+    for items, value in request.json_body.items():
         data[items] = value
 
     data['FK_Station'] = request.matchdict['id']
     sta = session.query(Station).get(request.matchdict['id'])
-    newProto = Observation(FK_ProtocoleType = data['FK_ProtocoleType'],FK_Station=data['FK_Station'])    #,FK_Station=data['FK_Station'])
-    newProto.ProtocoleType = session.query(ProtocoleType).filter(ProtocoleType.ID==data['FK_ProtocoleType']).first()
+    newProto = Observation(FK_ProtocoleType=data['FK_ProtocoleType'], FK_Station=data[
+                           'FK_Station'])  # ,FK_Station=data['FK_Station'])
+    newProto.ProtocoleType = session.query(ProtocoleType).filter(
+        ProtocoleType.ID == data['FK_ProtocoleType']).first()
     listOfSubProtocols = []
-    for items , value in data.items() :
-        if isinstance(value,list) and items != 'children':
+    for items, value in data.items():
+        if isinstance(value, list) and items != 'children':
             listOfSubProtocols = value
     # if listOfSubProtocols !=[] and 'sub_ProtocoleType' in data:
     #     for obj in listOfSubProtocols:
@@ -127,21 +145,23 @@ def insertNewProtocol (request) :
     data['Observation_childrens'] = listOfSubProtocols
     newProto.init_on_load()
     newProto.UpdateFromJson(data)
-    try : 
+    try:
         newProto.Station = sta
         session.add(newProto)
         session.flush()
         message = {'id': newProto.ID}
-    except ErrorAvailable as e :
+    except ErrorAvailable as e:
         session.rollback()
         request.response.status_code = 510
         message = e.value
-        sendLog(logLevel=1,domaine=3,msg_number = request.response.status_code)
+        sendLog(logLevel=1, domaine=3, msg_number=request.response.status_code)
 
     return message
 
 # ------------------------------------------------------------------------------------------------------------------------- #
-@view_config(route_name= prefix+'/id/protocols/obs_id', renderer='json', request_method = 'PUT',permission = routes_permission[prefixProt]['PUT'])
+
+
+@view_config(route_name=prefix + '/id/protocols/obs_id', renderer='json', request_method='PUT', permission=routes_permission[prefixProt]['PUT'])
 def updateObservation(request):
     session = request.dbsession
     data = request.json_body
@@ -152,23 +172,25 @@ def updateObservation(request):
     subObsList = []
     message = 'ok'
 
-    for  items , value in data.items():
-        if isinstance(value,list) and items != 'children':
+    for items, value in data.items():
+        if isinstance(value, list) and items != 'children':
             listOfSubProtocols = value
 
     data['Observation_childrens'] = listOfSubProtocols
     curObs.UpdateFromJson(data)
-    try : 
-        if curObs.Equipment is not None : 
+    try:
+        if curObs.Equipment is not None:
             curObs.Station = curObs.Station
-    except ErrorAvailable as e :
+    except ErrorAvailable as e:
         session.rollback()
         request.response.status_code = 510
         message = e.value
     return message
 
 # ------------------------------------------------------------------------------------------------------------------------- #
-@view_config(route_name= prefix+'/id/protocols/obs_id', renderer='json', request_method = 'DELETE',permission = routes_permission[prefixProt]['DELETE'])
+
+
+@view_config(route_name=prefix + '/id/protocols/obs_id', renderer='json', request_method='DELETE', permission=routes_permission[prefixProt]['DELETE'])
 def deleteObservation(request):
     session = request.dbsession
     id_obs = request.matchdict['obs_id']
@@ -178,90 +200,107 @@ def deleteObservation(request):
     return {}
 
 # ------------------------------------------------------------------------------------------------------------------------- #
-@view_config(route_name= prefix+'/id/protocols/obs_id', renderer='json', request_method = 'GET',permission = routes_permission[prefixProt]['GET'])
+
+
+@view_config(route_name=prefix + '/id/protocols/obs_id', renderer='json', request_method='GET', permission=routes_permission[prefixProt]['GET'])
 def getObservation(request):
     session = request.dbsession
 
     id_obs = request.matchdict['obs_id']
     id_sta = request.matchdict['id']
-    try :
-        curObs = session.query(Observation).filter(and_(Observation.ID ==id_obs, Observation.FK_Station == id_sta )).one()
+    try:
+        curObs = session.query(Observation).filter(
+            and_(Observation.ID == id_obs, Observation.FK_Station == id_sta)).one()
         curObs.LoadNowValues()
-        # if Form value exists in request --> return data with schema else return only data
-        if 'FormName' in request.params :
+        # if Form value exists in request --> return data with schema else
+        # return only data
+        if 'FormName' in request.params:
             ModuleName = request.params['FormName']
-            try :
+            try:
                 DisplayMode = request.params['DisplayMode']
-            except : 
+            except:
                 DisplayMode = 'display'
 
-            Conf = session.query(FrontModules).filter(FrontModules.Name=='ObservationForm' ).first()
-            response = curObs.GetDTOWithSchema(Conf,DisplayMode)
-        else : 
-            response  = curObs.GetFlatObject()
-    except Exception as e :
+            Conf = session.query(FrontModules).filter(
+                FrontModules.Name == 'ObservationForm').first()
+            response = curObs.GetDTOWithSchema(Conf, DisplayMode)
+        else:
+            response = curObs.GetFlatObject()
+    except Exception as e:
         response = {}
 
     return response
 
 # ------------------------------------------------------------------------------------------------------------------------- #
-@view_config(route_name= prefix+'/id/protocols/action', renderer='json', request_method = 'GET',permission = routes_permission[prefixProt]['GET'])
+
+
+@view_config(route_name=prefix + '/id/protocols/action', renderer='json', request_method='GET', permission=routes_permission[prefixProt]['GET'])
 def actionOnObs(request):
     session = request.dbsession
 
     dictActionFunc = {
-    'count' : countObs,
-    'forms' : getObsForms,
-    '0' : getObsForms,
-    'fields': getObsFields
+        'count': countObs,
+        'forms': getObsForms,
+        '0': getObsForms,
+        'fields': getObsFields
     }
     actionName = request.matchdict['action']
     return dictActionFunc[actionName](request)
 
-def countObs (request) :
+
+def countObs(request):
     session = request.dbsession
 #   ## TODO count stations
     return
 
-def getObsForms(request) :
+
+def getObsForms(request):
     session = request.dbsession
     typeObs = request.params['ObjectType']
     sta_id = request.matchdict['id']
     ModuleName = 'ObservationForm'
-    Conf = session.query(FrontModules).filter(FrontModules.Name==ModuleName ).first()
-    newObs = Observation(FK_ProtocoleType = typeObs, FK_Station = sta_id)
+    Conf = session.query(FrontModules).filter(
+        FrontModules.Name == ModuleName).first()
+    newObs = Observation(FK_ProtocoleType=typeObs, FK_Station=sta_id)
     newObs.init_on_load()
-    schema = newObs.GetDTOWithSchema(Conf,'edit')
+    schema = newObs.GetDTOWithSchema(Conf, 'edit')
 
     return schema
 
-def getObsFields(request) :
+
+def getObsFields(request):
     session = request.dbsession
 #     ## TODO return fields Station
     return
 
 # ------------------------------------------------------------------------------------------------------------------------- #
-@view_config(route_name= prefixProt, renderer='json', request_method = 'PUT',permission = routes_permission[prefixProt]['PUT'])
+
+
+@view_config(route_name=prefixProt, renderer='json', request_method='PUT', permission=routes_permission[prefixProt]['PUT'])
 def updateListProtocols(request):
     session = request.dbsession
-    # TODO 
-    # update a list of protocols 
+    # TODO
+    # update a list of protocols
     return
 
 # ------------------------------------------------------------------------------------------------------------------------- #
-@view_config(route_name= prefixProt, renderer='json', request_method = 'POST',permission = routes_permission[prefixProt]['POST'])
+
+
+@view_config(route_name=prefixProt, renderer='json', request_method='POST', permission=routes_permission[prefixProt]['POST'])
 def insertProtocols(request):
     session = request.dbsession
-    return insertNewProtocol (request)
+    return insertNewProtocol(request)
 
 # ------------------------------------------------------------------------------------------------------------------------- #
-@view_config(route_name= prefixProt+'/action', renderer='json', request_method = 'GET',permission = routes_permission[prefixProt]['GET'])
+
+
+@view_config(route_name=prefixProt + '/action', renderer='json', request_method='GET', permission=routes_permission[prefixProt]['GET'])
 def actionOnProtocols(request):
     dictActionFunc = {
-    'count' : count,
-    'forms' : getForms,
-    '0' : getForms,
-    'fields': getFields
+        'count': count,
+        'forms': getForms,
+        '0': getForms,
+        'fields': getFields
     }
     actionName = request.matchdict['action']
     return dictActionFunc[actionName](request)
@@ -273,58 +312,69 @@ def actionOnProtocols(request):
 #     return
 
 # ------------------------------------------------------------------------------------------------------------------------- #
-@view_config(route_name= prefixProt + '/id', renderer='json', request_method = 'GET',permission = routes_permission[prefixProt]['GET'])
-def getProtocol (request):
+
+
+@view_config(route_name=prefixProt + '/id', renderer='json', request_method='GET', permission=routes_permission[prefixProt]['GET'])
+def getProtocol(request):
     session = request.dbsession
 
     id = request.matchdict['id']
     curProt = session.query(Observation).get(id)
     curProt.LoadNowValues()
-    # if Form value exists in request --> return data with schema else return only data
-    if 'FormName' in request.params :
+    # if Form value exists in request --> return data with schema else return
+    # only data
+    if 'FormName' in request.params:
         ModuleName = request.params['FormName']
-        try :
+        try:
             DisplayMode = request.params['DisplayMode']
-        except : 
+        except:
             DisplayMode = 'display'
-        Conf = session.query(FrontModules).filter(FrontModules.Name=='ObservationForm' ).first()
+        Conf = session.query(FrontModules).filter(
+            FrontModules.Name == 'ObservationForm').first()
         curProt.LoadNowValues()
-        response = curProt.GetDTOWithSchema(Conf,DisplayMode)
-    else : 
-        response  = curProt.GetFlatObject()
+        response = curProt.GetDTOWithSchema(Conf, DisplayMode)
+    else:
+        response = curProt.GetFlatObject()
     return response
 
 # ------------------------------------------------------------------------------------------------------------------------- #
-@view_config(route_name= 'fieldActivity', renderer='json', request_method = 'GET')
-def getFieldActivityList (request) :
+
+
+@view_config(route_name='fieldActivity', renderer='json', request_method='GET')
+def getFieldActivityList(request):
     session = request.dbsession
 
-    query = select([fieldActivity.ID.label('value'), fieldActivity.Name.label('label')])
+    query = select([fieldActivity.ID.label('value'),
+                    fieldActivity.Name.label('label')])
     result = session.execute(query).fetchall()
     res = []
-    for row in result :
-        res.append({'label':row['label'], 'value': row['value']})
-    return sorted(res , key = lambda x : x['label'])
+    for row in result:
+        res.append({'label': row['label'], 'value': row['value']})
+    return sorted(res, key=lambda x: x['label'])
 
 # ------------------------------------------------------------------------------------------------------------------------- #
-@view_config(route_name= 'protocolTypes', renderer='json', request_method = 'GET')
-def getListofProtocolTypes (request):
+
+
+@view_config(route_name='protocolTypes', renderer='json', request_method='GET')
+def getListofProtocolTypes(request):
     session = request.dbsession
-    if 'FieldActivityID' in request.params :
+    if 'FieldActivityID' in request.params:
         fieldActivityID = request.params['FieldActivityID']
-        join_table = join(ProtocoleType,FieldActivity_ProtocoleType,ProtocoleType.ID == FieldActivity_ProtocoleType.FK_ProtocoleType )
+        join_table = join(ProtocoleType, FieldActivity_ProtocoleType,
+                          ProtocoleType.ID == FieldActivity_ProtocoleType.FK_ProtocoleType)
         query = select([ProtocoleType.ID, ProtocoleType.Name]
-            ).where(and_(or_(ProtocoleType.Status == 4,ProtocoleType.Status == 8),FieldActivity_ProtocoleType.FK_fieldActivity == fieldActivityID)
-            ).select_from(join_table)
-    else : 
-        query = select([ProtocoleType.ID, ProtocoleType.Name]).where(or_(ProtocoleType.Status == 4,ProtocoleType.Status == 8))
+                       ).where(and_(or_(ProtocoleType.Status == 4, ProtocoleType.Status == 8), FieldActivity_ProtocoleType.FK_fieldActivity == fieldActivityID)
+                               ).select_from(join_table)
+    else:
+        query = select([ProtocoleType.ID, ProtocoleType.Name]).where(
+            or_(ProtocoleType.Status == 4, ProtocoleType.Status == 8))
     result = session.execute(query).fetchall()
 
     res = []
     for row in result:
         elem = {}
         elem['ID'] = row['ID']
-        elem['Name'] = row['Name'].replace('_',' ')
+        elem['Name'] = row['Name'].replace('_', ' ')
         res.append(elem)
-    res = sorted(res, key=lambda k: k['Name']) 
+    res = sorted(res, key=lambda k: k['Name'])
     return res

From 07d13a1c0ebbb1919268855d97f13f05a2e91761 Mon Sep 17 00:00:00 2001
From: romfabbro <romain_fabbro@natural-solutions.eu>
Date: Fri, 7 Oct 2016 11:09:18 +0200
Subject: [PATCH 21/30] add tile-locked for automatic data import&my data

---
 Front/app/base/home/tpl/tpl-home.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Front/app/base/home/tpl/tpl-home.html b/Front/app/base/home/tpl/tpl-home.html
index 989c30d0d..51c89310b 100644
--- a/Front/app/base/home/tpl/tpl-home.html
+++ b/Front/app/base/home/tpl/tpl-home.html
@@ -42,7 +42,7 @@ <h1 class="hello"><span data-i18n="home.hello">Hello,</span><br><span id="userFi
 				</a>
 
 
-				<a href="#" class="tile small_tile tile-alizarin autoImport">
+				<a href="#" class="tile small_tile tile-alizarin autoImport tile-locked">
 					<p>
 						<i class="reneco reneco-sensorimport"></i>
 						<span data-i18n="tiles.auto-import">Automatic import</span>

From 42f7d15ab4530eca2b304007e31c0139dd903b24 Mon Sep 17 00:00:00 2001
From: romfabbro <romain_fabbro@natural-solutions.eu>
Date: Wed, 12 Oct 2016 11:03:28 +0200
Subject: [PATCH 22/30] SQL: Update Conf protocoles

---
 .../Pipe/DB_Mother/095_Up_Conf_protcole.txt   | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 Back/database/Pipe/DB_Mother/095_Up_Conf_protcole.txt

diff --git a/Back/database/Pipe/DB_Mother/095_Up_Conf_protcole.txt b/Back/database/Pipe/DB_Mother/095_Up_Conf_protcole.txt
new file mode 100644
index 000000000..62c86aa56
--- /dev/null
+++ b/Back/database/Pipe/DB_Mother/095_Up_Conf_protcole.txt
@@ -0,0 +1,44 @@
+
+  
+  UPDATE f SET InputType = 'GridFormEditor',Options = '{"protocoleType":'+Options+',"nbFixedCol":0,"delFirst":0,"showLines":0}'
+  FROM [ModuleForms] f
+  where Options in (214,222)  and InputType like '%listof%' and module_id = 1
+  
+  Update f SET FieldSizeDisplay= 3, FieldSizeEdit = 3
+  FROM ModuleForms f
+  WHERE TypeObj = 222 and module_id = 1 
+  AND Name = 'sampled'
+
+  Update f SET FieldSizeDisplay= 5, FieldSizeEdit = 5
+  FROM ModuleForms f
+  WHERE TypeObj = 222 and module_id = 1 
+  AND Name = 'Measured_by'
+
+
+  Update f SET FieldSizeDisplay= 4, FieldSizeEdit = 4
+  FROM ModuleForms f
+  WHERE TypeObj = 222 and module_id = 1 
+  AND Name = 'Egg_code'
+
+
+
+   Update f SET FieldSizeDisplay= 4, FieldSizeEdit = 4
+  FROM ModuleForms f
+  WHERE TypeObj = 214 and module_id = 1 
+  AND Name = 'frequency'
+
+  Update f SET FieldSizeDisplay= 5, FieldSizeEdit = 5
+  FROM ModuleForms f
+  WHERE TypeObj = 214 and module_id = 1 
+  AND Name in ('sex','age','signal')
+
+
+Update f SET Options = 2010086
+FROM ModuleForms f
+WHERE module_id = 1 and TypeObj = 231 and Name = 'sex'
+
+
+INSERT INTO [dbo].[TVersion] (TVer_FileName,TVer_Date,TVer_DbName) VALUES ('95_Up_Conf_protcole',GETDATE(),(SELECT db_name()))
+
+
+GO

From d007852d16314dbba9325ad83bcb13cf0f18a7b6 Mon Sep 17 00:00:00 2001
From: romfabbro <romain_fabbro@natural-solutions.eu>
Date: Wed, 12 Oct 2016 11:33:14 +0200
Subject: [PATCH 23/30] SQL: change type in ecoReleve_Sensor

---
 .../096_ecoReleve_Sensor_Up_type_argos.txt        | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 Back/database/Pipe/DB_Mother/096_ecoReleve_Sensor_Up_type_argos.txt

diff --git a/Back/database/Pipe/DB_Mother/096_ecoReleve_Sensor_Up_type_argos.txt b/Back/database/Pipe/DB_Mother/096_ecoReleve_Sensor_Up_type_argos.txt
new file mode 100644
index 000000000..6e49a1328
--- /dev/null
+++ b/Back/database/Pipe/DB_Mother/096_ecoReleve_Sensor_Up_type_argos.txt
@@ -0,0 +1,15 @@
+
+  ALTER TABLE [ecoReleve_Sensor].[dbo].[T_argosgps]
+  ALTER COLUMN [type] varchar (20) not NULL 
+  GO 
+
+ UPDATE [ecoReleve_Sensor].[dbo].[T_argosgps] SET type = 'argos'
+ WHERE type ='arg' 
+GO 
+
+
+
+INSERT INTO [dbo].[TVersion] (TVer_FileName,TVer_Date,TVer_DbName) VALUES ('96_ecoReleve_Sensor_Up_type_argos',GETDATE(),(SELECT db_name()))
+
+
+GO

From 08e19cb89c82a6636d45869101576147fbb604a8 Mon Sep 17 00:00:00 2001
From: romfabbro <romain_fabbro@natural-solutions.eu>
Date: Wed, 12 Oct 2016 11:50:03 +0200
Subject: [PATCH 24/30] Up_SP_validate_RFID_add_OriginalDataID

---
 .../DB_Mother/097_Up_SP_validate_ALL_RFID.txt | 112 +++++++++++++++++
 .../DB_Mother/098_Up_SP_validate_RFID.txt     | 113 ++++++++++++++++++
 2 files changed, 225 insertions(+)
 create mode 100644 Back/database/Pipe/DB_Mother/097_Up_SP_validate_ALL_RFID.txt
 create mode 100644 Back/database/Pipe/DB_Mother/098_Up_SP_validate_RFID.txt

diff --git a/Back/database/Pipe/DB_Mother/097_Up_SP_validate_ALL_RFID.txt b/Back/database/Pipe/DB_Mother/097_Up_SP_validate_ALL_RFID.txt
new file mode 100644
index 000000000..34f80c599
--- /dev/null
+++ b/Back/database/Pipe/DB_Mother/097_Up_SP_validate_ALL_RFID.txt
@@ -0,0 +1,112 @@
+
+
+ALTER PROCEDURE [dbo].[sp_validate_ALL_rfid]
+	@freq int,
+	@user int,
+	@nb_insert int OUTPUT,
+	@error int OUTPUT,
+	@exist int OUTPUT
+AS
+BEGIN
+	-- SET NOCOUNT ON added to prevent extra result sets from
+	-- interfering with SELECT statements.
+	SET NOCOUNT ON;
+
+	DECLARE @data_to_insert table ( PK_id int
+		, FK_ind int
+		, FK_Sensor int
+		, chip_code varchar(10)
+		, date_ datetime
+		, lat decimal(9,5)
+		, lon decimal(9,5)
+		,ele int
+		,freq int );
+	Declare @data_duplicate table (
+		PK_id int
+	
+	);
+
+	-- Gather not validated data.
+	WITH data AS (
+		SELECT ID
+			, FK_Sensor
+			, chip_code
+			, date_
+			,validated
+			,checked
+			, FK_MonitoredSite
+			, ROW_NUMBER() OVER (PARTITION BY FK_Sensor, chip_code, CONVERT(DATE, date_), DATEPART(hour, date_), DATEPART(minute, date_)/@freq ORDER BY date_) as r
+		FROM VRfidData_With_equipSite where checked = 0
+	)
+	INSERT INTO @data_to_insert
+	(	PK_id
+		, FK_Sensor
+		, chip_code 
+		, date_
+		, lat 
+		, lon
+		,freq
+		,ele)
+    SELECT data.ID
+		, data.FK_Sensor
+		, data.chip_code
+		, data.date_
+		, lat
+		, lon
+		,@freq
+		,ele
+    FROM data
+	JOIN MonitoredSitePosition p 
+		ON p.FK_MonitoredSite = data.FK_MonitoredSite AND p.StartDate <= data.date_
+	WHERE not exists (SELECT * FROM MonitoredSitePosition p1 
+					WHERE p.FK_MonitoredSite = p1.FK_MonitoredSite AND p1.StartDate > p.StartDate AND  p1.StartDate <= data.date_ )
+	and data.FK_MonitoredSite is not null AND data.r = 1 AND data.validated = 0 and data.checked=0;
+
+	UPDATE d SET FK_ind = iv.FK_Individual
+	FROM @data_to_insert d
+	JOIN IndividualDynPropValue iv
+		ON d.chip_code = iv.ValueString AND iv.FK_IndividualDynProp = 7 AND iv.StartDate <= d.date_
+	WHERE NOT EXISTS (
+			SELECT * FROM IndividualDynPropValue iv2 
+			WHERE iv.FK_Individual = iv2.FK_IndividualDynProp AND iv.FK_IndividualDynProp = iv2.FK_IndividualDynProp 
+			AND iv2.StartDate > iv.StartDate AND iv2.StartDate <= d.date_)
+
+	insert into @data_duplicate
+	SELECT d.PK_id
+	FROM @data_to_insert d JOIN Individual_Location loc 
+	ON d.FK_ind = loc.FK_Individual and d.date_ = loc.Date and d.FK_Sensor = loc.FK_Sensor
+	
+	-- Insert only the first chip lecture per RFID, per individual, per hour.
+	INSERT INTO Individual_Location (creator, FK_Sensor, FK_Individual, type_, Date, lat, lon, creationDate,FK_Region,ELE,OriginalData_ID)
+	SELECT @user, FK_Sensor, FK_ind, 'rfid', date_, lat, lon, CURRENT_TIMESTAMP,NULL,ele,'T_rfid_'+CONVERT(Varchar,d.PK_id)
+	FROM @data_to_insert d WHERE d.PK_id NOT IN (SELECT * FROM @data_duplicate)
+
+
+
+	-- Update inserted data.
+	UPDATE VRfidData_With_equipSite SET validated = 1 , frequency= @freq
+	WHERE VRfidData_With_equipSite.ID IN (SELECT PK_id FROM @data_to_insert);
+	UPDATE VRfidData_With_equipSite SET checked = 1	Where checked = 0
+
+
+	
+	SELECT @nb_insert = COUNT(*) FROM @data_to_insert where PK_id not in (select * from @data_duplicate)
+	Select @exist = Count (*) from @data_duplicate 
+	SELECT @error = @@ERROR
+
+	RETURN
+END
+
+
+
+
+GO
+
+
+
+
+
+INSERT INTO [dbo].[TVersion] (TVer_FileName,TVer_Date,TVer_DbName) VALUES ('97_Up_SP_validate_ALL_RFID',GETDATE(),(SELECT db_name()))
+
+
+GO
diff --git a/Back/database/Pipe/DB_Mother/098_Up_SP_validate_RFID.txt b/Back/database/Pipe/DB_Mother/098_Up_SP_validate_RFID.txt
new file mode 100644
index 000000000..832c1ea15
--- /dev/null
+++ b/Back/database/Pipe/DB_Mother/098_Up_SP_validate_RFID.txt
@@ -0,0 +1,113 @@
+
+
+
+ALTER PROCEDURE [dbo].[sp_validate_rfid]
+	@IdEquip int,
+	@freq int,
+	@user int,
+	@nb_insert int OUTPUT,
+	@error int OUTPUT,
+	@exist int OUTPUT
+AS
+BEGIN
+	-- SET NOCOUNT ON added to prevent extra result sets from
+	-- interfering with SELECT statements.
+	SET NOCOUNT ON;
+
+	DECLARE @data_to_insert table ( PK_id int
+		, FK_ind int
+		, FK_Sensor int
+		, chip_code varchar(10)
+		, date_ datetime
+		, lat decimal(9,5)
+		, lon decimal(9,5)
+		,ele int
+		,freq int );
+	Declare @data_duplicate table (
+		PK_id int
+	
+	);
+
+	-- Gather not validated data.
+	WITH data AS (
+		SELECT ID
+			, FK_Sensor
+			, chip_code
+			, date_
+			,validated
+			,checked
+			, FK_MonitoredSite
+			, ROW_NUMBER() OVER (PARTITION BY FK_Sensor, chip_code, CONVERT(DATE, date_), DATEPART(hour, date_), DATEPART(minute, date_)/@freq ORDER BY date_) as r
+		FROM VRfidData_With_equipSite where equipID = @IdEquip 
+	)
+	INSERT INTO @data_to_insert
+	(	PK_id
+		, FK_Sensor
+		, chip_code 
+		, date_
+		, lat 
+		, lon
+		,freq
+		,ele)
+    SELECT data.ID
+		, data.FK_Sensor
+		, data.chip_code
+		, data.date_
+		, lat
+		, lon
+		,@freq
+		,ele
+    FROM data
+	JOIN MonitoredSitePosition p 
+		ON p.FK_MonitoredSite = data.FK_MonitoredSite AND p.StartDate <= data.date_
+	WHERE not exists (SELECT * FROM MonitoredSitePosition p1 
+					WHERE p.FK_MonitoredSite = p1.FK_MonitoredSite AND p1.StartDate > p.StartDate AND  p1.StartDate <= data.date_ )
+	and data.FK_MonitoredSite is not null AND data.r = 1 AND data.validated = 0 and data.checked=0;
+
+	UPDATE d SET FK_ind = iv.FK_Individual
+	FROM @data_to_insert d
+	JOIN IndividualDynPropValue iv
+		ON d.chip_code = iv.ValueString AND iv.FK_IndividualDynProp = 7 AND iv.StartDate <= d.date_
+	WHERE NOT EXISTS (
+			SELECT * FROM IndividualDynPropValue iv2 
+			WHERE iv.FK_Individual = iv2.FK_IndividualDynProp AND iv.FK_IndividualDynProp = iv2.FK_IndividualDynProp 
+			AND iv2.StartDate > iv.StartDate AND iv2.StartDate <= d.date_)
+
+	insert into @data_duplicate
+	SELECT d.PK_id
+	FROM @data_to_insert d JOIN Individual_Location loc 
+	ON d.FK_ind = loc.FK_Individual and d.date_ = loc.Date and d.FK_Sensor = loc.FK_Sensor
+	
+	-- Insert only the first chip lecture per RFID, per individual, per hour.
+	INSERT INTO Individual_Location (creator, FK_Sensor, FK_Individual, type_, Date, lat, lon, creationDate,FK_Region,ELE,OriginalData_ID)
+	SELECT @user, FK_Sensor, FK_ind, 'rfid', date_, lat, lon, CURRENT_TIMESTAMP,dbo.fn_GetRegionFromLatLon(lat,lon),ele,'T_rfid_'+CONVERT(Varchar,d.PK_id)
+	FROM @data_to_insert d WHERE d.PK_id NOT IN (SELECT * FROM @data_duplicate)
+
+
+
+	-- Update inserted data.
+	UPDATE VRfidData_With_equipSite SET validated = 1 , frequency= @freq
+	WHERE VRfidData_With_equipSite.ID IN (SELECT PK_id FROM @data_to_insert);
+	UPDATE VRfidData_With_equipSite SET checked = 1	Where equipID = @IdEquip
+
+
+	
+	SELECT @nb_insert = COUNT(*) FROM @data_to_insert where PK_id not in (select * from @data_duplicate)
+	Select @exist = Count (*) from @data_duplicate 
+	SELECT @error = @@ERROR
+
+	RETURN
+END
+
+
+
+GO
+
+
+
+
+
+INSERT INTO [dbo].[TVersion] (TVer_FileName,TVer_Date,TVer_DbName) VALUES ('98_Up_SP_validate_RFID',GETDATE(),(SELECT db_name()))
+
+
+GO

From 456497d0a3d36d252b889831a48d0351b7453796 Mon Sep 17 00:00:00 2001
From: romfabbro <romain_fabbro@natural-solutions.eu>
Date: Wed, 12 Oct 2016 11:59:22 +0200
Subject: [PATCH 25/30] SQL: Up value OriginalData_ID in Indiv_Location

update for RFID sensor
---
 ...Up_Individual_Location_OriginalDataID_withRFID.txt | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 Back/database/Pipe/DB_Mother/099_Up_Individual_Location_OriginalDataID_withRFID.txt

diff --git a/Back/database/Pipe/DB_Mother/099_Up_Individual_Location_OriginalDataID_withRFID.txt b/Back/database/Pipe/DB_Mother/099_Up_Individual_Location_OriginalDataID_withRFID.txt
new file mode 100644
index 000000000..a56b8c64a
--- /dev/null
+++ b/Back/database/Pipe/DB_Mother/099_Up_Individual_Location_OriginalDataID_withRFID.txt
@@ -0,0 +1,11 @@
+UPDATE l SET OriginalData_ID = 'T_rfid_'+CONVERT(VARCHAR,r.ID)
+FROM Individual_Location l 
+JOIN ecoReleve_Sensor.dbo.T_rfid r ON l.FK_Sensor = r.FK_Sensor AND l.Date = r.date_ 
+WHERE l.OriginalData_ID is null and type_ = 'rfid'
+GO
+
+
+INSERT INTO [dbo].[TVersion] (TVer_FileName,TVer_Date,TVer_DbName) VALUES ('99_Up_Individual_Location_OriginalDataID_withRFID',GETDATE(),(SELECT db_name()))
+
+
+GO

From ae71f67b7df69660209396d7fa29b42ceb3e6880 Mon Sep 17 00:00:00 2001
From: romfabbro <romain_fabbro@natural-solutions.eu>
Date: Wed, 12 Oct 2016 12:03:51 +0200
Subject: [PATCH 26/30] up import argos change type arg in argos

---
 Back/ecoreleve_server/Views/argosImport.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Back/ecoreleve_server/Views/argosImport.py b/Back/ecoreleve_server/Views/argosImport.py
index 90edeb8b0..eb81e3014 100644
--- a/Back/ecoreleve_server/Views/argosImport.py
+++ b/Back/ecoreleve_server/Views/argosImport.py
@@ -84,7 +84,7 @@ def parseDSFileAndInsert(full_filename,session):
         os.makedirs(out_path)
     try:
         os.remove(con_file)
-    except : 
+    except :
         pass
 
     # Config init.txt for MTI-PArser
@@ -92,7 +92,7 @@ def parseDSFileAndInsert(full_filename,session):
     cc['out'] = out_path
     cc['ini'] = con_file
 
-    with open(con_file,'w') as f: 
+    with open(con_file,'w') as f:
         print('-eng\n-title\n-out\n'+out_path+'\n'+full_filename, file=f)
 
     # execute MTI-Parser
@@ -119,7 +119,7 @@ def parseDSFileAndInsert(full_filename,session):
         parent.kill()
     except: pass
 
-    # WARNING if another client execute this process this function kill all active process 
+    # WARNING if another client execute this process this function kill all active process
     # try:
     #     os.system('taskkill /f /im MTIwinGPS.exe')
     # except:
@@ -169,7 +169,7 @@ def parseDSFileAndInsert(full_filename,session):
             except :
                 EngDataBis = tempEng
 
-    if EngData is not None : 
+    if EngData is not None :
         EngToInsert = checkExistingEng(EngData,session)
         nb_existingEng += EngData.shape[0]
         if EngToInsert.shape[0] != 0 :
@@ -226,7 +226,7 @@ def checkExistingEng(EngData,session) :
         # Extract non existing data
         DFToInsert = EngData[~EngData['id'].isin(merge['id'])]
 
-        # rename column 
+        # rename column
         DFToInsert['FK_ptt'] = DFToInsert['ptt']
         DFToInsert = DFToInsert.drop(['id','ptt'],1)
     except:
@@ -316,7 +316,7 @@ def parseDIAGFileAndInsert(full_filename,session):
             else:
                 try :
                     splitParameters[i] = re.sub('[\s]'," ",splitParameters[i])
-                    a = 1 
+                    a = 1
                     if colsInBlock[i] in ['lon1','lon2','lat1','lat2']:
                         if 'W' in splitParameters[i] or 'S' in splitParameters[i]:
                             a = -1
@@ -336,7 +336,7 @@ def parseDIAGFileAndInsert(full_filename,session):
     df = pd.DataFrame.from_dict(ListOfdictParams)
     df = df.dropna(subset=['date'])
     DFToInsert = checkExistingArgos(df,session)
-    DFToInsert.loc[:,('type')]=list(itertools.repeat('arg',len(DFToInsert.index)))
+    DFToInsert.loc[:,('type')]=list(itertools.repeat('argos',len(DFToInsert.index)))
     DFToInsert.loc[:,('checked')]=list(itertools.repeat(0,len(DFToInsert.index)))
     DFToInsert.loc[:,('imported')]=list(itertools.repeat(0,len(DFToInsert.index)))
     DFToInsert = DFToInsert.drop(['id','lat1','lat2','lon1','lon2'],1)
@@ -361,7 +361,7 @@ def checkExistingArgos (dfToCheck,session) :
     queryArgos = queryArgos.where(and_(ArgosGps.date >= minDate , ArgosGps.date <= maxDate))
     data = session.execute(queryArgos).fetchall()
 
-    # load data from Db into DF 
+    # load data from Db into DF
     ArgosRecords = pd.DataFrame.from_records(data
         ,columns=[ArgosGps.pk_id.name, ArgosGps.date.name, ArgosGps.lat.name, ArgosGps.lon.name, ArgosGps.ptt.name]
         , coerce_float=True )

From 13cde0eab6fc5eea8e7383e8e6eec368050df05c Mon Sep 17 00:00:00 2001
From: ktalbi <khaled_talbi@hotmail.com>
Date: Wed, 12 Oct 2016 15:31:08 +0200
Subject: [PATCH 27/30] fix_support_panel z-index

---
 Front/app/base/rootview/lyt-rootview.js | 55 ++++++++++++++++++++++++-
 Front/app/styles/base/_header.less      |  1 +
 2 files changed, 54 insertions(+), 2 deletions(-)

diff --git a/Front/app/base/rootview/lyt-rootview.js b/Front/app/base/rootview/lyt-rootview.js
index 6c1dcedb3..e6b8420e8 100644
--- a/Front/app/base/rootview/lyt-rootview.js
+++ b/Front/app/base/rootview/lyt-rootview.js
@@ -1,5 +1,5 @@
-define(['marionette', 'transition-region', './base/header/lyt-header'],
-function(Marionette, TransitionRegion, LytHeader) {
+define(['marionette', 'transition-region', './base/header/lyt-header', 'config'],
+function(Marionette, TransitionRegion, LytHeader,config) {
   'use strict';
 
   return Marionette.LayoutView.extend({
@@ -7,6 +7,16 @@ function(Marionette, TransitionRegion, LytHeader) {
     template: 'app/base/rootview/tpl-rootview.html',
     className: 'full-height',
 
+    events: {
+      'click #pipefy' : 'pipefyform',
+      'click .pipefyclose' :'closeform'
+    },
+
+    ui: {
+      'pypefy' : '#pipefy',
+      'pypefypanel' :'div.supportpanel'
+    },
+
     regions: {
       rgHeader: 'header',
       rgMain: new Marionette.TransitionRegion({
@@ -18,5 +28,46 @@ function(Marionette, TransitionRegion, LytHeader) {
     onRender: function() {
       this.rgHeader.show(new LytHeader);
     },
+    closeform : function(){
+      $('div.supportpanel').animate({ "right": "-=560px" }, "slow" ).addClass('hidden');
+    },
+    onShow : function(){
+       var isDomoInstance = config.instance ;
+      if(isDomoInstance == 'demo') {
+        $('.pipefy-support').removeClass('hidden');
+      }
+    },
+    controlformdisplay : function(){
+      var notdisplayed = $('div.supportpanel').hasClass('hidden');
+      if(notdisplayed){
+        $('div.supportpanel').removeClass('hidden').animate({
+          "right": "+=560px"}, { duration: 700,
+          complete: function() {
+              $('.supportpanel').append('<a class="pipefyclose"><span class="reneco reneco-close"></span></a>');
+          }
+        }
+
+       );
+      } else {
+        this.closeform();
+      }
+
+    },
+    insertForm : function(){
+      var frm = '<div class="supportpanel hidden"><div class="supportheader">Support</div>'
+      frm +='<iframe width="560" height="800" src="https://beta.pipefy.com/public_form/49561?embedded=true" frameborder="0" id="iframe"></iframe></div>';
+      this.$el.append(frm);
+      this.controlformdisplay();
+    },
+    pipefyform : function(e){
+      // check id div is not integrated add it
+      var frmisinserted  = $('.supportpanel').length;
+      if (!frmisinserted) {
+        this.insertForm();
+      } else {
+        this.controlformdisplay();
+      }
+
+    },
   });
 });
diff --git a/Front/app/styles/base/_header.less b/Front/app/styles/base/_header.less
index ffd946076..f371bde8e 100644
--- a/Front/app/styles/base/_header.less
+++ b/Front/app/styles/base/_header.less
@@ -64,6 +64,7 @@ header{
     right: -560px;
     height: 95%;
 	top: 0px;
+	z-index : 1000;
 }
 .supportheader {  
 height: 2.4em;

From 4850affbdd3ffc65dbe6f40760562909c5ecd88a Mon Sep 17 00:00:00 2001
From: ktalbi <khaled_talbi@hotmail.com>
Date: Wed, 12 Oct 2016 15:32:01 +0200
Subject: [PATCH 28/30] fix support panel z-index

---
 Front/app/base/header/lyt-header.js | 40 +----------------------------
 1 file changed, 1 insertion(+), 39 deletions(-)

diff --git a/Front/app/base/header/lyt-header.js b/Front/app/base/header/lyt-header.js
index f1ad2bd3a..8ac7760dd 100644
--- a/Front/app/base/header/lyt-header.js
+++ b/Front/app/base/header/lyt-header.js
@@ -6,9 +6,7 @@ function($,Marionette, config, Breadcrumb) {
     template: 'app/base/header/tpl-header.html',
     className: 'header',
     events: {
-      'click #logout': 'logout',
-      'click #pipefy' : 'pipefyform',
-      'click .pipefyclose' :'closeform'
+      'click #logout': 'logout'
     },
     regions: {
       'breadcrumb': '#breadcrumb'
@@ -16,8 +14,6 @@ function($,Marionette, config, Breadcrumb) {
 
     ui: {
       'userName': '#userName',
-      'pypefy' : '#pipefy',
-      'pypefypanel' :'div.supportpanel'
     },
 
     logout: function() {
@@ -60,41 +56,7 @@ function($,Marionette, config, Breadcrumb) {
       }
       this.breadcrumb.show(new Breadcrumb());
     },
-     pipefyform : function(e){
-      // check id div is not integrated add it
-      var frmisinserted  = $('.supportpanel').length;
-      if (!frmisinserted) {
-        this.insertForm();
-      } else {
-        this.controlformdisplay();
-      }
 
-    },
-    closeform : function(){
-      $('div.supportpanel').animate({ "right": "-=560px" }, "slow" ).addClass('hidden');
-    },
-    insertForm : function(){
-      var frm = '<div class="supportpanel hidden"><div class="supportheader">Support</div>'
-      frm +='<iframe width="560" height="800" src="https://beta.pipefy.com/public_form/49561?embedded=true" frameborder="0" id="iframe"></iframe></div>';
-      this.$el.append(frm);
-      this.controlformdisplay();
-    },
-    controlformdisplay : function(){
-      var notdisplayed = $('div.supportpanel').hasClass('hidden');
-      if(notdisplayed){
-        $('div.supportpanel').removeClass('hidden').animate({
-          "right": "+=560px"}, { duration: 700,
-          complete: function() {
-              $('.supportpanel').append('<a class="pipefyclose"><span class="reneco reneco-close"></span></a>');
-          }
-        }
-
-       );
-      } else {
-        this.closeform();
-      }
-
-    },
     getUser : function(){
       var _this = this;
       var user  = new Backbone.Model();

From 395c13c1dfd7add0e232ef2c558fc71d543bdfd8 Mon Sep 17 00:00:00 2001
From: ktalbi <khaled_talbi@hotmail.com>
Date: Wed, 12 Oct 2016 16:39:13 +0200
Subject: [PATCH 29/30] fix_zindex error msg on map

---
 Front/app/styles/ui/_map.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Front/app/styles/ui/_map.less b/Front/app/styles/ui/_map.less
index bc4e22800..909030e3c 100644
--- a/Front/app/styles/ui/_map.less
+++ b/Front/app/styles/ui/_map.less
@@ -37,7 +37,7 @@
 		width: 100%;
 		height: 66px;
 		bottom: 0;
-		z-index: 1000000;
+		z-index: 999;
 		text-align: center;
 		border-top: 1px dashed white;
 		background: rgba(0,0,0,0.5);

From ae6835eda9b90788d38bf81b1e02d51a32800edc Mon Sep 17 00:00:00 2001
From: ktalbi <khaled_talbi@hotmail.com>
Date: Wed, 12 Oct 2016 17:39:28 +0200
Subject: [PATCH 30/30] fix bug bullet in stepper (stepper number), css

#129617753
---
 Front/app/styles/ns_modules/_stepper.less | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Front/app/styles/ns_modules/_stepper.less b/Front/app/styles/ns_modules/_stepper.less
index 7d87890f8..9c8e986f9 100644
--- a/Front/app/styles/ns_modules/_stepper.less
+++ b/Front/app/styles/ns_modules/_stepper.less
@@ -863,3 +863,6 @@ div.fuelux{
 	display: none;
 }*/
 
+.badge {
+    display: inline !important;
+ }
\ No newline at end of file