From a928b52cebc80b7577c268475eddd9c19a3a5b64 Mon Sep 17 00:00:00 2001 From: Matt Huntington Date: Tue, 5 Sep 2017 15:22:47 -0400 Subject: [PATCH] uncompleted list --- public/admin.html | 4 ++++ public/js/admin.js | 15 +++++++++++++++ public/js/index.js | 2 +- server.js | 5 ++++- 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/public/admin.html b/public/admin.html index 38dffe7..65dd57b 100644 --- a/public/admin.html +++ b/public/admin.html @@ -19,6 +19,10 @@
+
Uncompleted List
+
+ +
Current Prompt:
diff --git a/public/js/admin.js b/public/js/admin.js index ab6b7e0..32100c8 100644 --- a/public/js/admin.js +++ b/public/js/admin.js @@ -1,4 +1,5 @@ let enteredPwd; +let students; while(enteredPwd !== 'lemme in'){ enteredPwd = prompt("Enter admin password"); } @@ -13,6 +14,19 @@ socket.on('prompt completed', function (usernames) { newLi.innerHTML = user; roster.appendChild(newLi); } + + //uncompleted + 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){ + const newLi = document.createElement('li'); + newLi.innerHTML = user; + uncompletedUl.appendChild(newLi); + } }); socket.on('prompt sent', function (prompt) { @@ -23,6 +37,7 @@ socket.on('prompt sent', function (prompt) { }); socket.on('username list', function (usernames) { + students = usernames; document.querySelector('#num-users').innerHTML = usernames.length; const roster = document.querySelector('#roster ul'); roster.innerHTML = ""; diff --git a/public/js/index.js b/public/js/index.js index da1c179..fb139c6 100644 --- a/public/js/index.js +++ b/public/js/index.js @@ -3,7 +3,7 @@ const button = document.querySelector('button'); let username; while(!username){ - username = prompt("Enter a username for this session"); + username = prompt("Enter your full name for this session"); socket.emit('user joined', username); } diff --git a/server.js b/server.js index e4af72a..be7605c 100644 --- a/server.js +++ b/server.js @@ -12,11 +12,12 @@ socketserver.on('connection', (socket)=>{ socketserver.emit('prompt sent', currentPrompt); socketserver.emit('username list', usernames); socketserver.emit('prompt completed', currentComplete); - + socket.on('prompt sent', (prompt)=>{ currentComplete = []; currentPrompt = prompt; socketserver.emit('prompt sent', currentPrompt); + socketserver.emit('prompt completed', currentComplete); }); socket.on('prompt completed', (username)=>{ currentComplete.push(username); @@ -31,12 +32,14 @@ socketserver.on('connection', (socket)=>{ socket.on('user joined', (username)=>{ usernames.push(username); socketserver.emit('username list', usernames); + socketserver.emit('prompt completed', currentComplete); }); socket.on('user dropped', (username)=>{ usernames = usernames.filter((currentElement)=>{ return currentElement !== username; }); socketserver.emit('username list', usernames); + socketserver.emit('prompt completed', currentComplete); }); });