Merge branch 'develop'

src/devicekiosk.py

@@ -254,22 +254,20 @@ def printTicket(self):
         ticket += "\n\n\n----- IT Use -----\n\n\nTicket Number: \n\n\n\n\n\nDate Completed:\n\n\n\n"
 
         if (self.config["schedule_from_ps"] == True):
-            ticket += self.getStudentSchedule(ticket)
+            ticket += self.getStudentSchedule()
 
         ticket += "\n\n\nAdditional Information:"
         print(ticket)
         lpr = subprocess.Popen("/usr/bin/lpr", stdin=subprocess.PIPE)
         lpr.communicate(bytes(ticket, 'utf-8'))
         self.enableNextSignal.emit()
 
-    def getStudentSchedule(self, ticket):
+    def getStudentSchedule(self):
         schedule = "---- Student Schedule -----\n"
         try:
             self.authenticateWithPowerSchool()
-            studentNumber = self.getStudentNumberFromEmailAddress(self.emailAddress)
-            print(studentNumber)
             url = self.config["ps_api_url"] + "/ws/schema/query/us.ct.k12.tolland.devicekiosk.students.get_schedule"
-            payload = {"studentNumber": studentNumber, "terms": self.config["schedule_terms"]}
+            payload = {"studentNumber": self.studentID, "terms": self.config["schedule_terms"]}
             print(payload)
             headers = {
                 "Content-Type": "application/json",
@@ -289,7 +287,7 @@ def getStudentSchedule(self, ticket):
 
         # print(data)
         # schedule += str(data)
-        return schedule;
+        return schedule
 
     # Submit the QML form from Submit.qml and move user to the next screen
     @pyqtSlot()
@@ -594,6 +592,9 @@ def getStudentNumberFromEmailAddress(self, emailAddress):
         emailParts = emailAddress.split("@") 
         user = emailParts[0]
         # The student number is the last 5 characters of the email address
+        if (len(user) < 6):
+            print("ERROR: getStudentNumberFromEmailAddress: impossible username and student number, using 00000")
+            return 00000
         studentNumber = user[-5:]
         print("Student number: " + studentNumber)
         return studentNumber
@@ -634,6 +635,10 @@ def getHomeRoomFromPowerSchool(self, studentID):
         response = requests.request("POST", url, json=payload, headers=headers)
         data = response.json()
         # PowerSchool response will look like this: {"record":[{"home_room":"Last - First - Room"}],"@extensions":""}
+        if ("record" not in data):
+            # If no key "record"
+            return "room not found"
+
         home_room = data["record"][0]["home_room"]
         print(home_room)
         return home_room