From 339497b2c27dfbd0c4ae2d58e6c1fe45c2805490 Mon Sep 17 00:00:00 2001 From: Bartuccio Antoine Date: Sat, 6 Jul 2019 02:57:20 +0200 Subject: [PATCH] pedagogy: display semester in search view --- pedagogy/templates/pedagogy/guide.jinja | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/pedagogy/templates/pedagogy/guide.jinja b/pedagogy/templates/pedagogy/guide.jinja index 491e12db..9c40ec6b 100644 --- a/pedagogy/templates/pedagogy/guide.jinja +++ b/pedagogy/templates/pedagogy/guide.jinja @@ -12,7 +12,7 @@

- + @@ -46,6 +46,8 @@ {% trans %}Title{% endtrans %} {% trans %}Department{% endtrans %} {% trans %}Credit type{% endtrans %} + + {% if can_create_uv(user) %} {% trans %}Edit{% endtrans %} {% trans %}Delete{% endtrans %} @@ -59,6 +61,16 @@ {{ uv.title }} {{ uv.department }} {{ uv.credit_type }} + + {% if uv.semester in ["AUTUMN", "AUTUMN_AND_SPRING"] %} + + {% endif %} + + + {% if uv.semester in ["SPRING", "AUTUMN_AND_SPRING"] %} + + {% endif %} + {% if user.is_owner(uv) -%} {% trans %}Edit{% endtrans %} {% trans %}Delete{% endtrans %} @@ -78,12 +90,21 @@ } function uvJSONToHTML(uv){ + var autumn = ""; + var spring = ""; + if (uv.semester == "AUTUMN" || uv.semester == "AUTUMN_AND_SPRING") + autumn = ""; + if (uv.semester == "SPRING" || uv.semester == "AUTUMN_AND_SPRING") + spring = ""; + var html = ` ${uv.code} ${uv.title} ${uv.department} ${uv.credit_type} + ${autumn} + ${spring} `; {% if can_create_uv(user) %} html += `