Merge branch 'main' of https://github.com/techx/qstack into sabrina_mentor_notes

Author: sabpdo

client/src/routes/admin.tsx

@@ -17,6 +17,7 @@ import * as admin from "../api/admin";
 interface ticket {
   total: number;
   averageRating: number;
+  averageTime: number;
 }
 
 interface user {
@@ -53,6 +54,7 @@ export default function AdminPanel() {
         const ticketStats: ticket = {
           total: parseInt(ticketRes.tags.total),
           averageRating: parseFloat(ticketRes.tags.averageRating),
+          averageTime: parseInt(ticketRes.tags.averageTime)
         };
         setTicketStats(ticketStats);
         setLoading(false);
@@ -95,6 +97,7 @@ export default function AdminPanel() {
                 Ticket Stats
               </Title>
               <Text>Total Resolved Tickets: {ticketStats.total}</Text>
+              <Text>Average Time to Claim Ticket: {ticketStats.averageTime}</Text>
               <Text>
                 Average Mentor Rating:{" "}
                 {computeNormalizedRating(
@@ -146,7 +149,7 @@ export default function AdminPanel() {
                 </Table.Tr>
               </Table.Thead>
               <Table.Tbody>
-                {users.map((user, index) => (
+                {users.map((user, _) => (
                   <>
                     <Table.Tr>
                       <Table.Td>{user.name}</Table.Td>

server/controllers/admin.py

@@ -18,19 +18,31 @@ def getTicketData():
     totalTickets = 0
     sumAverageMentorRating = 0
     totalMentors = 0
+    avgTime = 0
+    totalTickets = 0
 
     for mentor in mentors:
         totalTickets += len(mentor.ratings)
         if len(mentor.ratings) != 0:
             sumAverageMentorRating += sum(mentor.ratings) / len(mentor.ratings)
             totalMentors += 1
+    
+    for ticket in Ticket.query.all():
+        if ticket.claimedAt is not None:
+            avgTime += (ticket.claimedAt - ticket.createdAt).total_seconds()
+            totalTickets += 1
 
     if totalMentors != 0:
         averageRating = sumAverageMentorRating/totalMentors
     else:
         averageRating = 0
+    
+    if totalTickets != 0:
+        avgTimeToClaim = avgTime/totalTickets
+    else:
+        avgTimeToClaim = 0
 
-    return {"total": totalTickets, "averageRating": averageRating}
+    return {"total": totalTickets, "averageRating": averageRating, "averageTime": avgTimeToClaim}
 
 
 @admin.route("/userdata")

server/controllers/queue.py

@@ -36,6 +36,7 @@ def claim():
     ticket.claimant = user
     ticket.active = False
     user.claimed = ticket
+    ticket.claimedAt = db.func.now()
 
     db.session.commit()
     return {"message": "Ticket claimed!"}
@@ -59,6 +60,7 @@ def unclaim():
     ticket.claimant_id = None
     ticket.status = None
     user.claimed = None
+    ticket.claimedAt = None
 
     db.session.commit()
     return {"message": "Ticket unclaimed!"}

server/models/ticket.py

@@ -23,6 +23,7 @@ class Ticket(db.Model):
     status = Column(String)
 
     createdAt = Column(DateTime, nullable=False)
+    claimedAt = Column(DateTime)
 
     def __init__(self, user, data, active):
         self.creator = user
@@ -34,6 +35,7 @@ def __init__(self, user, data, active):
         self.active = active
         self.createdAt = db.func.now()
         self.status = "unclaimed"
+        self.claimedAt = None
 
     def update(self, data):
         self.question = data["question"]