Updates to handin/handout dates

requirements.txt

@@ -8,6 +8,7 @@ pexpect
 matplotlib
 numpy
 pycode_similar
-jinjafy
+# jinjafy
 beamer-slider
 tinydb
+python-gitlab

setup.py

@@ -4,18 +4,16 @@
 """
 Windows> py -m build && twine upload dist/*
 Linux> python -m build && python -m twine upload dist/*
-
 """
 
 import setuptools
-import pkg_resources
 
 with open("README.md", "r", encoding="utf-8") as fh:
     long_description = fh.read()
-# beamer-slider
+
 setuptools.setup(
     name="coursebox",
-    version="0.1.18.13",
+    version="0.1.18.20",
     author="Tue Herlau",
     author_email="tuhe@dtu.dk",
     description="A course management system currently used at DTU",
@@ -34,5 +32,6 @@ setuptools.setup(
     package_dir={"": "src"},
     packages=setuptools.find_packages(where="src"),
     python_requires=">=3.8",
-    install_requires=['numpy','pycode_similar','tika','openpyxl', 'xlwings','matplotlib','langdetect','beamer-slider','tinydb'],
+    install_requires=['numpy','pycode_similar','tika','openpyxl', 'xlwings','matplotlib','langdetect',
+                      'beamer-slider','tinydb', 'python-gitlab'],
 )

src/coursebox.egg-info/PKG-INFO

 Metadata-Version: 2.1
 Name: coursebox
-Version: 0.1.18.13
+Version: 0.1.18.19
 Summary: A course management system currently used at DTU
 Home-page: https://lab.compute.dtu.dk/tuhe/coursebox
 Author: Tue Herlau

src/coursebox.egg-info/requires.txt

@@ -7,3 +7,4 @@ matplotlib
 langdetect
 beamer-slider
 tinydb
+python-gitlab

src/coursebox/admin/gitlab.py

+import datetime
+
 import gitlab
 import gitlab.const
 from urllib.parse import urlparse
@@ -27,17 +29,24 @@ def sync_tas_with_git():
     for i in p.invitations.list():
         print("Invited", i.invite_email.split("@"))
 
-    if False:
-        inv = p.invitations.create({
-            "email": "fmry@dtu.dk",
-            "access_level": gitlab.const.AccessLevel.MAINTAINER,
-        })
-        inv.save()
+    if True:
+        for i in info['instructors']:
+            # i = info['instructors'][2]
+            if i['email'].split("@")[0].strip() in all_tas:
+                print("TA found already", i['name'], i['email'])
+            else:
+                import datetime
+                expires = datetime.datetime.now() + datetime.timedelta(days=30*5+14)
+                expires_str =expires.strftime('%A %b %d, %Y at %H:%M GMT')
+
+                inv = p.invitations.create({
+                    "email": i['email'], # '"fmry@dtu.dk",
+                    "access_level": gitlab.const.AccessLevel.MAINTAINER,
+                    "expires_at": expires_str,
+                })
+                inv.save()
+                print("Inviting...", i['email'], i['name'])
 
-    #
-    #
-    #
-    #
     # for p in gl.projects.list(iterator=True):
     #     prs.append(p)
     # for p in prs:

src/coursebox/core/info.py

@@ -429,7 +429,7 @@ def class_information(verbose=False,
             if 'id' in r:
                 d['reports'][r['id']] = r
                 r['handin'] = get_lecture_date(r['handin'], delta_days=int(d['handin_day_delta']))
-                r['handout'] = get_lecture_date(r['handout'], delta_days=0)
+                r['handout'] = get_lecture_date(r['handout'], delta_days=int(d.get('handout_day_delta', 0)))
                 r['exercises'] = [e.strip() for e in r['exercises'].split(",") if len(e.strip()) > 0]
 
     ice = xlsx_to_dicts(paths['information.xlsx'], sheet='ce', as_dict_list=True)
@@ -495,7 +495,7 @@ def _save_info_cache():
                     known[id] = f"s{len(known):6d}".replace(" ", "0")
                 d = d.replace(id, known[id])
         elif isinstance(d, dict):
-            for k, v in d.items():
+            for k, v in d.copy().items():
                 d[_remove_ids(k)] = _remove_ids(v)
         elif isinstance(d, list):
             d = [_remove_ids(k) for k in d]

src/coursebox/core/info_paths.py

@@ -72,6 +72,9 @@ def get_paths():
     if not os.path.isdir(paths['book']):
         paths['book'] =  root_02450public + "/Notes/Latex"
 
+    # if 'book' in paths and os.path.isdir(paths['book']):
+    #     pass
+
     if os.path.exists(os.path.dirname(paths['instructor_project_evaluations'])):
         if not os.path.isdir(paths['instructor_project_evaluations']):
             os.mkdir(paths['instructor_project_evaluations'])

src/coursebox/material/homepage_lectures_exercises.py

@@ -92,11 +92,16 @@ def make_lectures(week=None, mode=0, gather_pdf_out=True, gather_sixup=True, mak
     mode = HANDOUT = 2: version handed out to students.
     """
     assert mode in [PRESENTATION, NOTES, HANDOUT]
-
     paths = get_paths()
+    info = class_information()
+    if 'lecture_notes_tex' in info:
+        book_pdf = paths['02450public'] + "/" + info['lecture_notes_tex'][:-4] + ".pdf"
+    else:
+        book_pdf = paths['book'] + "/02002_Notes.pdf"
+
     if os.path.exists(paths['book']):
         book_frontpage_png = paths['shared']+"/figures/book.png" #paths['lectures']+"/static/book.png"
-        slide_to_image(paths['book'] + "/02450_Book.pdf", book_frontpage_png, page_to_take=1)
+        slide_to_image(book_pdf, book_frontpage_png, page_to_take=1)
         shutil.copy(paths['book'] + "/book_preamble.tex", paths['shared'])
     info = class_information()
     jinjafy_shared_templates_dir(paths, info) # Compile templates in shared/templates
@@ -389,10 +394,12 @@ def fix_shared(paths, output_dir, pdf2png=False,dosvg=True,verbose=False, compil
     # update_source_cache = False
     source_extra = {}
     for rel in source:
-        if rel.endswith(".svg") and source[rel]['modified'] and dosvg:
-            pdf_file = svg2pdf(shared_base + "/"+rel, crop=True, text_to_path=True)
-            rel = os.path.relpath(pdf_file, shared_base)
-            source_extra[rel] = dict(mtime=os.path.getmtime(pdf_file), hash=hash_file_(pdf_file), modified=True)
+        if rel.endswith(".svg"):
+            pdf_ = shared_base + "/"+rel[:-4] + ".pdf"
+            if (source[rel]['modified'] or not os.path.isfile(pdf_)) and dosvg:
+                pdf_file = svg2pdf(shared_base + "/"+rel, crop=True, text_to_path=True)
+                rel = os.path.relpath(pdf_file, shared_base)
+                source_extra[rel] = dict(mtime=os.path.getmtime(pdf_file), hash=hash_file_(pdf_file), modified=True)
 
     for k, v in source_extra.items():
         source[k] = v
@@ -415,12 +422,14 @@ def fix_shared(paths, output_dir, pdf2png=False,dosvg=True,verbose=False, compil
 
     if pdf2png:
         for rel in target:
-            if rel.endswith(".pdf") and target[rel]['modified']:
-                # print("pdf2png: ")
-                png = convert.pdf2png(output_dir + "/" + rel, verbose=True)
-                target[rel]['modified'] = False
-                target[rel]['hash'] = hash_file_(output_dir + "/" + rel)
-                target[rel]['mtime'] = os.path.getmtime(output_dir + "/" + rel)
+            if rel.endswith(".pdf"):
+                png_target = output_dir + "/" + rel[:-4] + ".png"
+                if target[rel]['modified'] or not os.path.isfile(png_target):
+                    # print("pdf2png: ")
+                    png = convert.pdf2png(output_dir + "/" + rel, verbose=True)
+                    target[rel]['modified'] = False
+                    target[rel]['hash'] = hash_file_(output_dir + "/" + rel)
+                    target[rel]['mtime'] = os.path.getmtime(output_dir + "/" + rel)
 
     with open(shared_base + "/sharedcache.pkl", 'wb') as f:
         pickle.dump(source, f)