Skip to content

Prevents repeated queue submissions #164

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Josephslee99 wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Prevents repeated queue submissions #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions nginx/public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ <h3 id="message">Welcome!</h3>
<p>Name</p>
<input type="text" id="name"/>
<button onclick="enterQueue();">Enter Queue</button>
<div id="repeat"></div>
<br/><br/>

<button onclick="readyToHelp();">TA Ready to Help</button>
Expand Down
12 changes: 12 additions & 0 deletions nginx/public/officeHours.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,18 @@ const socket = io.connect("http://localhost:8080", {transports: ['websocket']});

socket.on('queue', displayQueue);
socket.on('message', displayMessage);
socket.on('repeat', displayRepeat);

function displayRepeat(sendMsg) {
const queue = JSON.parse(sendMsg);
if (queue['repeat'] === 'yes'){
let updatedForRepeats = queue['username'] + " is already in queue"
document.getElementById("repeat").innerHTML = updatedForRepeats;
}else{
let updatedForRepeats = queue['username'] + " is now in queue"
document.getElementById("repeat").innerHTML = updatedForRepeats;
}
}

function displayMessage(newMessage) {
document.getElementById("message").innerHTML = newMessage;
Expand Down
18 changes: 14 additions & 4 deletions src/main/scala/model/OfficeHoursServer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,20 @@ class DisconnectionListener(server: OfficeHoursServer) extends DisconnectListene

class EnterQueueListener(server: OfficeHoursServer) extends DataListener[String] {
override def onData(socket: SocketIOClient, username: String, ackRequest: AckRequest): Unit = {
server.database.addStudentToQueue(StudentInQueue(username, System.nanoTime()))
server.socketToUsername += (socket -> username)
server.usernameToSocket += (username -> socket)
server.server.getBroadcastOperations.sendEvent("queue", server.queueJSON())
if (server.database.getQueue.exists(s => s.username == username)){
println("User already in queue")
val messageMap: Map[String, JsValue] = Map("username" -> Json.toJson(username), "repeat" -> Json.toJson("yes"))
val sendMsg = Json.stringify(Json.toJson(messageMap))
server.server.getBroadcastOperations.sendEvent("repeat", sendMsg)
}else{
server.database.addStudentToQueue(StudentInQueue(username, System.nanoTime()))
server.socketToUsername += (socket -> username)
server.usernameToSocket += (username -> socket)
val messageMap: Map[String, JsValue] = Map("username" -> Json.toJson(username), "repeat" -> Json.toJson("no"))
val sendMsg = Json.stringify(Json.toJson(messageMap))
server.server.getBroadcastOperations.sendEvent("repeat", sendMsg)
server.server.getBroadcastOperations.sendEvent("queue", server.queueJSON())
}
}
}

Expand Down