Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion nginx/public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ <h3 id="message">Welcome!</h3>
<br/><br/>

<button onclick="readyToHelp();">TA Ready to Help</button>

<button onclick="helpTwo();">TA Ready to Help Two Students</button>
<br/>

<div id="queue"></div>
Expand Down
4 changes: 4 additions & 0 deletions nginx/public/officeHours.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,7 @@ function enterQueue() {
function readyToHelp() {
socket.emit("ready_for_student");
}

function helpTwo() {
socket.emit("help_two_students");
}
20 changes: 20 additions & 0 deletions src/main/scala/model/OfficeHoursServer.scala
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ class OfficeHoursServer() {
server.addDisconnectListener(new DisconnectionListener(this))
server.addEventListener("enter_queue", classOf[String], new EnterQueueListener(this))
server.addEventListener("ready_for_student", classOf[Nothing], new ReadyForStudentListener(this))
server.addEventListener("help_two_students", classOf[Nothing], new TwoStudentListener(this))

server.start()

Expand Down Expand Up @@ -83,4 +84,23 @@ class ReadyForStudentListener(server: OfficeHoursServer) extends DataListener[No
}
}

class TwoStudentListener(server: OfficeHoursServer) extends DataListener[Nothing] {
override def onData(socket: SocketIOClient, dirtyMessage: Nothing, ackRequest: AckRequest): Unit = {
val queue = server.database.getQueue.sortBy(_.timestamp)
if(queue.nonEmpty){
val onestudentToHelp = queue.head
val twostudentToHelp = queue(1)
server.database.removeStudentFromQueue(onestudentToHelp.username)
server.database.removeStudentFromQueue(twostudentToHelp.username)
socket.sendEvent("message", "You are now helping " + onestudentToHelp.username + " and " + twostudentToHelp.username)
if(server.usernameToSocket.contains(onestudentToHelp.username)){
server.usernameToSocket(onestudentToHelp.username).sendEvent("message", "A TA is ready to help you")
}
if(server.usernameToSocket.contains(twostudentToHelp.username)){
server.usernameToSocket(twostudentToHelp.username).sendEvent("message", "A TA is ready to help you")
}
server.server.getBroadcastOperations.sendEvent("queue", server.queueJSON())
}
}
}