~ Adding a google pie chart that will display the number of students …

…that asked for help for a certain topic/subtopic
UB-CSE · Nildham21 · Apr 24, 2020 · Apr 25, 2020 · Apr 25, 2020 · Apr 25, 2020
commit f5d33e1b15a685114c669c4111b96e27e6ac317b
diff --git a/nginx/public/index.html b/nginx/public/index.html
@@ -6,6 +6,8 @@
     <!--stylesheets Css-->
     <link rel="stylesheet" type="text/css" href="style.css">
     <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/2.2.0/socket.io.js"></script>
+    <script type="text/javascript" src="https://www.gstatic.com/charts/loader.js"></script>
+
 </head>
 <body onload="firstcounter()">
 

diff --git a/nginx/public/officeHours.js b/nginx/public/officeHours.js
@@ -1,4 +1,7 @@
 const socket = io.connect("http://localhost:8080", {transports: ['websocket']});
+google.charts.load('current', {'packages':['corechart']});
+
+
 
 socket.on('queue', displayQueue);
 socket.on('message', displayMessageTA);
@@ -8,6 +11,12 @@ socket.on('done', studentDone);
 socket.on('count', counter);
 socket.on('valid_Check',displayTA);
 socket.on("invalid",displayInvalid);
+socket.on("showTopicPie",getTopicPieData);
+socket.on("showSubtopicPie",getSubtopicPieData);
+
+
+
+
 
 
 
@@ -21,6 +30,14 @@ let lecture=Array("Unit-Testing","Test-Factoring","Voting-Class","Reference-Refe
 let hw=Array("Physics-Engine","Rhyming-Dictionary","Calculator","Microwave","Genetic-Algorithm","Recommendations","Decision-Tree","Maze-Solver","Clicker")
 let appObj=Array("Program-Execution","Object-Oriented-Programming","Functional-Programming","Data-Structures-&-Algorithms","Event-Based-Architectures")
 let lab=Array("Program-Execution","Object-Oriented-Programming","Functional-Programming","Data-Structures-&-Algorithms","Event-Based-Architectures")
+let topics=Array( "Lecture","Hw","AppObj","Lab")
+let subtopics=Array("Unit-Testing","Test-Factoring","Voting-Class","Reference-Referee","Reference-Trader","Reference-Batteries",
+    "Inheritance-Batteries","Polymorphic-Electronics","JSON-Store","Player-States","TV-States","Car-States",
+    "Function-and-Type-Parameters","Recursive-Fibonacci","Recursive-Factoring","Average-in-Range","Immutable-Point",
+    "Linked-List-Reduce","Backlog","Expression-Trees","BST-toList","Graph-Connections","Graph-Distance",
+    "Actors","Banking-Actor","Traffic-Actors","Websocket","Echo-Server","DM-Server","Physics-Engine","Rhyming-Dictionary","Calculator",
+    "Microwave","Genetic-Algorithm","Recommendations","Decision-Tree","Maze-Solver","Clicker","Program-Execution","Object-Oriented-Programming",
+    "Functional-Programming","Data-Structures-&-Algorithms","Event-Based-Architectures")
 
 let topicMap={
     "Lecture":lecture,
@@ -30,6 +47,9 @@ let topicMap={
 }
 let username=""
 
+var data=[]
+var data2=[]
+
 function displayMessageTA(newMessage) {
     username=newMessage
     var studentValues=newMessage.split("#")
@@ -131,6 +151,9 @@ function enterQueue() {
 }
 
 function displayTA() {
+
+    document.getElementById("HelpInfo").innerHTML=""
+
     let TAname=document.getElementById("username").value
     document.getElementById("optionButtons").innerHTML="";
     document.getElementById("subtitle").innerText="You are viewing the student queue";
@@ -224,8 +247,75 @@ function getStatsOption() {
         "        <option value=\"statTopic\">Topic Stats</option>\n" +
         "        <option value=\"statSubtopic\">Subtopic Stats</option>\n" +
         "        </select><br/>" +
-        "        <button id=\"buttonNext\" class= \"addSpace\">Next</button>"
+        "        <button id=\"buttonNext\" class= \"addSpace\" onclick=\"getInfo();\">Next</button>"+
+        "        <div id=\"displayinfo\" class= \"addSpace\" align='center' ></div>"
 
     document.getElementById("statOption").innerHTML=selections;
+}
+function getInfo() {
+    let option=document.getElementById("statsValue").value;
+    if(option=="TaHelpCount"){
+        socket.emit("get_TA_Stat")
+    }
+    else{
+        socket.emit("get_Student_Stat",option)
+    }
+}
+
 
+
+function getTopicPieData(message) {
+    var pasred=JSON.parse(message)
+    var tempdata=[]
+    tempdata.push(['Subject',"# of times asked"])
+
+    for( let value of topics){
+        if(value in pasred){
+            var temp=[value,pasred[value]]
+            tempdata.push(temp)
+        }
+    }
+
+    data=tempdata;
+    callPie();
+}
+
+function getSubtopicPieData(message) {
+    var pasred=JSON.parse(message)
+    var tempdata=[]
+    tempdata.push(['Subject',"# of times asked"])
+
+    for( let value of subtopics){
+        if(value in pasred){
+            var temp=[value,pasred[value]]
+            tempdata.push(temp)
+        }
+    }
+
+    data2=tempdata;
+    socket.emit("ad",data2)
+    callPie2();
 }
+function callPie() {
+    google.charts.setOnLoadCallback(displayPie);
+
+}
+function callPie2() {
+    google.charts.setOnLoadCallback(displayPie2);
+
+}
+function displayPie() {
+    document.getElementById('displayinfo').innerHTML=""
+    var chartload = google.visualization.arrayToDataTable(data);
+    var options = {'title':'What Students needed help with', 'width':550, 'height':500};
+    var chart = new google.visualization.PieChart(document.getElementById('displayinfo'));
+    chart.draw(chartload, options);
+}
+function displayPie2() {
+    document.getElementById('displayinfo').innerHTML=""
+    var chartload = google.visualization.arrayToDataTable(data2);
+    var options = {'title':'What Students needed help with', 'width':550, 'height':500};
+    var chart = new google.visualization.PieChart(document.getElementById('displayinfo'));
+    chart.draw(chartload, options);
+}
+
diff --git a/src/main/scala/model/OfficeHoursServer.scala b/src/main/scala/model/OfficeHoursServer.scala
@@ -47,6 +47,10 @@ class OfficeHoursServer() {
   server.addEventListener("done_helping", classOf[String], new doneHelpingListener(this))
   server.addEventListener("first_count", classOf[Nothing], new countListener(this))
   server.addEventListener("check_login", classOf[String], new loginListener(this))
+  server.addEventListener("get_TA_Stat", classOf[Nothing], new TAStatListener(this))
+  server.addEventListener("get_Student_Stat", classOf[String], new StudentStatListener(this))
+
+
 
 
   server.start()
@@ -267,4 +271,29 @@ class loginListener(server: OfficeHoursServer) extends DataListener[String] {
   }
 }
 
+class TAStatListener(server:OfficeHoursServer) extends DataListener[Nothing]{
+  override def onData(socketIOClient: SocketIOClient, t: Nothing, ackRequest: AckRequest): Unit = {
+    val TAinfo:Map[String,Int]=server.database.getTAHelpInfo()
+    println(TAinfo)
+  }
+}
+
+class StudentStatListener(server: OfficeHoursServer) extends DataListener[String] {
+  override def onData(socket: SocketIOClient, option: String, ackRequest: AckRequest): Unit = {
+
+    if(option=="statTopic"){
+      val Studentinfo:Map[String,Int]=server.database.getTopicStat()
+      println(Studentinfo)
+      socket.sendEvent("showTopicPie",Json.stringify(Json.toJson(Studentinfo)))
+    }
+    else{
+      val Studentinfo:Map[String,Int]=server.database.getSubtopicStat()
+      println(Studentinfo)
+      socket.sendEvent("showSubtopicPie",Json.stringify(Json.toJson(Studentinfo)))
+
+    }
+
+  }
+}
+
 
diff --git a/src/main/scala/model/database/Database.scala b/src/main/scala/model/database/Database.scala
@@ -21,18 +21,33 @@ class Database extends DatabaseAPI{
 
   def setupTable(): Unit = {
     val statement = connection.createStatement()
+
+//    statement.execute("DROP TABLE queue")
+//    statement.execute("DROP TABLE TaStats")
+//    statement.execute("DROP TABLE questions")
+
+
     statement.execute("CREATE TABLE IF NOT EXISTS queue(username TEXT, timestamp BIGINT, topic TEXT, subtopic TEXT)")
     statement.execute("CREATE TABLE IF NOT EXISTS TaStats(username TEXT, numOfStudentsHelped INT)")
+    statement.execute("CREATE TABLE IF NOT EXISTS questions(topic TEXT, subtopic TEXT)")
+
   }
 
 
   override def addStudentToQueue(student: StudentInQueue): Unit = {
-    val statement = connection.prepareStatement("INSERT INTO queue VALUES (?,?,?,?)")
+
+    var statement = connection.prepareStatement("INSERT INTO queue VALUES (?,?,?,?)")
 
     statement.setString(1, student.username)
     statement.setLong(2, student.timestamp)
     statement.setString(3, student.topic)
     statement.setString(4, student.subtopic)
+    statement.execute()
+
+    statement = connection.prepareStatement("INSERT INTO questions VALUES (?,?)")
+    statement.setString(1, student.topic)
+    statement.setString(2, student.subtopic)
+
 
     statement.execute()
   }
@@ -106,4 +121,56 @@ class Database extends DatabaseAPI{
      statement.execute()
    }
 
+  override def getTAHelpInfo():Map[String,Int]={
+    var TAtoCount:Map[String,Int]=Map()
+
+    val statement = connection.prepareStatement("SELECT * FROM TaStats")
+    val result: ResultSet = statement.executeQuery()
+
+    while(result.next()){
+      val username = result.getString("username")
+      val count = result.getInt("numOfStudentsHelped")
+      TAtoCount=TAtoCount+(username->count)
+    }
+    TAtoCount
+  }
+  override def getTopicStat():Map[String,Int]={
+    var TopictoCount:Map[String,Int]=Map()
+
+    val statement = connection.prepareStatement("SELECT * FROM questions")
+    val result: ResultSet = statement.executeQuery()
+
+    while(result.next()){
+      val topic = result.getString("topic")
+
+      if(TopictoCount.contains(topic)){
+        val count=TopictoCount(topic)
+        TopictoCount=TopictoCount+(topic->(count+1))
+      }
+      else{
+        TopictoCount=TopictoCount+(topic->1)
+      }
+    }
+    TopictoCount
+
+  }
+  override def getSubtopicStat():Map[String,Int]={
+    var SubtopictoCount:Map[String,Int]=Map()
+
+    val statement = connection.prepareStatement("SELECT * FROM questions")
+    val result: ResultSet = statement.executeQuery()
+
+    while(result.next()){
+      val subtopic = result.getString("subtopic")
+
+      if(SubtopictoCount.contains(subtopic)){
+        val count=SubtopictoCount(subtopic)
+        SubtopictoCount=SubtopictoCount+(subtopic->(count+1))
+      }
+      else{
+        SubtopictoCount=SubtopictoCount+(subtopic->1)
+      }
+    }
+    SubtopictoCount
+  }
 }
diff --git a/src/main/scala/model/database/DatabaseAPI.scala b/src/main/scala/model/database/DatabaseAPI.scala
@@ -9,6 +9,10 @@ trait DatabaseAPI {
   def getQueue: List[StudentInQueue]
   def addTA(username:String):Unit
   def addStudentHelped(usernameTA:String): Unit
+  def getTAHelpInfo():Map[String,Int]
+  def getTopicStat():Map[String,Int]
+  def getSubtopicStat():Map[String,Int]
+
 
 
 }
diff --git a/src/main/scala/model/database/TestingDatabase.scala b/src/main/scala/model/database/TestingDatabase.scala
@@ -28,4 +28,14 @@ class TestingDatabase extends DatabaseAPI {
 
   }
 
+  override def getTAHelpInfo():Map[String,Int]={
+    ???
+  }
+  override def getTopicStat():Map[String,Int]={
+    ???
+  }
+  override def getSubtopicStat():Map[String,Int]={
+    ???
+  }
+
 }