From 0ba5de42a63f489d42afcfa85b7b1bd78b3f8f84 Mon Sep 17 00:00:00 2001
From: Marc Vachon <vachon.marc@outlook.com>
Date: Mon, 26 Aug 2019 12:44:33 +0200
Subject: [PATCH] update user fixed
---
documents/poster/PowerPoint.pptx | Bin 10968133 -> 10968134 bytes
documents/poster/~$PowerPoint.pptx | Bin 165 -> 0 bytes
webapp/class/email/email.js | 2 +-
webapp/class/meetus.js | 18 ++++++++++++++++++
webapp/class/user/user.js | 20 ++++++++++++++++++--
webapp/ressources/socket.js | 6 ++++++
webapp/views/include/user.ejs | 4 +++-
webapp/views/js/meeting.js | 27 +++++++++++++++++++++------
webapp/views/meeting.ejs | 2 +-
9 files changed, 68 insertions(+), 11 deletions(-)
delete mode 100644 documents/poster/~$PowerPoint.pptx
diff --git a/documents/poster/PowerPoint.pptx b/documents/poster/PowerPoint.pptx
index c77213329eaf55336a5321266a7d48cbf20cfb11..27054c312ddc6322bb2cadfb04863aba3e313b54 100644
GIT binary patch
delta 1343
zcmX@QV=n8l9dlV5S{PfHT9{i{T3B1yTG(4SS~y#{TDV(yT6kOdTKHQ8S_E5!T7+9f
zT0~pKTEtr<S|nSfTBKWKT4Y<~TI5?4S`=H9T9jK<T2x!qTGU%KS~Od<TC`hqT6A0V
zTJ&2CS`1r^T8vvvT1;EaTFhH4S}a?vTC7`aT5MbFTI^dKS{z%PTAW*4T3lP)THISa
zT0C34TD)6)T6|mlTKroAS^`^wT7p|bT0&dGTEbf*S|VGbTB2KGT4Gz`TH;$0S`u55
zT9R8*T2fomTGCrGS~6R*TC!VmT5?<RTJl>8S_)f=T8djrT1s2WTFP50S}I$rTB=)W
zT54PBTIyRGS{hrLTAEv0T3TD$TH0GWS~^?0TDn_$T6$ahTKZciv`lQ7)H1ncO3T!i
zX)V)RX0*&~nbk78Wlqc7mU%7nTNbn|Y+2N@xMfMp(w1dgmhT8)Ns?INw|!5*a&^Xf
zU%$f!0&d?u?i~DNw{>zr$eJr24H1EXou8D;rWt4I3R!Prcj`Z4xkJJ)gPB8R+T!<T
zFIOBp`Z7CsviOIC7S_vOwgfYU?Y?y5>zsS*^d?KHGEUVEeXDckr5Ka#)OPmPyw)<g
zY4^51xagp8F{Sy!+c|jx(FY?gNN0r1a5;2rLs9*{Knd^tX=^X}XYuMh{xie0VO7YA
z2z{Sh7d^^P1@)i$cJq4kf-5{(83&RQUaF+V>onybn$PR}sW*owFZze@-FD@_QfD~I
zV$ENEV(k6A{7qtEsj-cz;kNrz*|fTYxJ@FOV}5<#F7P}=BHU-%I_CW)$C3`ZEotA%
z-g@qIw8>V^daj2zC%0a_#~QA<bDh@W#EhHGe_69c3k3T^B{j}(D_Xcmt=ubrj_!^3
zJKlfzkn}71w2u6Qje2FXe}8fIeAIpPdEK{@wRLqHcP%k`{L=GKztFt(KYV=pUFO++
zTm1LMe<8Eooc~PEP0HEjm98|K>)d|H?@X3He?DJ7$<M&R@c%#aWHw=bPF{oi&sCWi
z7~Hm31TR-)tiPT2$UvYrKJ)*<Q`MXyqEU*ES9!HoXy^(ptSx)o81eeXG}{ZC;<x<Y
zXuoYTOVEu)?{xJoji0|rsY#k0zdx)kSJCC|8w<%Vzc`trEtbBmnxpgi<k9IZu2aH1
zAM5l?mOb($s^;I3=Lah}Rwx>6+E6%WN=Mz4Wg9gXPTJ_cMK$edy_4$1Qycv5W-aC3
zQF?S4Q}@f%{q{Z&MGtBPi0?D@i8_8!?Elq}or~t_+dZ@PuWNc9P^m0<#CdU=<xNKa
z-Dc-yy(YirI`W{%!zKKax_F4lm2AfSAMd?zQest0+r^=`OLWsroh`27-e%?c0?+!i
z=E-Gi8g`f@2K&xp?Z^?n7+P;*>-=#iPm$~r{lz<!jz%99chl}jI&j(c(RaR=SD$Bc
z{|M1$Eju6dd&#rSk!f4<JD8tzJ4v0;Fy1&xEyyIF*N!#vef!QUjZ>m!au+&?M_jp|
z;m#xcO-K2PXaD52JW)|TQIXLmH-2<D`ph|cVw#|c|L!#A{;kI&;;*jGKiGb#{#y3`
z`2RPmKZxJ+t<kxjq44j&`m9AKCw|C0^j2Li?92I&<&EaXTMD;7zB6IJrQG`|iQkP_
zz88f}@LW8<`CmtJc~$JANY}W3KjIj(`ENuX<zX;?zu3Cv!|6@N;gy-?E+sGgZm%zV
zSzI1H|K?ve+uTpCn#>xz_;&T)G5s+`iF=vCwe+Q1vIE%9Rxh%9*8g^^2HWAd`SYGx
r$X9)xX?rL9k^1&6Vaxeg!MS+)vFPR2hy*m9D`vSV+n%uH3=9kaXZds!
delta 1342
zcmX@MV=n8_9dlV5S{PfHT9{i{T3B1yTG(4SS~y#{TDV(yT6kOdTKHQ8S_E5!T7+9f
zT0~pKTEtr<S|nSfTBKWKT4Y<~TI5?4S`=H9T9jK<T2x!qTGU%KS~Od<TC`hqT6A0V
zTJ&2CS`1r^T8vvvT1;EaTFhH4S}a?vTC7`aT5MbFTI^dKS{z%PTAW*4T3lP)THISa
zT0C34TD)6)T6|mlTKroAS^`^wT7p|bT0&dGTEbf*S|VGbTB2KGT4Gz`TH;$0S`u55
zT9R8*T2fomTGCrGS~6R*TC!VmT5?<RTJl>8S_)f=T8djrT1s2WTFP50S}I$rTB=)W
zT54PBTIyRGS{hrLTAEv0T3TD$TH0GWS~^?0TDn_$T6$ahTKZciv`lQ7)H1ncO3T!i
zX)V)RX0*&~nbk78Wlqc7mU%7nTNbn|Y+2N@xMfMp(w1dgmhT8)$uy~~-M%MaxjJLL
zx8Gp{fwu1+cMg8CE0xpL3VY?%5D^&I`ANX~^vo?{ow7HX7rH-^iQ!Stbr$r{asO{V
z|CsT)=kH5h?;WVjJ=>$Uc!rR{DY08?(!bP|%KB=4)bLf*&Q5UK{@`WIoOw@HJv?O<
zVRgH~nRgz`<c~3?#=9JIERy4L7fh=Y;SfG_seV^flE&Rxra^m8m~JrXJ0HQT!QDBj
z^w0{)o|5%CR~F>N#a`v+I=Y}qil=H?kI=WXN;_`-zj;C3J!Ng-?E~{)D9XGjU(dcF
z_jcgyuNgD!6aBkq@BX)PqS@VbA^{V{yA~hgI&!JD?uWthBO8)7ZPDGa^eS7inS$&Z
z8ILV~cNVYPQa_zzeV@*jqHDK>PUc2tvDThue4`iO+238TCdj#PqbT=Fk;(~K$-d|6
zj>on)o8P?~wIs5ir*z-_JLmXWIrX3I{wp)-_?u5zrM|9G>dymh`X1$o`u|Khv-!zR
z>9_9xw{N)T|6zTh)Y8eJMaMQz=~s6@*6i>_`2U~MN8Ahy|Nk>jW)tS;yqi^fLWPNe
z!F78@@Nz}Q`q=zi1|qfdxBO3dx>sTum+y%ktAZ5eyt-X(+3o(wyYbnLX}K9U^>6*Z
zA%EMKM{>=I-;Y|0-&<PkwESqgyDHb@W)uIZS(#>1JjP7Rwgk=mYErF{CO+R-Xpuos
zMs~uiw+boYe;%`M`*N+ZpNq+nTX<Qd?Bdx0Qm3S(1lc^KQ?%+|OABuNlAX2MYidFA
zX<ufwOa6x+&N!6KqU;#A<DP+c-{jms;lY`w%l3VUcq8+xFwEicmW~7OtxYvA@JYPA
zy=Ft;3n$Y9?$d9)*Z!8Wm#5}T2Gg5cmTSEP4fXd0EZu%EY@&|KN}nwY)x3W*)n#r>
z`V!II=y-r}ch<GD=Rf;)Y^zWF!gF-mq3*5X>-c2YtybOe(&lXJm$<83mahDdSJJoP
z?9?d<-*mS5XKjmk61B6>!eN_MYnzPn<Ea-IC;z;eP%QAaFoNr8;LhI3x>GJz30(=d
z5qR8V)6I~3;c|}l9wD_f&uLwJ+2V_y8)qje@H46`uHD>x{8sWBz1!RUAH*isf4WtF
z&HkI*-_~+*dCib30{{LC#$J5d@x$cdmyX|D`z!y%KDf)H`Of5=>95z1Kl(`)sqfjY
zpU%4T!mFFBzgrZozE*0pTI1FG`%(&-`_E~KF%*6_+vUu$e@|JSwE7voPPw~UpH*#k
z9J;qfd$;|H<-XfiwX%0^cdVcAn{9S-O5Aq&Uwg#Tct0(u^xl&FZ$_T0ofLoDkJs0J
qUdS&0RuKD9e*4z2<$SE*Og#N~^m1!N`kBrhv)q(zci3_U1_l6Q2yxl~
diff --git a/documents/poster/~$PowerPoint.pptx b/documents/poster/~$PowerPoint.pptx
deleted file mode 100644
index 743e3ed40e3ade22d08d0ad6dafcfeaa6b3c74ce..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 165
ycmd<~O)N@Q2un=P$j@U?AR2Hp_%b9i6fq<-C@_REBr+s3WH972<S{7F1OfoA!4kUw
diff --git a/webapp/class/email/email.js b/webapp/class/email/email.js
index b984a74..9a5c79a 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 f735153..d3bcbc6 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 b2f8aea..cc10805 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 b99fe05..b0b0d7a 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 129db90..ca8a70f 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 99783dd..6fb0610 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 acd6d8c..46cc99f 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>
--
GitLab