Skip to content
Snippets Groups Projects
Commit 5adc7c9d authored by Marc Vachon's avatar Marc Vachon
Browse files

MEeting bug fixed

parent a21551eb
No related branches found
No related tags found
No related merge requests found
...@@ -3,10 +3,10 @@ var db = require('./connect_db') ...@@ -3,10 +3,10 @@ var db = require('./connect_db')
module.exports = { module.exports = {
// MEETING // MEETING
get_meeting: (id_meeting, callback) => { get_meeting: (idMeeting, callback) => {
let query = "SELECT * FROM t_meeting WHERE idMeeting = ?"; let query = "SELECT * FROM t_meeting WHERE idMeeting = ?";
db.query(query, id_meeting, (error, results, fields) => { db.query(query, idMeeting, (error, results, fields) => {
var json var json
if (error){ if (error){
json = '' json = ''
...@@ -18,6 +18,16 @@ module.exports = { ...@@ -18,6 +18,16 @@ module.exports = {
}) })
}, },
reset_meeting: (idMeeting, callback) => {
let query = "UPDATE t_meeting SET data = JSON_SET(data, '$.percentage', 0, '$.location', '', '$.date', CAST('{}' AS JSON)) WHERE idMeeting = ?"
db.query(query, idMeeting, (error, results, fields) => {
if (error) throw error;
callback()
})
},
get_calendar: (idMeeting, callback) => { get_calendar: (idMeeting, callback) => {
get_users(idMeeting, function(users){ get_users(idMeeting, function(users){
var calendar = [] var calendar = []
...@@ -75,11 +85,17 @@ module.exports = { ...@@ -75,11 +85,17 @@ module.exports = {
db.query(query, [data, idMeeting], (error, results, fields) => { db.query(query, [data, idMeeting], (error, results, fields) => {
if (error) throw error; if (error) throw error;
console.log("update done");
callback(results) callback(results)
}) })
}, },
count_users: (idMeeting, callback) => {
get_users(idMeeting, function(users){
callback(users.length)
})
},
create_meeting: (id, data, callback) => { create_meeting: (id, data, callback) => {
let query = "INSERT INTO t_meeting (idMeeting, data) VALUES (?, ?);" let query = "INSERT INTO t_meeting (idMeeting, data) VALUES (?, ?);"
...@@ -156,10 +172,10 @@ module.exports = { ...@@ -156,10 +172,10 @@ module.exports = {
} }
function get_users(id_meeting, callback){ function get_users(idMeeting, callback){
let query = "SELECT data->'$.user_table' as user_table FROM t_meeting WHERE idMeeting = ?"; let query = "SELECT data->'$.user_table' as user_table FROM t_meeting WHERE idMeeting = ?";
db.query(query, id_meeting, (error, results, fields) => { db.query(query, idMeeting, (error, results, fields) => {
if (error) throw error; if (error) throw error;
var json = JSON.parse(results[0]['user_table']) var json = JSON.parse(results[0]['user_table'])
......
...@@ -40,17 +40,31 @@ module.exports = { ...@@ -40,17 +40,31 @@ module.exports = {
}, },
remove_user: (idMeeting, idUser, callback) => { remove_user: (idMeeting, idUser, callback) => {
db.remove_user(idMeeting, idUser, function(result){ db.remove_user(idMeeting, idUser, function(){
appointement.choose_appointment(idMeeting, function(r){ db.count_users(idMeeting, function(nb_user){
journey.update_center(idMeeting, function(res){ // if there are still users
if(nb_user > 0){
appointement.choose_appointment(idMeeting, function(){
journey.update_center(idMeeting, function(){
journey.update_journeys(idMeeting, function(){
callback()
journey.update_journeys(idMeeting, function(c){
callback(res)
}) })
}) })
}) })
}else {
db.reset_meeting(idMeeting, function(){
callback()
})
}
})
}) })
}, },
......
...@@ -65,13 +65,12 @@ socket.on('get_meeting', function(data){ ...@@ -65,13 +65,12 @@ socket.on('get_meeting', function(data){
<dl class="row"> <dl class="row">
<dt class="col-sm-3">Date</dt> <dt class="col-sm-3">Date</dt>
<dd class="col-sm-9"> <dd class="col-sm-9">
${data.date ? `Le ${data.date.day}/${data.date.month}/${data.date.year} ${data.date.time ? `Le ${data.date.day}/${data.date.month}/${data.date.year} à ${data.date.time.hour}:${data.date.time.minutes}` : ''}
à ${data.date.time.hour}:${data.date.time.minutes}` : ''}
</dd> </dd>
<dt class="col-sm-3">Works for</dt> <dt class="col-sm-3">Works for</dt>
<dd class="col-sm-9"> <dd class="col-sm-9">
${data.percentage}% ${data.percentage ? `${data.percentage}%` : ''}
</dd> </dd>
<dt class="col-sm-3">Lieux</dt> <dt class="col-sm-3">Lieux</dt>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment