report on the number of questions answered, not just asked

[coldcallbot-discord.git] / coldcall.py

diff --git a/coldcall.py b/coldcall.py
index 4987c741978a1826c4505a74eae90808251f1494..1ba96a582b24104b2c35b4a225eab89c553a8fef 100644 (file)
--- a/coldcall.py
+++ b/coldcall.py
@@ -8,19 +8,21 @@ from csv import DictReader
 
 import os.path
 import re
 
 import os.path
 import re

-import discord

 
 class ColdCall():
 
 class ColdCall():

-    def __init__ (self):
+    def __init__ (self, record_attendance=True):

         self.today = str(datetime.date(datetime.now()))
         # how much less likely should it be that a student is called upon?
         self.today = str(datetime.date(datetime.now()))
         # how much less likely should it be that a student is called upon?

-        self.weight = 2 
+        self.weight = 2
+        self.record_attendance = record_attendance

 
         # filenames
         self.__fn_studentinfo = "data/student_information.tsv"
         self.__fn_daily_calllist = f"data/call_list-{self.today}.tsv"
         self.__fn_daily_attendance = f"data/attendance-{self.today}.tsv"
 
 
         # filenames
         self.__fn_studentinfo = "data/student_information.tsv"
         self.__fn_daily_calllist = f"data/call_list-{self.today}.tsv"
         self.__fn_daily_attendance = f"data/attendance-{self.today}.tsv"
 

+        self.preferred_names = self.__get_preferred_names()
+        

     def __load_prev_questions(self):
         previous_questions = defaultdict(int)
 
     def __load_prev_questions(self):
         previous_questions = defaultdict(int)
 


@@ -28,21 +30,25 @@ class ColdCall():
             if re.match("call_list-\d{4}-\d{2}-\d{2}.tsv", fn):
                 with open(f"./data/{fn}", 'r') as f:
                     for row in DictReader(f, delimiter="\t"):
             if re.match("call_list-\d{4}-\d{2}-\d{2}.tsv", fn):
                 with open(f"./data/{fn}", 'r') as f:
                     for row in DictReader(f, delimiter="\t"):

-                        previous_questions[row["discord_name"]] += 1
+                        if not row["answered"] == "FALSE":
+                            previous_questions[row["unique_name"]] += 1

 
         return previous_questions
 
         return previous_questions

-    
-    def __get_preferred_name(self, selected_student):
-        # translate the discord name into the preferred students name,
-        # if possible, otherwise return the discord name
+
+    def __get_preferred_names(self):
+        # translate the unique name into the preferred students name,
+        # if possible, otherwise return the unique name

 
         preferred_names = {}
         with open(self.__fn_studentinfo, 'r') as f:
             for row in DictReader(f, delimiter="\t"):
 
         preferred_names = {}
         with open(self.__fn_studentinfo, 'r') as f:
             for row in DictReader(f, delimiter="\t"):

-                preferred_names[row["Your username on the class Discord server"]] = row["Name you'd like to go by in class"]
+                preferred_names[row["Your username on the class Teams server"]] = row["Name you'd like to go by in class"]

 
 

-        if selected_student in preferred_names:
-            return preferred_names[selected_student]
+        return(preferred_names)
+        
+    def __get_preferred_name(self, selected_student):
+        if selected_student in self.preferred_names:
+            return self.preferred_names[selected_student]

         else:
             return None
 
         else:
             return None
 


@@ -58,7 +64,7 @@ class ColdCall():
                 weights[s] = weights[s] / self.weight
 
         # choose one student from the weighted list
                 weights[s] = weights[s] / self.weight
 
         # choose one student from the weighted list

-        print(weights)
+        # print(weights) # DEBUG LINE

         return choices(list(weights.keys()), weights=list(weights.values()), k=1)[0]
 
     def __record_attendance(self, students_present):
         return choices(list(weights.keys()), weights=list(weights.values()), k=1)[0]
 
     def __record_attendance(self, students_present):


@@ -77,7 +83,7 @@ class ColdCall():
         # if it's the first one of the day, write it out
         if not os.path.exists(self.__fn_daily_calllist):
             with open(self.__fn_daily_calllist, "w") as f:
         # if it's the first one of the day, write it out
         if not os.path.exists(self.__fn_daily_calllist):
             with open(self.__fn_daily_calllist, "w") as f:

-                print("\t".join(["discord_name", "timestamp", "answered", "assessment"]), file=f)
+                print("\t".join(["unique_name", "timestamp", "answered", "assessment"]), file=f)

 
         # open for appending the student
         with open(self.__fn_daily_calllist, "a") as f:
 
         # open for appending the student
         with open(self.__fn_daily_calllist, "a") as f:


@@ -88,7 +94,8 @@ class ColdCall():
         selected_student = self.__select_student_from_list(students_present)
 
         # record the called-upon student in the right place
         selected_student = self.__select_student_from_list(students_present)
 
         # record the called-upon student in the right place

-        self.__record_attendance(students_present)
+        if self.record_attendance:
+            self.__record_attendance(students_present)

         self.__record_coldcall(selected_student)
 
         preferred_name = self.__get_preferred_name(selected_student)
         self.__record_coldcall(selected_student)
 
         preferred_name = self.__get_preferred_name(selected_student)


@@ -99,8 +106,8 @@ class ColdCall():
         return coldcall_message
 
 # cc = ColdCall()
         return coldcall_message
 
 # cc = ColdCall()

- 
-# test_student_list = ["jordan", "Kristen Larrick", "Madison Heisterman", "Maria.Au20", "Laura (Alia) Levi", "Leona Aklipi", "Linya Feng", "anne", "kirst", "emmaaitelli", "ashleylee", "allie_partridge", "Tiana_Cole", "Hamin", "Ella Qu", "Angel Su", "Shizuka", "Ben Baird", "Kim Do", "Isaacm24", "Sam Bell", "Courtneylg", "TasnimHasan"]
+
+# test_student_list = ["jordan", "Kristen Larrick", "Madison Heisterman", "Maria.Au20", "Laura (Alia) Levi", "Leona Aklipi", "anne", "emmaaitelli", "ashleylee", "allie_partridge", "Tiana_Cole", "Hamin", "Ella Qu", "Shizuka", "Ben Baird", "Kim Do", "Isaacm24", "Sam Bell", "Courtneylg"]

 # print(cc.coldcall(test_student_list))
 
 # test_student_list = ["jordan", "Kristen Larrick", "Mako"]
 # print(cc.coldcall(test_student_list))
 
 # test_student_list = ["jordan", "Kristen Larrick", "Mako"]