diff --git a/webapp/class/email/email.js b/webapp/class/email/email.js index 05ce6fe27f1a45041fd448a85592d5ab91dcdc78..b984a742dd6f1dafde692d06da93b79d65c2c6e4 100644 --- a/webapp/class/email/email.js +++ b/webapp/class/email/email.js @@ -20,7 +20,7 @@ module.exports = { <p>Pour rejoindre le rendez-vous il suffit d'entrer le code sur la page d'accueil du site.</p> <p>Une fois sur la page du rendez-vous il suffit d'appuyez sur le bouton "ajouter un membre" et - d'entrer le informations pour ajouter une personne.</p> + d'entrer les informations.</p> <p>Cordialement</p> @@ -55,9 +55,34 @@ module.exports = { }) }) + }, + + new_member: (idMeeting, data) => { + let sub = "MEETUS: Bien arrivé" + + var msg = ` + <p>Vous venez d'ajouter un compte au rendez-vous <b>${idMeeting}</b>.</p> + + <p>Les informations du compte</p> + + <p><b>Nom</b> ${data.name}</p> + <p><b>Email</b> ${data.email}</p> + <p><b>Ville</b> ${data.address}</p> + + <b>Calendar</b> + <ul> + ${data.calendar.map(date => `<li>${date.day}/${date.month}/${date.year} from: ${date.from.hour}:${date.from.minutes} to: ${date.to.hour}:${date.to.minutes}</li>`)} + </ul> - } + <p>Cordialement</p> + + <p>L'équipe technique de Meetus</p> + ` + + + send(data.email, sub, msg).catch(console.error); + } } diff --git a/webapp/class/journey/journey.js b/webapp/class/journey/journey.js index 748e46a5953c8d02a856c9f45dcc395895f185df..c21228717217fe7abf0e32db3650a9818d83f509 100644 --- a/webapp/class/journey/journey.js +++ b/webapp/class/journey/journey.js @@ -178,7 +178,7 @@ function choose_new_point(point){ } function validate_city(idMeeting, city_to, date){ - var maxDiff = 60, diff, tableTimes = [], time + var maxDiff = 60, diff = 0, tableTimes = [], time, sum = 0, avg = 0 return new Promise(function(res, rej){ @@ -210,18 +210,20 @@ function validate_city(idMeeting, city_to, date){ // wait for all promises to be done Promise.all(promises).then(function(){ + if (tableTimes.length > 1) { - var min = Math.min(...tableTimes) - var max = Math.max(...tableTimes) + var min = Math.min(...tableTimes) + var max = Math.max(...tableTimes) - if(max != min){ - diff = max - min - }else{ - diff = min - } + if(max != min){ + diff = max - min + }else{ + diff = min + } - var sum = tableTimes.reduce((previous, current) => current += previous); - var avg = parseInt(sum / tableTimes.length); + sum = tableTimes.reduce((previous, current) => current += previous); + avg = parseInt(sum / tableTimes.length); + } res({city: city_to, diff: diff, avg: avg}); diff --git a/webapp/class/meetus.js b/webapp/class/meetus.js index 624fb7e336ebb51cead085deebc417d5ba3e5b71..f7351531975581c1c3468a5c2e7a1907ca80260b 100644 --- a/webapp/class/meetus.js +++ b/webapp/class/meetus.js @@ -23,7 +23,6 @@ module.exports = { console.log(result); email.new_meeting(data.email, id) - //console.log("email:", data.email); callback(id) }) @@ -44,6 +43,8 @@ module.exports = { journey.update_journeys(idMeeting, function(c){ + email.new_member(idMeeting, data) + callback(res) }) }) @@ -63,6 +64,7 @@ module.exports = { journey.update_center(idMeeting, function(){ journey.update_journeys(idMeeting, function(){ + callback() })