diff --git a/documents/diapo/diapositive_ceremonie.pdf b/documents/diapo/diapositive_ceremonie.pdf new file mode 100644 index 0000000000000000000000000000000000000000..e8ab717867f110ed83e671e52f7314c93f8dde55 Binary files /dev/null and b/documents/diapo/diapositive_ceremonie.pdf differ diff --git a/documents/diapo/diapositive_ceremonie.pptx b/documents/diapo/diapositive_ceremonie.pptx index 12a6ab22fd981efa161a7eb64411156723838e24..8e1c85b6100d84a307884aec42eb8ae72266f1dd 100644 Binary files a/documents/diapo/diapositive_ceremonie.pptx and b/documents/diapo/diapositive_ceremonie.pptx differ diff --git a/documents/poster/PowerPoint.pptx b/documents/poster/PowerPoint.pptx index 27054c312ddc6322bb2cadfb04863aba3e313b54..fcd12de464dba391751eaed53252f959b12f9050 100644 Binary files a/documents/poster/PowerPoint.pptx and b/documents/poster/PowerPoint.pptx differ diff --git a/documents/poster/poster_marcVachon_bachelor_2019.pdf b/documents/poster/poster_marcVachon_bachelor_2019.pdf new file mode 100644 index 0000000000000000000000000000000000000000..f6f286e4001d86c6175ea852092489c12614b4ba Binary files /dev/null and b/documents/poster/poster_marcVachon_bachelor_2019.pdf differ diff --git a/documents/screenshot/Screenshot 2019-08-27 at 13.00.51.png b/documents/screenshot/Screenshot 2019-08-27 at 13.00.51.png new file mode 100644 index 0000000000000000000000000000000000000000..ac608de8da2cb4197537a89283894893a429477e Binary files /dev/null and b/documents/screenshot/Screenshot 2019-08-27 at 13.00.51.png differ diff --git a/documents/screenshot/Screenshot 2019-08-27 at 13.01.14.png b/documents/screenshot/Screenshot 2019-08-27 at 13.01.14.png new file mode 100644 index 0000000000000000000000000000000000000000..b67f3b988a6c5f7ecd1cabe3691d05e610b01434 Binary files /dev/null and b/documents/screenshot/Screenshot 2019-08-27 at 13.01.14.png differ diff --git a/documents/screenshot/Screenshot 2019-08-27 at 13.01.42.png b/documents/screenshot/Screenshot 2019-08-27 at 13.01.42.png new file mode 100644 index 0000000000000000000000000000000000000000..154af12ad98b047f1f2dad924e3d4a8292ea51b5 Binary files /dev/null and b/documents/screenshot/Screenshot 2019-08-27 at 13.01.42.png differ diff --git a/webapp/class/user/user.js b/webapp/class/user/user.js index cc108054bfcef8000379599e77d5f513625518e9..38f1b8128c463d165e5c213b1a329aa8a3a0005c 100644 --- a/webapp/class/user/user.js +++ b/webapp/class/user/user.js @@ -29,7 +29,7 @@ module.exports = { coordinate.then(function(coor){ data['coordinate'] = {lat: coor.lat, lon: coor.lon} - console.log("user data", data); + console.log("Updated user data", data); db.update_user(idMeeting, idUser, JSON.stringify(data), function(result){ console.log(result); diff --git a/webapp/views/js/meeting.js b/webapp/views/js/meeting.js index 6fb0610f36453d9d5740edbd6ca3126d390bede2..37b3561093c69c2a0465461a129c6bfb24b7aef6 100644 --- a/webapp/views/js/meeting.js +++ b/webapp/views/js/meeting.js @@ -223,7 +223,6 @@ socket.on('get_meeting', function(data){ } function toggle_user_info(id){ - $(this).text('Afficher moins') $('#user-' + id).toggleClass('d-none d-block'); }