Format supervisor's evaluation as markdown

Huy-Ngo · Mar 7, 2021 · 5069147 · 5069147
1 parent 47eedad
commit 5069147
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 18 deletions.
diff --git a/src/acanban/templates/project-report.html b/src/acanban/templates/project-report.html
@@ -25,15 +25,27 @@
 {% block tabcontent %}
 <div class=col-wide>
   <h2>Report evaluation</h2>
-  <form action=/p/{{ project.id }}/report/eval method=POST>
-    <label for=grade>Grade</label>
-    <input {% if for_student %}readonly{% endif %}
-           type=text name=grade id=grade value={{ report.grade }}>
-    <label for=comment>Comment</label>
-    <textarea {% if for_student %}readonly{% endif %}
-              name=comment id=comment>{{ report.comment }}</textarea>
-    {% if not for_student %}<button>Save evaluation</button>{% endif %}
-  </form>
+  {% if report.revisions %}
+    {% if for_student %}
+    <div>Grade: {{ report.grade }}</div>
+    <div>
+      {{ report.comment | markdown | safe }}
+    </div>
+    {% else %}
+    <form action=/p/{{ project.id }}/report/eval method=POST>
+      <label for=grade>Grade</label>
+      <input type=text name=grade id=grade value={{ report.grade }}>
+      <label for=comment>Comment</label>
+      <textarea name=comment id=comment>{{ report.comment }}</textarea>
+      {% if not for_student %}<button>Save evaluation</button>{% endif %}
+    </form>
+    {% endif %}
+  {% else %}
+  <div>
+    {% if for_student %}You {% else %}The students {% endif %} haven't uploaded
+    the report yet.
+  </div>
+  {% endif %}
 
   <h2>Report revisions</h2>
   {% if for_student %}

diff --git a/src/acanban/templates/project-slides.html b/src/acanban/templates/project-slides.html
@@ -25,15 +25,28 @@
 {% block tabcontent %}
 <div class=col-wide>
   <h2>Presentation evaluation</h2>
-  <form action=/p/{{ project.id }}/slides/eval method=POST>
-    <label for=grade>Grade</label>
-    <input {% if for_student %}readonly{% endif %}
-           type=text name=grade id=grade value={{ slides.grade }}>
-    <label for=comment>Comment</label>
-    <textarea {% if for_student %}readonly{% endif %}
-              name=comment id=comment>{{ slides.comment }}</textarea>
-    {% if not for_student %}<button>Save evaluation</button>{% endif %}
-  </form>
+  {% if slides.revisions %}
+    {% if for_student %}
+    <div>Grade: {{ report.grade }}</div>
+    <div>
+      {{ slides.comment | markdown | safe }}
+    </div>
+    {% else %}
+    <form action=/p/{{ project.id }}/slides/eval method=POST>
+      <label for=grade>Grade</label>
+      <input type=text name=grade id=grade value={{ slides.grade }}>
+      <label for=comment>Comment</label>
+      <textarea {% if for_student %}readonly{% endif %}
+                name=comment id=comment>{{ slides.comment }}</textarea>
+      {% if not for_student %}<button>Save evaluation</button>{% endif %}
+    </form>
+    {% endif %}
+  {% else %}
+  <div>
+    {% if for_student %}You {% else %}The students {% endif %} haven't uploaded
+    the slides yet.
+  </div>
+  {% endif %}
 
   <h2>Slides revisions</h2>
   {% if for_student %}