diff --git a/documents/poster/PowerPoint.pptx b/documents/poster/PowerPoint.pptx
index c77213329eaf55336a5321266a7d48cbf20cfb11..27054c312ddc6322bb2cadfb04863aba3e313b54 100644
Binary files a/documents/poster/PowerPoint.pptx and b/documents/poster/PowerPoint.pptx differ
diff --git a/documents/poster/~$PowerPoint.pptx b/documents/poster/~$PowerPoint.pptx
deleted file mode 100644
index 743e3ed40e3ade22d08d0ad6dafcfeaa6b3c74ce..0000000000000000000000000000000000000000
Binary files a/documents/poster/~$PowerPoint.pptx and /dev/null differ
diff --git a/webapp/class/email/email.js b/webapp/class/email/email.js
index b984a742dd6f1dafde692d06da93b79d65c2c6e4..9a5c79abb212d490c8a38ad69ab796014684a476 100644
--- a/webapp/class/email/email.js
+++ b/webapp/class/email/email.js
@@ -39,7 +39,7 @@ module.exports = {
<p>La date du <b>${date}</b> vient d'être choisit car elle permet à un maximum de personne d'être présente.</p>
- <p>Malheureusment seul <b>${perc}%</b> des ${nbPeople} membres pourront être présent ce jour-ci.</p>
+ <p>Malheureusement seul <b>${perc}%</b> des ${nbPeople} membres pourront être présent ce jour-ci.</p>
<p>Ce mail a pour but d'être informatif et vous demande de prendre note de cette information.</p>
diff --git a/webapp/class/meetus.js b/webapp/class/meetus.js
index f7351531975581c1c3468a5c2e7a1907ca80260b..d3bcbc6eb71ca97979120d8afb4d4368f38da0ad 100644
--- a/webapp/class/meetus.js
+++ b/webapp/class/meetus.js
@@ -52,6 +52,24 @@ module.exports = {
})
},
+ update_user: (idMeeting, idUser, data, callback) => {
+ user.update_user(idMeeting, idUser, data, function(result){
+
+ appointement.choose_appointment(idMeeting, function(r){
+
+ journey.update_center(idMeeting, function(res){
+
+ journey.update_journeys(idMeeting, function(c){
+
+ email.new_member(idMeeting, data)
+
+ callback(res)
+ })
+ })
+ })
+ })
+ },
+
remove_user: (idMeeting, idUser, callback) => {
db.remove_user(idMeeting, idUser, function(){
diff --git a/webapp/class/user/user.js b/webapp/class/user/user.js
index b2f8aea22556d439660d8d079b13c4ab8dd44962..cc108054bfcef8000379599e77d5f513625518e9 100644
--- a/webapp/class/user/user.js
+++ b/webapp/class/user/user.js
@@ -5,8 +5,6 @@ var http = require('../../api/http_request')
module.exports = {
add_user: (idMeeting, data, callback) => {
- var coordinate
-
var coordinate = http.get_coordinate(data.address)
coordinate.then(function(coor){
@@ -25,6 +23,24 @@ module.exports = {
},
+ update_user: (idMeeting, idUser, data, callback) => {
+ var coordinate = http.get_coordinate(data.address)
+
+ coordinate.then(function(coor){
+ data['coordinate'] = {lat: coor.lat, lon: coor.lon}
+
+ console.log("user data", data);
+
+ db.update_user(idMeeting, idUser, JSON.stringify(data), function(result){
+ console.log(result);
+ callback(result);
+ })
+
+ }, function(error){
+ console.log(error);
+ })
+ },
+
send_mail: (idMeeting, percentage, callback) => {
var email_list = http.get_email(idMeeting)
diff --git a/webapp/ressources/socket.js b/webapp/ressources/socket.js
index b99fe05406834e9ff18701482708d37c6d154273..b0b0d7a8ab7c39bd9a4bc9c7a780c21b08f840fc 100644
--- a/webapp/ressources/socket.js
+++ b/webapp/ressources/socket.js
@@ -46,6 +46,12 @@ module.exports = function(server){
socket.on('update_user', function(idMeeting, idUser, data){
+ console.log("Je modifie:", idMeeting, idUser, data);
+
+
+ meetus.update_user(idMeeting, idUser, data, function(){
+ get_meeting(idMeeting)
+ })
})
socket.on('remove_user', function(idMeeting, idUser){
diff --git a/webapp/views/include/user.ejs b/webapp/views/include/user.ejs
index 129db906269519beabea169c2f81135d05196e02..ca8a70f4f1d2ac9009001d873f7895655173dd80 100644
--- a/webapp/views/include/user.ejs
+++ b/webapp/views/include/user.ejs
@@ -55,10 +55,12 @@
</form>
- <button type="button" name="button" class="btn btn-secondary" onclick="toggle_add_user()">Annuler</button>
+ <button type="button" name="button" class="btn btn-secondary" onclick="toggle_user()">Annuler</button>
<button type="button" name="button" class="btn btn-primary" onclick="add_user()">Ajouter</button>
+ <button type="button" name="button" class="btn btn-warning" onclick="update_user(2)">Modifier</button>
+
</div>
</div>
</main>
diff --git a/webapp/views/js/meeting.js b/webapp/views/js/meeting.js
index 99783dd55b90c1b49a7ca0a3ce00b2548d5d5530..6fb0610f36453d9d5740edbd6ca3126d390bede2 100644
--- a/webapp/views/js/meeting.js
+++ b/webapp/views/js/meeting.js
@@ -136,9 +136,9 @@ socket.on('get_meeting', function(data){
<h5 class="card-subtitle d-inline-block">${user.name}</h5>
<div class="d-inline-block">
- <button class="btn btn-warning" type="button" name="button" onclick="toggle_modify_user(${i})">Modify</button>
- <button class="btn btn-danger" type="button" name="button" onclick="remove_user(${i})">delete</button>
- <button type="button" class="btn btn-outline-primary" onclick="toggle_user_info( ${i})" id="show_more">Afficher plus</button>
+ <button class="btn btn-warning" type="button" name="button" onclick="toggle_modify_user(${i})">Modify</button>
+ <button class="btn btn-danger" type="button" name="button" onclick="remove_user(${i})">delete</button>
+ <button type="button" class="btn btn-outline-primary" onclick="toggle_user_info( ${i})" id="show_more">Afficher plus</button>
</div>
<h6 class="card-subtitle font-weight-normal">${user.email}</h6>
@@ -205,7 +205,7 @@ socket.on('get_meeting', function(data){
socket.emit('update_appointement', id_meeting)
}
- function toggle_add_user(){
+ function toggle_user(){
$('#user').toggleClass('d-none d-flex');
}
@@ -217,7 +217,7 @@ socket.on('get_meeting', function(data){
$('#email').val(data.email)
$('#city').val(data.address)
- $('#user').toggleClass('d-none d-flex');
+ toggle_user()
})
}
@@ -238,7 +238,22 @@ socket.on('get_meeting', function(data){
socket.emit('add_user', id_meeting, user)
- toggle_add_user()
+ toggle_user()
+ }
+
+ function update_user(idUser){
+ console.log('jupdate');
+ var user = {
+ name: $('#name').val(),
+ email: $('#email').val(),
+ address: $('#city').val(),
+ calendar: create_calendar(),
+ journey: {}
+ }
+
+ socket.emit('update_user', id_meeting, idUser, user)
+
+ toggle_user()
}
function remove_user(idUser){
diff --git a/webapp/views/meeting.ejs b/webapp/views/meeting.ejs
index acd6d8c731b1defbdfa8f45ba9463c9340b218d6..46cc99fe40c12ab477c9a24b9fb843fc83e655a6 100644
--- a/webapp/views/meeting.ejs
+++ b/webapp/views/meeting.ejs
@@ -22,7 +22,7 @@
<div class="w-100 d-flex mb-3">
<h2 class="font-weight-bold">Utilisateurs</h2>
<div class="d-flex justify-content-end w-100">
- <button type="button" name="add user" class="btn btn-primary" onclick="toggle_add_user()">Ajouter un membre</button>
+ <button type="button" name="add user" class="btn btn-primary" onclick="toggle_user()">Ajouter un membre</button>
<!--
<button type="button" name="button" class="btn btn-info mx-2" onclick="update_center()">Center</button>