klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2024-11-22 22:23:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

pedagogy: translations for semesters in details and handle markdown

Browse Source
This commit is contained in:
Antoine Bartuccio 2019-07-06 01:16:09 +02:00
parent 11acf5897f
commit 4a19441a17
Signed by: klmp200
GPG Key ID: E7245548C53F904B
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/static/core/style.scss
View File

@ -1781,7 +1781,7 @@ label {
margin: 0px; margin: 0px;
} }
.text { .markdown {
height: 125px; height: 125px;
margin-top: 0px; margin-top: 0px;
margin-right: 0px; margin-right: 0px;

7
pedagogy/models.py
View File

@ -84,6 +84,13 @@ class UV(models.Model):
def grade_work_load_average(self): def grade_work_load_average(self):
return self.__grade_average_generic("grade_work_load") 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): def __str__(self):
return self.code return self.code

9
pedagogy/templates/pedagogy/uv_detail.jinja
View File

@ -8,8 +8,10 @@
{% block content %} {% block content %}
<div id="pedagogy"> <div id="pedagogy">
<p><a href="{{ url('pedagogy:guide') }}">{% trans %}Back{% endtrans %}</a></p> <p><a href="{{ url('pedagogy:guide') }}">{% trans %}Back{% endtrans %}</a></p>
{# <button onclick="window.history.back();">{% trans %}Back{% endtrans %}</button> #}
<h1>{{ object.code }} - {{ object.title }}</h1> <h1>{{ object.code }} - {{ object.title }}</h1>
<p style = "word-spacing: 20px;">{{ object.department }} {{ object.credit_type }} {{ object.semester }}</p> <p style = "word-spacing: 20px;">{{ object.department }} {{ object.credit_type }} {{ object.semester_translated }}</p>
<p>{{ object.objectives|markdown }}</p> <p>{{ object.objectives|markdown }}</p>
<p>{{ object.program|markdown }}</p> <p>{{ object.program|markdown }}</p>
<p>{{ object.skills|markdown }}</p> <p>{{ object.skills|markdown }}</p>
@ -25,7 +27,7 @@
{% if object.comments.exists() %} {% if object.comments.exists() %}
<h2>{% trans %}Comments{% endtrans %}</h2> <h2>{% trans %}Comments{% endtrans %}</h2>
{% for comment in object.comments.all() %} {% for comment in object.comments.all() %}
<div class="comment"> <div id="{{ comment.id }}" class="comment">
<div class="dif_grade"> <div class="dif_grade">
<p>{% trans %}global grade{% endtrans %}</p> <p>{% trans %}global grade{% endtrans %}</p>
<p>{% trans %}utility grade{% endtrans %}</p> <p>{% trans %}utility grade{% endtrans %}</p>
@ -40,12 +42,13 @@
<p>{{ display_star(comment.grade_teaching) }}</p> <p>{{ display_star(comment.grade_teaching) }}</p>
<p>{{ display_star(comment.grade_work_load) }}</p> <p>{{ display_star(comment.grade_work_load) }}</p>
</div> </div>
<p class="text">{{ comment.comment }}</p> {{ comment.comment|markdown }}
<p class="date_info">{{ comment.publish_date.strftime('%d/%m/%Y') }}</p> <p class="date_info">{{ comment.publish_date.strftime('%d/%m/%Y') }}</p>
<p class="author_info">{{ comment.author }}</p> <p class="author_info">{{ comment.author }}</p>
{# Warning, it's not displayed yet #} {# Warning, it's not displayed yet #}
<p class="action"> <p class="action">
<a href="{{ url('pedagogy:uv_detail', uv_id=uv.id) }}#{{ comment.id }}"><i class="fa fa-paragraph"></i></a>
<a href="{{ url('pedagogy:comment_report', comment_id=comment.id) }}">{% trans %}Report{% endtrans %}</a> <a href="{{ url('pedagogy:comment_report', comment_id=comment.id) }}">{% trans %}Report{% endtrans %}</a>
{% if user.is_owner(comment) %} {% if user.is_owner(comment) %}
<a href="{{ url('pedagogy:comment_update', comment_id=comment.id) }}">{% trans %}Edit{% endtrans %}</a> <a href="{{ url('pedagogy:comment_update', comment_id=comment.id) }}">{% trans %}Edit{% endtrans %}</a>