Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
AE
Sith
Commits
c15ea345
Verified
Commit
c15ea345
authored
Jul 08, 2019
by
Sli
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pedagogy: generate search form radios trough loop and remove semester_translated
parent
1d319e90
Pipeline
#1896
failed with stage
in 60 minutes and 7 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
20 deletions
+8
-20
pedagogy/models.py
pedagogy/models.py
+0
-7
pedagogy/templates/pedagogy/guide.jinja
pedagogy/templates/pedagogy/guide.jinja
+7
-12
pedagogy/templates/pedagogy/uv_detail.jinja
pedagogy/templates/pedagogy/uv_detail.jinja
+1
-1
No files found.
pedagogy/models.py
View file @
c15ea345
...
...
@@ -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
...
...
pedagogy/templates/pedagogy/guide.jinja
View file @
c15ea345
...
...
@@ -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>
...
...
pedagogy/templates/pedagogy/uv_detail.jinja
View file @
c15ea345
...
...
@@ -45,7 +45,7 @@
{{
object.credit_type
}}
</div>
<div
class=
"semester"
>
{{
object.semester_
translated
}}
{{
object.
get_
semester_
display
()
}}
</div>
</div>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment