updated assessment code for new class

[coldcallbot-discord.git] / coldcall.py

diff --git a/coldcall.py b/coldcall.py
index cc5504b529203e36bbb1ba970a98fa9f446516f0..3fb79d663c7c694b751710e48ad0f64a8bbaaf13 100644 (file)
--- a/coldcall.py
+++ b/coldcall.py
@@ -8,24 +8,29 @@ from csv import DictReader
 
 import os.path
 import re
 
 import os.path
 import re

+import json

 
 class ColdCall():
 
 class ColdCall():

-    def __init__ (self, record_attendance=True, preferred_name_field=None):
+    def __init__ (self, record_attendance=True):
+        with open("configuration.json") as config_file:
+            config = json.loads(config_file.read())
+

         self.today = str(datetime.date(datetime.now()))
         self.today = str(datetime.date(datetime.now()))

+

         # how much less likely should it be that a student is called upon?
         self.weight = 2
         self.record_attendance = record_attendance
 
         # filenames
         # how much less likely should it be that a student is called upon?
         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"
-        self.__preferred_name_field = preferred_name_field
+        self.__fn_studentinfo = config["student_info_file"]
+        self.__fn_daily_calllist = config["daily_calllist_file"].format(date=self.today)
+        self.__fn_daily_attendance = config["daily_attendance"].format(date=self.today)

 
 

-        if preferred_name_field != None:
-            self.preferred_names = self.__get_preferred_names()
+        self.unique_row = config["unique_name_rowname"]
+        if "preferred_name_rowname" in config:
+            self.preferred_row = config["preferred_name_rowname"]

         else:
         else:

-            self.preferred_names = None
+            self.preferred_row = None

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


@@ -35,24 +40,25 @@ class ColdCall():
                 with open(f"./data/{fn}", 'r') as f:
                     for row in DictReader(f, delimiter="\t"):
                         if not row["answered"] == "FALSE":
                 with open(f"./data/{fn}", 'r') as f:
                     for row in DictReader(f, delimiter="\t"):
                         if not row["answered"] == "FALSE":

-                            previous_questions[row["unique_name"]] += 1
+                            previous_questions[row[self.unique_row]] += 1

 
         return previous_questions
 
 
         return previous_questions
 

-    def __get_preferred_names(self):
+    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"):
         # 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"):

-                row["Your UW student number"] = row[self.__preferred_name_field]
+                preferred_names[row[self.unique_row]] = row[self.preferred_row]

 
         return(preferred_names)
         
     def __get_preferred_name(self, 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]
+        preferred_names = self.get_preferred_names()
+        if selected_student in preferred_names:
+            return preferred_names[selected_student]

         else:
             return None
 
         else:
             return None
 


@@ -87,12 +93,16 @@ 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(["unique_name", "timestamp", "answered", "assessment"]), file=f)
+                print("\t".join([self.unique_row, self.preferred_row, "answered", "assessment", "timestamp"]), file=f)
+
+        preferred_name = self.__get_preferred_name(selected_student)
+        if preferred_name == None:
+            preferred_name = ""

 
         # 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:

-            print("\t".join([selected_student, str(datetime.now()),
-                             "MISSING", "MISSING"]), file=f)
+            print("\t".join([selected_student, preferred_name,
+                             "MISSING", "MISSING", str(datetime.now())]), file=f)

 
     def coldcall(self, students_present):
         selected_student = self.select_student_from_list(students_present)
 
     def coldcall(self, students_present):
         selected_student = self.select_student_from_list(students_present)


@@ -109,13 +119,3 @@ class ColdCall():
             coldcall_message = f"@{selected_student}, you're up!"
         return coldcall_message
 
             coldcall_message = f"@{selected_student}, you're up!"
         return coldcall_message
 

-# cc = ColdCall()
-
-# 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"]
-# print(cc.coldcall(test_student_list))