Skip to content

Yiyuan Wang #156

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
YiyuanWang233 wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Yiyuan Wang #156

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
5 changes: 4 additions & 1 deletion nginx/public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,10 @@ <h3 id="message">Welcome!</h3>
<br/>

<div id="queue"></div>

<br/><br/><br/>
<p>Comment</p>
<input type="text" id="comment"/><button onclick="feedback();">Submit</button>
<script src="officeHours.js"></script>
<script src="officeHours.js"></script>


Expand Down
5 changes: 5 additions & 0 deletions nginx/public/officeHours.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,8 @@ function enterQueue() {
function readyToHelp() {
socket.emit("ready_for_student");
}
function feedback() {
let comment = "comment_" + document.getElementById("comment").value;
socket.emit("enter_queue", comment);
document.getElementById("comment").value = "";
}
24 changes: 18 additions & 6 deletions src/main/scala/model/OfficeHoursServer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ import play.api.libs.json.{JsValue, Json}


class OfficeHoursServer() {

var list:List[String]=List()
var feedBackList:List[String]=List()
val database: DatabaseAPI = if(Configuration.DEV_MODE){
new TestingDatabase
}else{
Expand Down Expand Up @@ -49,7 +50,7 @@ class DisconnectionListener(server: OfficeHoursServer) extends DisconnectListene
override def onDisconnect(socket: SocketIOClient): Unit = {
if (server.socketToUsername.contains(socket)) {
val username = server.socketToUsername(socket)
server.socketToUsername -= socket
server.socketToUsername -= socket
if (server.usernameToSocket.contains(username)) {
server.usernameToSocket -= username
}
Expand All @@ -58,12 +59,23 @@ 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(username.slice(0,8)=="comment_"){
server.feedBackList=server.feedBackList:+username
println(server.feedBackList)
}
else{
if(server.list.contains(username)){}
else{
server.list=server.list:+username
server.database.addStudentToQueue(StudentInQueue(username, System.nanoTime()))
server.socketToUsername += (socket -> username)
server.usernameToSocket += (username -> socket)
server.server.getBroadcastOperations.sendEvent("queue", server.queueJSON())
}
}
}
}

Expand Down