diff --git a/webapp/class/meetus.js b/webapp/class/meetus.js index 5ce00c1131e44b0fb1fab96831ee63b6a2c93383..d5b3a44b537bb7501cd1007e5d82fa2bf97d045a 100644 --- a/webapp/class/meetus.js +++ b/webapp/class/meetus.js @@ -10,7 +10,7 @@ var search = require('./appointement/search_cities') var hash = require('./hash/hash') module.exports = { - create_meeting: (id, data) => { + create_meeting: (data, callback) => { // !!! validate data !!! @@ -20,6 +20,8 @@ module.exports = { db.create_meeting(id, JSON.stringify(data), function(result){ console.log(result); + + callback(id) }) }) diff --git a/webapp/ressources/socket.js b/webapp/ressources/socket.js index 811e0cf0befcf6cd034c251dcc680e0afcda390b..e87eb1ea0e619dd9b300bef2391a470e35bb78a8 100644 --- a/webapp/ressources/socket.js +++ b/webapp/ressources/socket.js @@ -31,8 +31,10 @@ module.exports = function(server){ }) - socket.on('create_meeting', function(idMeeting, data){ - meetus.create_meeting(idMeeting, data) + socket.on('create_meeting', function(data){ + meetus.create_meeting(data, function(idMeeting){ + socket.emit('create_meeting', idMeeting) + }) }) socket.on('add_user', function(idMeeting, data){ diff --git a/webapp/views/create-meeting.ejs b/webapp/views/create-meeting.ejs index ae06b591da1f2b4f7e7a642418e8598744255e67..7193d81da5a62de1858cccf1164c2540139987e6 100644 --- a/webapp/views/create-meeting.ejs +++ b/webapp/views/create-meeting.ejs @@ -32,63 +32,70 @@ ] } - socket.emit('create_meeting', $('#id').val(), data) + socket.emit('create_meeting', data) /*} else { $('#msg').removeClass('d-none') .addClass('d-block') .html('Erreur: Le formule n\'est pas conforme') }*/ + } + + +socket.on('create_meeting', function(id){ + window.location.href = "/meeting/" + id +}) + + </script> <%- include('elements/nav.inc.ejs') %> <div class="col-lg-10 offset-lg-1"> + <h1 class="mb-4">Create new meeting</h1> <div class="card"> <div class="card-body"> - <h1 class="mb-4">Create new meeting</h1> <div class="mb-4" style="height: 50px"> <p class="alert alert-danger d-none" id="msg"></p> </div> - <form> - <div class="form-group row"> - <label for="meeting_name" class="col-sm-4 col-form-label">Meeting name</label> - <div class="col-sm-8"> - <input class="w-100" type="text" placeholder="Meetus" value="Meetus" id="meeting_name"> - </div> - </div> + <form class="mb-5"> + <div class="row"> + <div class="col-md-6"> + <label for="meeting_name" class="col-form-label d-block">Meeting name</label> + <input class="w-75" type="text" placeholder="Meetus" value="Meetus" id="meeting_name"> + + <label for="creator_name" class="col-form-label d-block">Creator name</label> + <input class="w-75" type="text" placeholder="Michael Jackson" value="Michael Jackson" id="creator_name"> - <div class="form-group row"> - <label for="creator_name" class="col-sm-4 col-form-label">Creator name</label> - <div class="col-sm-8"> - <input class="w-100" type="text" placeholder="Michael Jackson" value="Michael Jackson" id="creator_name"> </div> - </div> - <div class="form-group row"> - <label for="date_from" class="col-sm-2 col-form-label">From</label> - <div class="col-sm-4"> - <input type="number" min="1" max="31" value="27" id="df_day">/ - <input type="number" min="1" max="12" value="6" id="df_month">/ + <div class="col-md-6"> + <label for="date_from" class="col-form-label d-block">From</label> + + <input type="number" min="1" max="31" value="27" id="df_day"> / + <input type="number" min="1" max="12" value="6" id="df_month"> / <input type="number" min="2019" value="2019" id="df_year"> - </div> - <label for="date_to" class="col-sm-2 col-form-label">to</label> - <div class="col-sm-4"> - <input type="number" min="1" max="31" value="17" id="dt_day">/ - <input type="number" min="1" max="12" value="7" id="dt_month">/ + + <label for="date_to" class="col-form-label d-block">to</label> + + <input type="number" min="1" max="31" value="17" id="dt_day"> / + <input type="number" min="1" max="12" value="7" id="dt_month"> / <input type="number" min="2019" value="2019" id="dt_year"> </div> </div> + + + </form> - <button type="button" name="button" class="btn btn-primary" onclick="create_meeting()">Create</button> + <button type="button" name="button" class="btn btn-primary float-right" onclick="create_meeting()">Create</button> </div> </div> </div> - +<%- include('elements/foot.inc.ejs') %> </body> diff --git a/webapp/views/meeting.ejs b/webapp/views/meeting.ejs index 2117ef15350b3709621e9492e095454cf24df988..980c044eda63a96c547219707340165c811407ab 100644 --- a/webapp/views/meeting.ejs +++ b/webapp/views/meeting.ejs @@ -23,12 +23,11 @@ <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="button" class="btn btn-info mx-2" onclick="update_center()">Center</button> <button type="button" name="button" class="btn btn-secondary mx-2" onclick="update_appointement()">Appointement</button> <button type="button" name="button" class="btn btn-danger mx-2" onclick="update_journeys()">Journey</button> <button type="button" name="button" class="btn btn-success mx-2" onclick="socket.emit('test_class')">Test</button> - --> </div> </div>