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
3 changes: 3 additions & 0 deletions nginx/public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ <h3 id="message">Welcome!</h3>
<input type="text" id="name"/>
<button onclick="enterQueue();">Enter Queue</button>
<br/><br/>
<input type="text" id="chat"/>
<button onclick="enterChatText();">Submit Text to TA</button>
<br/><br/>

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

Expand Down
6 changes: 6 additions & 0 deletions nginx/public/officeHours.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,12 @@ function enterQueue() {
document.getElementById("name").value = "";
}

function enterChatText() {
let newChatMessage1 = document.getElementById("chat").value;
socket.emit("chat_input", newChatMessage1);
document.getElementById("chat").value = "";
}

function readyToHelp() {
socket.emit("ready_for_student");
}
64 changes: 64 additions & 0 deletions src/main/scala/model/OfficeHoursServer.scala
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ import play.api.libs.json.{JsValue, Json}

class OfficeHoursServer() {

var chatLog: Map[SocketIOClient, List[String]] = Map()

val database: DatabaseAPI = if(Configuration.DEV_MODE){
new TestingDatabase
}else{
Expand All @@ -27,6 +29,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("chat_input", classOf[String], new ChatListener(this))

server.start()

Expand All @@ -36,6 +39,29 @@ class OfficeHoursServer() {
Json.stringify(Json.toJson(queueJSON))
}

def printChats(): Unit = {
if (this.chatLog.keys.isEmpty) {
println("Empty chat log")
} else {
for (user <- this.chatLog.keys) {
if (this.chatLog(user).isEmpty) {
println(" ")
println("Socket: " + user)
println("_______________")
println(" ")
} else {
println(" ")
println("Socket: " + user)
println("_______________")
for (chatLine <- this.chatLog(user)) {
println(chatLine)
}
println(" ")
}
}
}
}

}

object OfficeHoursServer {
Expand Down Expand Up @@ -83,4 +109,42 @@ class ReadyForStudentListener(server: OfficeHoursServer) extends DataListener[No
}
}

class ChatListener(server: OfficeHoursServer) extends DataListener[String] {
override def onData(socket: SocketIOClient, chatMessage: String, ackRequest: AckRequest): Unit = {
if (server.chatLog.contains(socket)) {
val prevChats: List[String] = server.chatLog(socket)
val currentChats: List[String] = chatMessage :: prevChats
server.chatLog = server.chatLog + (socket -> currentChats)
} else {
server.chatLog = server.chatLog + (socket -> List(chatMessage))
}




if (server.chatLog.keys.isEmpty) {
println("Empty chat log")
} else {
for (user <- server.chatLog.keys) {
if (server.chatLog(user).isEmpty) {
println(" ")
println("Socket: " + user)
println("_______________")
println(" ")
} else {
println(" ")
println("Socket: " + user)
println("_______________")
for (chatLine <- server.chatLog(user)) {
println(chatLine)
}
println(" ")
}
}
}


}
}