From 22e8271b48453c13712a6b32f7598f342a8a3332 Mon Sep 17 00:00:00 2001
From: adriy <adriy@adriy.be>
Date: Mon, 7 Jan 2019 15:14:10 +0100
Subject: [PATCH] corection zone dans latng & correction slide

---
 bdd.js                             |   0
 config.json.sample                 |   0
 controllers/login-controller.js    |   0
 controllers/register-controller.js |   0
 controllers/securepw.js            |   0
 fonction.js                        |  46 +++++++++++++++--------------
 index.js                           |   0
 static/Icons/H1.png                | Bin
 static/Icons/h0.png                | Bin
 static/Js/index.js                 |   0
 static/Js/map.js                   |   0
 static/Shapes/circle-shape.svg     |   0
 static/Shapes/circles-shape.svg    |   0
 static/Shapes/curve1-shape.svg     |   0
 static/Shapes/curve2-shape.svg     |   0
 static/Shapes/triangle-shape.svg   |   0
 static/Shapes/water-shape.svg      |   0
 static/css/style.css               |   0
 views/TV_old.ejs                   |   0
 views/_index2.ejs                  |   0
 views/index.ejs                    |   0
 views/login.ejs                    |   0
 views/map.ejs                      |   0
 23 files changed, 24 insertions(+), 22 deletions(-)
 mode change 100644 => 100755 bdd.js
 mode change 100644 => 100755 config.json.sample
 mode change 100644 => 100755 controllers/login-controller.js
 mode change 100644 => 100755 controllers/register-controller.js
 mode change 100644 => 100755 controllers/securepw.js
 mode change 100644 => 100755 fonction.js
 mode change 100644 => 100755 index.js
 mode change 100644 => 100755 static/Icons/H1.png
 mode change 100644 => 100755 static/Icons/h0.png
 mode change 100644 => 100755 static/Js/index.js
 mode change 100644 => 100755 static/Js/map.js
 mode change 100644 => 100755 static/Shapes/circle-shape.svg
 mode change 100644 => 100755 static/Shapes/circles-shape.svg
 mode change 100644 => 100755 static/Shapes/curve1-shape.svg
 mode change 100644 => 100755 static/Shapes/curve2-shape.svg
 mode change 100644 => 100755 static/Shapes/triangle-shape.svg
 mode change 100644 => 100755 static/Shapes/water-shape.svg
 mode change 100644 => 100755 static/css/style.css
 mode change 100644 => 100755 views/TV_old.ejs
 mode change 100644 => 100755 views/_index2.ejs
 mode change 100644 => 100755 views/index.ejs
 mode change 100644 => 100755 views/login.ejs
 mode change 100644 => 100755 views/map.ejs

diff --git a/bdd.js b/bdd.js
old mode 100644
new mode 100755
diff --git a/config.json.sample b/config.json.sample
old mode 100644
new mode 100755
diff --git a/controllers/login-controller.js b/controllers/login-controller.js
old mode 100644
new mode 100755
diff --git a/controllers/register-controller.js b/controllers/register-controller.js
old mode 100644
new mode 100755
diff --git a/controllers/securepw.js b/controllers/securepw.js
old mode 100644
new mode 100755
diff --git a/fonction.js b/fonction.js
old mode 100644
new mode 100755
index f11b7c7..6fa9166
--- a/fonction.js
+++ b/fonction.js
@@ -1,22 +1,24 @@
-exports.choixZone = function(zones){
-  var zone = zones[0];
-  var aireMin = (zones[0].Nord-zones[0].Sud)*(zones[0].Est-zones[0].Ouest)
-  for(var i = 1;i<zones.length;i++)
-  {
-    var aire = (zones[i].Nord-zones[i].Sud)*(zones[i].Est-zones[i].Ouest)
-    if(aire<aireMin){
-      zone = zones[i];
-      aireMin = aire;
-    }
-  }
-  return zone;
-}
-
-exports.listPubDansZone = function(zone, callback){
-  var con = require('./bdd.js')
-  con.query("SELECT * FROM com_active  INNER JOIN zone ON com_active.ID_Zone = zone.ID_Zone  INNER JOIN communication ON com_active.ID_Com = communication.ID_Com WHERE zone.ID_Zone = ? ", [zone], function(err, result){
-    var data = JSON.stringify(result);
-    data = JSON.parse(data);
-    callback(err, data)
-  });
-}
+exports.choixZone = function(zones){
+	  var zone = zones[0];
+	  var aireMin = (zones[0].Nord-zones[0].Sud)*(zones[0].Est-zones[0].Ouest)
+	  for(var i = 1;i<zones.length;i++)
+		  {
+		      var aire = (zones[i].Nord-zones[i].Sud)*(zones[i].Est-zones[i].Ouest)
+		      if(aire<aireMin){
+			            zone = zones[i];
+			            aireMin = aire;
+			          }
+		    }
+	  return zone;
+}
+
+exports.listPubDansZone = function(zone, callback){
+	  var con = require('./bdd.js')
+	  con.query("SELECT * FROM com_active  INNER JOIN zone ON com_active.ID_Zone = zone.ID_Zone  INNER JOIN communication ON com_active.ID_Com = communication.ID_Com WHERE zone.ID_Zone = ? ", [zone], function(err, result){
+		      var data = JSON.stringify(result);
+		      console.log(data);
+		      data = JSON.parse(data);
+		      callback(err, data)
+		    });
+}
+
diff --git a/index.js b/index.js
old mode 100644
new mode 100755
diff --git a/static/Icons/H1.png b/static/Icons/H1.png
old mode 100644
new mode 100755
diff --git a/static/Icons/h0.png b/static/Icons/h0.png
old mode 100644
new mode 100755
diff --git a/static/Js/index.js b/static/Js/index.js
old mode 100644
new mode 100755
diff --git a/static/Js/map.js b/static/Js/map.js
old mode 100644
new mode 100755
diff --git a/static/Shapes/circle-shape.svg b/static/Shapes/circle-shape.svg
old mode 100644
new mode 100755
diff --git a/static/Shapes/circles-shape.svg b/static/Shapes/circles-shape.svg
old mode 100644
new mode 100755
diff --git a/static/Shapes/curve1-shape.svg b/static/Shapes/curve1-shape.svg
old mode 100644
new mode 100755
diff --git a/static/Shapes/curve2-shape.svg b/static/Shapes/curve2-shape.svg
old mode 100644
new mode 100755
diff --git a/static/Shapes/triangle-shape.svg b/static/Shapes/triangle-shape.svg
old mode 100644
new mode 100755
diff --git a/static/Shapes/water-shape.svg b/static/Shapes/water-shape.svg
old mode 100644
new mode 100755
diff --git a/static/css/style.css b/static/css/style.css
old mode 100644
new mode 100755
diff --git a/views/TV_old.ejs b/views/TV_old.ejs
old mode 100644
new mode 100755
diff --git a/views/_index2.ejs b/views/_index2.ejs
old mode 100644
new mode 100755
diff --git a/views/index.ejs b/views/index.ejs
old mode 100644
new mode 100755
diff --git a/views/login.ejs b/views/login.ejs
old mode 100644
new mode 100755
diff --git a/views/map.ejs b/views/map.ejs
old mode 100644
new mode 100755