From c58d18ed64004a221dacb003e00db73c455d7870 Mon Sep 17 00:00:00 2001
From: SowinskiBraeden <sowinskibraeden@gmail.com>
Date: Wed, 30 Nov 2022 10:26:30 -0800
Subject: [PATCH] neat format all functions

---
 app/generator.py           | 23 ++++++++++++++++-------
 app/util/convertRawData.py | 11 +++++++++--
 app/util/courses.py        |  5 ++++-
 app/util/students.py       |  5 ++++-
 4 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/app/generator.py b/app/generator.py
index b9008b4..b6526dd 100644
--- a/app/generator.py
+++ b/app/generator.py
@@ -8,7 +8,14 @@ from app.util.estimateGrade import getGrade
 
 # Takes in information to create or add a new conflict
 # Returns if the particular student has a previous error
-def newConflict(pupilNum: str, email: str, conflictType: str, code: str, description: str, logs: dict) -> bool:
+def newConflict(
+  pupilNum:     str, 
+  email:        str, 
+  conflictType: str, 
+  code:         str, 
+  description:  str,
+  logs:         dict
+) -> bool:
   exists = True if pupilNum in logs else False
   log = {
     "Pupil #": pupilNum,
@@ -17,18 +24,20 @@ def newConflict(pupilNum: str, email: str, conflictType: str, code: str, descrip
     "Code": code,
     "Conflict": description
   }
-  if exists: logs[pupilNum].append(log)
-  else: logs[pupilNum] = [log]
+  logs[pupilNum] = [log] if not exists else logs[pupilNum].append(log)
   return exists if conflictType == "Critical" else False
 
-def insertConflictSolutions(pupilNum: str, logs: dict, data: dict) -> None:
-  log = logs[pupilNum]
-  for conflict in log:
+def insertConflictSolutions(
+  pupilNum: str, 
+  logs:     dict, 
+  data:     dict
+) -> None:
+  for conflict in logs[pupilNum]:
     if conflict["Type"] == "Critical":
       conflict["Missing"] = data
       break
 
-# V3 differs a lot by V1/2 as it does not focus on fitting the classes
+# V3 diffelogrs a lot by V1/2 as it does not focus on fitting the classes
 # into the time table first.
 # It starts by trying to get all classes full and give all students a full class list.
 # Then it starts to attempt to fit all classes into a timetable, making corretions along
diff --git a/app/util/convertRawData.py b/app/util/convertRawData.py
index b39f8f8..95ac3ec 100644
--- a/app/util/convertRawData.py
+++ b/app/util/convertRawData.py
@@ -4,7 +4,10 @@ from app.util.globals import flex
 import xlsxwriter
 import docx
 
-def putMasterTimetable(table: dict, output_dir: str='./output/final') -> None:
+def putMasterTimetable(
+	table:		  dict, 
+	output_dir: str = './output/final'
+) -> None:
 
 	workbook = xlsxwriter.Workbook(f'{output_dir}/master_timetable.xlsx')
 	worksheet = workbook.add_worksheet()
@@ -32,7 +35,11 @@ def putMasterTimetable(table: dict, output_dir: str='./output/final') -> None:
 
 	workbook.close()
 
-def putScheduleToWord(courses: dict, student: dict, output_dir: str='./output/final/student_schedules') -> None:
+def putScheduleToWord(
+	courses: 		dict, 
+	student: 		dict, 
+	output_dir: str = './output/final/student_schedules'
+) -> None:
 
 	# create an instance of a word doc.
 	doc = docx.Document()
diff --git a/app/util/courses.py b/app/util/courses.py
index 1eef37d..d9b4d3e 100644
--- a/app/util/courses.py
+++ b/app/util/courses.py
@@ -40,7 +40,10 @@ def getCourses(
   return courses
 
 # Writes all course data to csv file
-def writeCoursesToCSV(courses: dict, output_dir: str='./output/raw/csv/courses.csv') -> None:
+def writeCoursesToCSV(
+  courses:    dict, 
+  output_dir: str = './output/raw/csv/courses.csv'
+) -> None:
   with open(output_dir, 'w') as file:
     writer = csv.writer(file)
     # Write header
diff --git a/app/util/students.py b/app/util/students.py
index 1056af0..43393ef 100644
--- a/app/util/students.py
+++ b/app/util/students.py
@@ -60,7 +60,10 @@ def getStudents(
   return students
 
 # Writes all students data to csv file
-def writeStudentsToCSV(students: dict, output_dir: str='./output/raw/csv/students.csv') -> None:
+def writeStudentsToCSV(
+  students:   dict, 
+  output_dir: str = './output/raw/csv/students.csv'
+) -> None:
   with open(output_dir, 'w') as file:
     writer = csv.writer(file)
     # Write header