diff --git a/core/static/core/style.scss b/core/static/core/style.scss index b5d0cf1d..5fc23c30 100644 --- a/core/static/core/style.scss +++ b/core/static/core/style.scss @@ -1781,7 +1781,7 @@ label { margin: 0px; } - .text { + .markdown { height: 125px; margin-top: 0px; margin-right: 0px; @@ -1790,5 +1790,5 @@ label { overflow: auto; text-align: justify; } - } + } } \ No newline at end of file diff --git a/pedagogy/models.py b/pedagogy/models.py index 62eb8bf8..99d0c9fb 100644 --- a/pedagogy/models.py +++ b/pedagogy/models.py @@ -84,6 +84,13 @@ class UV(models.Model): def grade_work_load_average(self): return self.__grade_average_generic("grade_work_load") + @cached_property + def semester_translated(self): + for semester in settings.SITH_PEDAGOGY_UV_SEMESTER: + if semester[0] == self.semester: + return semester[1] + return "" + def __str__(self): return self.code diff --git a/pedagogy/templates/pedagogy/uv_detail.jinja b/pedagogy/templates/pedagogy/uv_detail.jinja index c75e5eaa..22b65ab1 100644 --- a/pedagogy/templates/pedagogy/uv_detail.jinja +++ b/pedagogy/templates/pedagogy/uv_detail.jinja @@ -8,8 +8,10 @@ {% block content %}
{{ object.department }} {{ object.credit_type }} {{ object.semester }}
+{{ object.department }} {{ object.credit_type }} {{ object.semester_translated }}
{{ object.objectives|markdown }}
{{ object.program|markdown }}
{{ object.skills|markdown }}
@@ -25,7 +27,7 @@ {% if object.comments.exists() %}
{% trans %}global grade{% endtrans %}
{% trans %}utility grade{% endtrans %}
@@ -40,12 +42,13 @@{{ display_star(comment.grade_teaching) }}
{{ display_star(comment.grade_work_load) }}
{{ comment.comment }}
+ {{ comment.comment|markdown }}{{ comment.publish_date.strftime('%d/%m/%Y') }}
{{ comment.author }}
{# Warning, it's not displayed yet #}+ {% trans %}Report{% endtrans %} {% if user.is_owner(comment) %} {% trans %}Edit{% endtrans %}