Minor changes

2 files changed, 30 insertions, 14 deletions

diff --git a/infos.yaml b/infos.yaml
index 4367ec9..ec91f0b 100644
--- a/infos.yaml
+++ b/infos.yaml
@@ -3,17 +3,23 @@ course: "Parallel Programming"
 semester:
   start: "11/08/2025"
   end: "15/12/2025"
-  week: 33
 
 output:
   show_events: yes
   show_lecturers: yes
+  show_assigments: yes
   show_dates: yes
+  show_weeks: yes
+  semester_dates_as_events: yes
+  date_format: "%d.%m"
+  text_wrap: 15
+  min_col_width: 12
 
 events:
   1:
     name: "Deadline student list"
     date: "19/11/2025"
+    hidden: no
   2:
     name: "Exam"
     date: "03/12/2025"
diff --git a/main.py b/main.py
index 2667513..5367123 100755
--- a/main.py
+++ b/main.py
@@ -16,7 +16,7 @@ def getnextmonday(d):
 def getnextdayn(d,n):
     return (d+timedelta(days=n))
 def formatday(d):
-    return d.strftime("%d.%m")
+    return d.strftime(i["output"]["date_format"])
 def getassign(d):
     val=""
     for a in i["assigments"]:
@@ -34,26 +34,35 @@ def getlecture(d):
             lecturer=""
             if i["output"]["show_lecturers"]:
                 lecturer="\n ("+i["lectures"][l]["who"]+")"
-            return textwrap.fill(i["lectures"][l]["name"]+lecturer,15)
+            return textwrap.fill(i["lectures"][l]["name"]+lecturer,i["output"]["text_wrap"])
     return ""
 def getevents(d):
     val=""
     for e in i["events"]:
         date=parse_date(i["events"][e]["date"])
+        if "hidden" in i["events"][e] and i["events"][e]["hidden"]:
+            continue
         if d==date:
             if len(val)>0:
                 val+=","
             val+=str(i["events"][e]["name"])
-    return textwrap.fill(val,15)
+    return textwrap.fill(val,i["output"]["text_wrap"])
 
 sstart=parse_date(i["semester"]["start"])
 send=parse_date(i["semester"]["end"])
 d=sstart
-w=i["semester"]["week"]
-
+w=d.isocalendar().week
+if i["output"]["semester_dates_as_events"]:
+    i["events"]["sstart_098888986"]={} # Add random numbers to avoid clash with users entries
+    i["events"]["sstart_098888986"]["name"]="Semester starts"
+    i["events"]["sstart_098888986"]["date"]=i["semester"]["start"]
+    i["events"]["send_098888986"]={}
+    i["events"]["send_098888986"]["name"]="Semester ends"
+    i["events"]["send_098888986"]["date"]=i["semester"]["end"]
 while d <= send:
-    t = PrettyTable()
-    t.field_names = ["Week "+str(w), "Monday", "Tuesday", "Wednesday", "Thursday", "Friday"]
+    t = PrettyTable(min_width=i["output"]["min_col_width"])
+    week="Week "+str(w) if i["output"]["show_weeks"] else ""
+    t.field_names = [week, "Monday", "Tuesday", "Wednesday", "Thursday", "Friday"]
     if i["output"]["show_dates"]:
         t.add_row(["Date",
                    formatday(getnextdayn(d, 0)),
@@ -61,12 +70,13 @@ while d <= send:
                    formatday(getnextdayn(d, 2)),
                    formatday(getnextdayn(d, 3)),
                    formatday(getnextdayn(d, 4))],divider=True)
-    t.add_row(["Assigment",
-               getassign(getnextdayn(d, 0)),
-               getassign(getnextdayn(d, 1)),
-               getassign(getnextdayn(d, 2)),
-               getassign(getnextdayn(d, 3)),
-               getassign(getnextdayn(d, 4))],divider=True)
+    if i["output"]["show_assigments"]:
+        t.add_row(["Assigment",
+                   getassign(getnextdayn(d, 0)),
+                   getassign(getnextdayn(d, 1)),
+                   getassign(getnextdayn(d, 2)),
+                   getassign(getnextdayn(d, 3)),
+                   getassign(getnextdayn(d, 4))],divider=True)
     t.add_row(["Lecture",
                getlecture(getnextdayn(d, 0)),
                getlecture(getnextdayn(d, 1)),