From 747bea375615fb521bf697a198704d59b7e84b36 Mon Sep 17 00:00:00 2001 From: Matt Huntington Date: Tue, 19 Sep 2017 23:58:30 -0400 Subject: [PATCH] refresh roster --- public/admin.html | 8 +++++--- public/index.html | 2 +- public/js/admin.js | 8 ++++++-- public/js/index.js | 10 ++++++++++ server.js | 6 ++++++ 5 files changed, 28 insertions(+), 6 deletions(-) diff --git a/public/admin.html b/public/admin.html index 1113a9d..62408db 100644 --- a/public/admin.html +++ b/public/admin.html @@ -30,10 +30,12 @@ -

-
- +

Refresh Roster

+ +
+

Reset Class

+ diff --git a/public/index.html b/public/index.html index 363f6b8..5679229 100644 --- a/public/index.html +++ b/public/index.html @@ -16,7 +16,7 @@
Current Prompt
- + diff --git a/public/js/admin.js b/public/js/admin.js index 1efebb5..30ca83b 100644 --- a/public/js/admin.js +++ b/public/js/admin.js @@ -19,7 +19,6 @@ socket.on('prompt completed', function (usernames) { const uncompleted = students.filter((student)=>{ return usernames.indexOf(student) < 0; }); - console.log(uncompleted); const uncompletedUl = document.querySelector('#uncompleted-list ul'); uncompletedUl.innerHTML = ""; for(user of uncompleted){ @@ -54,7 +53,12 @@ document.querySelector('form').addEventListener('submit', (event)=>{ socket.emit('prompt sent', document.querySelector('[type="text"]').value); }); -document.querySelector('button').addEventListener('click', (event)=>{ +document.querySelector('#reset').addEventListener('click', (event)=>{ event.preventDefault(); socket.emit('reset class'); }); + +document.querySelector('#refresh').addEventListener('click', (event)=>{ + event.preventDefault(); + socket.emit('refresh roster'); +}); diff --git a/public/js/index.js b/public/js/index.js index 33ad4fa..73b1b4f 100644 --- a/public/js/index.js +++ b/public/js/index.js @@ -25,6 +25,16 @@ socket.on('disconnect students', function (prompt) { window.close(); }); +socket.on('get usernames', function (){ + socket.emit('user joined', username); +}); + +socket.on('get completeds', function (){ + if(button.getAttribute("disabled")){ + socket.emit('prompt completed', username); + } +}); + button.addEventListener('click', (event)=>{ button.setAttribute("disabled",true); button.classList.add("invisible"); diff --git a/server.js b/server.js index 1ed103b..612eb27 100644 --- a/server.js +++ b/server.js @@ -41,6 +41,12 @@ socketserver.on('connection', (socket)=>{ socketserver.emit('username list', usernames); socketserver.emit('prompt completed', currentComplete); }); + socket.on('refresh roster', ()=>{ + usernames = []; + currentComplete = []; + socketserver.emit('get usernames'); + socketserver.emit('get completeds'); + }) socket.on('reset class', ()=>{ usernames = []; currentComplete = [];