Merge branch 'develop' into 'main'

v1.7.1

See merge request !57

LabCourse/mylab/email.py

@@ -98,7 +98,7 @@ Date:
 {request.date.date.strftime("%A, %-d %B %Y")}
 
 Student:
-{request.student.full_name}
+{request.student.full_name} <{request.student.email}>
 
 Lab partner(s):
 {request.partners_list()}
@@ -197,9 +197,12 @@ Advanced Lab Course"""
 
 def send_email_exam(recipient: LabUser, exam: Exam, subject: str, intro: str):
     # get experiments
-    experiments = "\n".join(
-        [f"- {rep.appointment.experiment.code} - {rep.appointment.experiment.name}" for rep in exam.reports.all()]
-    )
+    experiments = ""
+    for rep in exam.reports.all():
+        experiments += f"- {rep.appointment.experiment.code} - {rep.appointment.experiment.name}"
+        if rep.report_url:
+            experiments += f"\n  Report: {rep.report_url}"
+        experiments += "\n"
 
     # build body
     body = f"""\
@@ -211,10 +214,10 @@ Date:
 {exam.date.strftime("%A, %-d %B %Y")}
 
 Student:
-{exam.student.full_name}
+{exam.student.full_name} <{exam.student.email}>
 
 Examiner:
-{exam.examiner.full_name}
+{exam.examiner.full_name} <{exam.examiner.email}>
 
 Experiments:
 {experiments}
@@ -266,10 +269,10 @@ Dear {recipient.full_name},
 {intro}
 
 Student:
-{report.student.full_name}
+{report.student.full_name} <{report.student.email}>
 
 Tutor:
-{report.tutor.full_name}
+{report.tutor.full_name} <{report.tutor.email}>
 
 Experiment:
 {report.appointment.experiment.code} - {report.appointment.experiment.name}
@@ -312,11 +315,43 @@ def send_email_report_rejected(report: Report):
             send_email_report(admin, report, subject, intro)
 
 
+def _send_email_report_uploaded(recipient: LabUser, report: Report):
+    # build body
+    body = f"""\
+Dear {recipient.full_name},
+
+an ALC protocol has just been uploaded:
+{report.report_url}
+
+Student:
+{report.student.full_name} <{report.student.email}>
+
+Tutor:
+{report.tutor.full_name} <{report.tutor.email}>
+
+Experiment:
+{report.appointment.experiment.code} - {report.appointment.experiment.name}
+
+Regards,
+Advanced Lab Course    
+"""
+
+    # send it
+    logging.info(f"Sending email '[ALC] Protocol uploaded' to {recipient.email}.")
+    send_mail(
+        "[ALC] Protocol uploaded",
+        body,
+        settings.EMAIL_FROM,
+        [recipient.email],
+    )
+
+
 def send_email_report_uploaded(report: Report):
-    subject = "[ALC] Protocol uploaded"
     intro = "an ALC protocol has just been uploaded."
     if settings.LABCOURSE["STUDENT"]["SEND_EMAIL_REPORT_UPLOADED"]:
-        send_email_report(report.student, report, subject, intro)
-    if settings.LABCOURSE["ADMIN"]["SEND_EMAIL_REPORT_ACCEPTED"]:
+        _send_email_report_uploaded(report.student, report)
+    if settings.LABCOURSE["TUTOR"]["SEND_EMAIL_REPORT_UPLOADED"]:
+        _send_email_report_uploaded(report.tutor, report)
+    if settings.LABCOURSE["ADMIN"]["SEND_EMAIL_REPORT_UPLOADED"]:
         for admin in LabUser.objects.filter(is_admin=True):
-            send_email_report(admin, report, subject, intro)
+            _send_email_report_uploaded(admin, report)

pyproject.toml

 [tool.poetry]
 name = "labcourse"
-version = "1.7.0"
+version = "1.7.1"
 description = ""
 authors = ["Tim-Oliver Husser <thusser@uni-goettingen.de>"]