From c15ea345dd89b511e6ac4a75690f65f916fa3563 Mon Sep 17 00:00:00 2001
From: Bartuccio Antoine <klmp200@klmp200.net>
Date: Mon, 8 Jul 2019 15:17:12 +0200
Subject: [PATCH] pedagogy: generate search form radios trough loop and remove
 semester_translated

---
 pedagogy/models.py                          |  7 -------
 pedagogy/templates/pedagogy/guide.jinja     | 19 +++++++------------
 pedagogy/templates/pedagogy/uv_detail.jinja |  2 +-
 3 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/pedagogy/models.py b/pedagogy/models.py
index 99d0c9fb..62eb8bf8 100644
--- a/pedagogy/models.py
+++ b/pedagogy/models.py
@@ -84,13 +84,6 @@ 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/guide.jinja b/pedagogy/templates/pedagogy/guide.jinja
index 28a90175..568f1e05 100644
--- a/pedagogy/templates/pedagogy/guide.jinja
+++ b/pedagogy/templates/pedagogy/guide.jinja
@@ -20,20 +20,15 @@
 		<button class="button-search">{% trans %}Search{% endtrans %}</button>
 	</p>
 	<div class="radio-guide">
-		<input type="radio" name="department" id="radioEDIM" value="EDIM"><label for="radioEDIM">{% trans %}EDIM{% endtrans %}</label>
-		<input type="radio" name="department" id="radioEE" value="EE"><label for="radioEE">{% trans %}ENERGIE{% endtrans %}</label>
-		<input type="radio" name="department" id="radioIMSI" value="IMSI"><label for="radioIMSI">{% trans %}IMSI{% endtrans %}</label>
-		<input type="radio" name="department" id="radioGI" value="GI"><label for="radioGI">{% trans %}INFO{% endtrans %}</label>
-		<input type="radio" name="department" id="radioMC" value="MC"><label for="radioMC">{% trans %}GMC{% endtrans %}</label>
-		<input type="radio" name="department" id="radioHUMA" value="HUMA"><label for="radioHUMA">{% trans %}HUMA{% endtrans %}</label>
-		<input type="radio" name="department" id="radioTC" value="TC"><label for="radioTC">{% trans %}TC{% endtrans %}</label>
+		{% for department in [("EDIM", "EDIM"), ("ENERGIE", "EE"), ("IMSI", "IMSI"), ("INFO", "GI"), ("GMC", "MC"), ("HUMA", "HUMA"), ("TC", "TC")] %}
+			{% set display_name, real_name = department %}
+			<input type="radio" name="department" id="radio{{ real_name }}" value="{{ real_name }}"><label for="radio{{ real_name }}">{% trans %}{{ display_name }}{% endtrans %}</label>
+		{% endfor %}
 	</div>
 	<div class="radio-guide">
-		<input type="radio" name="credit_type" id="radioCS" value="CS"><label for="radioCS">{% trans %}CS{% endtrans %}</label>
-		<input type="radio" name="credit_type" id="radioTM" value="TM"><label for="radioTM">{% trans %}TM{% endtrans %}</label>
-		<input type="radio" name="credit_type" id="radioEC" value="EC"><label for="radioEC">{% trans %}EC{% endtrans %}</label>
-		<input type="radio" name="credit_type" id="radioQC" value="QC"><label for="radioQC">{% trans %}QC{% endtrans %}</label>
-		<input type="radio" name="credit_type" id="radioOM" value="OM"><label for="radioOM">{% trans %}OM{% endtrans %}</label>
+		{% for credit_type in ["CS", "TM", "EC", "QC", "OM"] %}
+			<input type="radio" name="credit_type" id="radio{{ credit_type }}" value="{{ credit_type }}"><label for="radio{{ credit_type }}">{% trans %}{{ credit_type }}{% endtrans %}</label>
+		{% endfor %}
 
 		<input type="checkbox" name="semester" id="radioAUTUMN" value="AUTUMN"><label for="radioAUTUMN"><i class="fa fa-leaf"></i></label>
 		<input type="checkbox" name="semester" id="radioSPRING" value="SPRING"><label for="radioSPRING"><i class="fa fa-sun-o"></i></label>
diff --git a/pedagogy/templates/pedagogy/uv_detail.jinja b/pedagogy/templates/pedagogy/uv_detail.jinja
index 3649a0a1..a4733858 100644
--- a/pedagogy/templates/pedagogy/uv_detail.jinja
+++ b/pedagogy/templates/pedagogy/uv_detail.jinja
@@ -45,7 +45,7 @@
 				{{ object.credit_type }}
 			</div>
 			<div class="semester">
-				{{ object.semester_translated }}
+				{{ object.get_semester_display() }}
 			</div>
 		</div>