1 files changed, 8 insertions, 5 deletions
diff --git a/main2.py b/main2.py
index b6c5a73..71a469f 100755
--- a/main2.py
+++ b/main2.py
@@ -90,6 +90,7 @@ w=getweek(d)
 while d<sem["end"]:
     t = PrettyTable()
     t.field_names = ["Week "+str(w), "Monday", "Tuesday", "Wednesday", "Thursday", "Friday"]
+    t.align[t.field_names[0]]="l"
     t.add_row(["",
                formatevents(getnextdayn(d, 0)),
                formatevents(getnextdayn(d, 1)),
@@ -106,10 +107,12 @@ while d<sem["end"]:
 for s in sem["slots"]:
     t = PrettyTable()
     t.field_names = ["Day", "Time", "Room"]
+    t.align["Day"]="l"
     for dayname in ["monday","tuesday","wednesday","thursday", "friday"]:
-        if dayname in sem["slots"][s].keys():
-            p=sem["slots"][s][dayname]
-            if "start" in p.keys():
-                time=gettime(p["start"])+"-"+gettime(p["end"])
-            t.add_row(dayname,time,"")
+        p=sem["slots"][s][dayname]
+        timeStr=gettime(p["start"])+"-"+gettime(p["end"]) if p["start"] is not None else ""
+        room=p["room"] if p["room"] is not None else ""
+        if timeStr != "" or room != "":
+            t.add_row([dayname.capitalize(),timeStr,room])
+    print(s+":")
     print(t)