klmp200
/
Sith
mirror of https://github.com/ae-utbm/sith3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pedagogy: display hours of UVs

This commit is contained in:
Antoine Bartuccio 2019-07-07 21:38:00 +02:00
parent 2c5385cf5c
commit 3ee7ff2752
Signed by: klmp200
GPG Key ID: E7245548C53F904B
3 changed files with 88 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1769,11 +1769,11 @@ $pedagogy-white-text: #f0f0f0;
font-family: "Fira Sans"; font-family: "Fira Sans";
color: #062f38; color: #062f38;
.department-credit-type-semester-container { .uv-quick-info-container {
display: grid; display: grid;
grid-template-columns: 10% 10% auto; grid-template-columns: 10% 10% 10% 10% auto;
grid-template-rows: 100%; grid-template-rows: 100% 100%;
grid-template-areas: "department credit-type semester"; grid-template-areas: "hours-cm hours-td hours-tp hours-te hours-the" "department credit-type semester . ." ;
} }
.department { .department {
@ -1788,6 +1788,26 @@ $pedagogy-white-text: #f0f0f0;
grid-area: semester; grid-area: semester;
} }
.hours-cm {
grid-area: hours-cm;
}
.hours-td {
grid-area: hours-td;
}
.hours-tp {
grid-area: hours-tp;
}
.hours-te {
grid-area: hours-te;
}
.hours-the {
grid-area: hours-the;
}
#leave_comment { #leave_comment {
.leave-comment-grid-container { .leave-comment-grid-container {
display: grid; display: grid;
@ -1840,7 +1860,7 @@ $pedagogy-white-text: #f0f0f0;
} }
} }
.grid-container { .uv-details-container {
display: grid; display: grid;
grid-template-columns: 150px 100px auto; grid-template-columns: 150px 100px auto;
grid-template-rows: 156px 1fr; grid-template-rows: 156px 1fr;

70
locale/fr/LC_MESSAGES/django.po
View File

@ -6,7 +6,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-07-07 19:22+0200\n" "POT-Creation-Date: 2019-07-07 21:37+0200\n"
"PO-Revision-Date: 2016-07-18\n" "PO-Revision-Date: 2016-07-18\n"
"Last-Translator: Skia <skia@libskia.so>\n" "Last-Translator: Skia <skia@libskia.so>\n"
"Language-Team: AE info <ae.info@utbm.fr>\n" "Language-Team: AE info <ae.info@utbm.fr>\n"
@ -382,7 +382,7 @@ msgstr "Compte en banque : "
#: pedagogy/templates/pedagogy/guide.jinja:115 #: pedagogy/templates/pedagogy/guide.jinja:115
#: pedagogy/templates/pedagogy/moderation.jinja:18 #: pedagogy/templates/pedagogy/moderation.jinja:18
#: pedagogy/templates/pedagogy/moderation.jinja:45 #: pedagogy/templates/pedagogy/moderation.jinja:45
#: pedagogy/templates/pedagogy/uv_detail.jinja:156 #: pedagogy/templates/pedagogy/uv_detail.jinja:171
#: sas/templates/sas/album.jinja:26 sas/templates/sas/moderation.jinja:18 #: sas/templates/sas/album.jinja:26 sas/templates/sas/moderation.jinja:18
#: sas/templates/sas/picture.jinja:74 sas/templates/sas/picture.jinja:124 #: sas/templates/sas/picture.jinja:74 sas/templates/sas/picture.jinja:124
#: stock/templates/stock/stock_shopping_list.jinja:43 #: stock/templates/stock/stock_shopping_list.jinja:43
@ -441,7 +441,7 @@ msgstr "Nouveau compte club"
#: pedagogy/templates/pedagogy/guide.jinja:55 #: pedagogy/templates/pedagogy/guide.jinja:55
#: pedagogy/templates/pedagogy/guide.jinja:78 #: pedagogy/templates/pedagogy/guide.jinja:78
#: pedagogy/templates/pedagogy/guide.jinja:114 #: pedagogy/templates/pedagogy/guide.jinja:114
#: pedagogy/templates/pedagogy/uv_detail.jinja:155 #: pedagogy/templates/pedagogy/uv_detail.jinja:170
#: sas/templates/sas/album.jinja:18 sas/templates/sas/picture.jinja:100 #: sas/templates/sas/album.jinja:18 sas/templates/sas/picture.jinja:100
#: trombi/templates/trombi/detail.jinja:9 #: trombi/templates/trombi/detail.jinja:9
#: trombi/templates/trombi/edit_profile.jinja:34 #: trombi/templates/trombi/edit_profile.jinja:34
@ -673,7 +673,7 @@ msgstr "Effectuées"
#: counter/templates/counter/cash_summary_list.jinja:37 counter/views.py:1162 #: counter/templates/counter/cash_summary_list.jinja:37 counter/views.py:1162
#: pedagogy/templates/pedagogy/moderation.jinja:16 #: pedagogy/templates/pedagogy/moderation.jinja:16
#: pedagogy/templates/pedagogy/moderation.jinja:43 #: pedagogy/templates/pedagogy/moderation.jinja:43
#: pedagogy/templates/pedagogy/uv_detail.jinja:116 #: pedagogy/templates/pedagogy/uv_detail.jinja:131
#: trombi/templates/trombi/comment.jinja:4 #: trombi/templates/trombi/comment.jinja:4
#: trombi/templates/trombi/comment.jinja:8 #: trombi/templates/trombi/comment.jinja:8
#: trombi/templates/trombi/user_tools.jinja:50 #: trombi/templates/trombi/user_tools.jinja:50
@ -4807,7 +4807,8 @@ msgid ""
"The code of an UV must only contains uppercase characters without accent and " "The code of an UV must only contains uppercase characters without accent and "
"numbers" "numbers"
msgstr "" msgstr ""
"Le code d'une UV doit seulement contenire des caractères majuscule sans accents et nombres" "Le code d'une UV doit seulement contenire des caractères majuscule sans "
"accents et nombres"
#: pedagogy/models.py:118 #: pedagogy/models.py:118
msgid "credit type" msgid "credit type"
@ -4869,8 +4870,8 @@ msgstr "heures TE"
msgid "uv" msgid "uv"
msgstr "uv" msgstr "uv"
#: pedagogy/models.py:229 pedagogy/templates/pedagogy/uv_detail.jinja:40 #: pedagogy/models.py:229 pedagogy/templates/pedagogy/uv_detail.jinja:55
#: pedagogy/templates/pedagogy/uv_detail.jinja:128 #: pedagogy/templates/pedagogy/uv_detail.jinja:143
msgid "global grade" msgid "global grade"
msgstr "note globale" msgstr "note globale"
@ -5010,63 +5011,83 @@ msgstr "Supprimer signalement"
msgid "UV Details" msgid "UV Details"
msgstr "Détails d'UV" msgstr "Détails d'UV"
#: pedagogy/templates/pedagogy/uv_detail.jinja:35
msgid "CM: "
msgstr "CM : "
#: pedagogy/templates/pedagogy/uv_detail.jinja:38
msgid "TD: "
msgstr "TD : "
#: pedagogy/templates/pedagogy/uv_detail.jinja:41 #: pedagogy/templates/pedagogy/uv_detail.jinja:41
#: pedagogy/templates/pedagogy/uv_detail.jinja:129 msgid "TP: "
msgstr "TP : "
#: pedagogy/templates/pedagogy/uv_detail.jinja:44
msgid "TE: "
msgstr "TE : "
#: pedagogy/templates/pedagogy/uv_detail.jinja:47
msgid "THE: "
msgstr "THE : "
#: pedagogy/templates/pedagogy/uv_detail.jinja:56
#: pedagogy/templates/pedagogy/uv_detail.jinja:144
msgid "utility" msgid "utility"
msgstr "utilité" msgstr "utilité"
#: pedagogy/templates/pedagogy/uv_detail.jinja:42 #: pedagogy/templates/pedagogy/uv_detail.jinja:57
#: pedagogy/templates/pedagogy/uv_detail.jinja:130 #: pedagogy/templates/pedagogy/uv_detail.jinja:145
#, fuzzy #, fuzzy
#| msgid "Counters" #| msgid "Counters"
msgid "interest" msgid "interest"
msgstr "intérêt" msgstr "intérêt"
#: pedagogy/templates/pedagogy/uv_detail.jinja:43 #: pedagogy/templates/pedagogy/uv_detail.jinja:58
#: pedagogy/templates/pedagogy/uv_detail.jinja:131 #: pedagogy/templates/pedagogy/uv_detail.jinja:146
msgid "teaching" msgid "teaching"
msgstr "enseignement" msgstr "enseignement"
#: pedagogy/templates/pedagogy/uv_detail.jinja:44 #: pedagogy/templates/pedagogy/uv_detail.jinja:59
#: pedagogy/templates/pedagogy/uv_detail.jinja:132 #: pedagogy/templates/pedagogy/uv_detail.jinja:147
msgid "work load" msgid "work load"
msgstr "charge de travail" msgstr "charge de travail"
#: pedagogy/templates/pedagogy/uv_detail.jinja:54 #: pedagogy/templates/pedagogy/uv_detail.jinja:69
msgid "Objectives" msgid "Objectives"
msgstr "Objectifs" msgstr "Objectifs"
#: pedagogy/templates/pedagogy/uv_detail.jinja:56 #: pedagogy/templates/pedagogy/uv_detail.jinja:71
msgid "Program" msgid "Program"
msgstr "Programme" msgstr "Programme"
#: pedagogy/templates/pedagogy/uv_detail.jinja:58 #: pedagogy/templates/pedagogy/uv_detail.jinja:73
msgid "Earned skills" msgid "Earned skills"
msgstr "Compétences acquises" msgstr "Compétences acquises"
#: pedagogy/templates/pedagogy/uv_detail.jinja:60 #: pedagogy/templates/pedagogy/uv_detail.jinja:75
msgid "Key concepts" msgid "Key concepts"
msgstr "Concepts clefs" msgstr "Concepts clefs"
#: pedagogy/templates/pedagogy/uv_detail.jinja:62 #: pedagogy/templates/pedagogy/uv_detail.jinja:77
msgid "UV manager: " msgid "UV manager: "
msgstr "Gestionnaire d'UV :" msgstr "Gestionnaire d'UV :"
#: pedagogy/templates/pedagogy/uv_detail.jinja:68 #: pedagogy/templates/pedagogy/uv_detail.jinja:83
msgid "Leave comment" msgid "Leave comment"
msgstr "Laisser un commentaire" msgstr "Laisser un commentaire"
#: pedagogy/templates/pedagogy/uv_detail.jinja:123 #: pedagogy/templates/pedagogy/uv_detail.jinja:138
#: stock/templates/stock/shopping_list_items.jinja:42 stock/views.py:278 #: stock/templates/stock/shopping_list_items.jinja:42 stock/views.py:278
#: trombi/templates/trombi/export.jinja:70 #: trombi/templates/trombi/export.jinja:70
msgid "Comments" msgid "Comments"
msgstr "Commentaires" msgstr "Commentaires"
#: pedagogy/templates/pedagogy/uv_detail.jinja:149 #: pedagogy/templates/pedagogy/uv_detail.jinja:164
msgid "This comment has been reported" msgid "This comment has been reported"
msgstr "Ce commentaire a été signalé" msgstr "Ce commentaire a été signalé"
#: pedagogy/templates/pedagogy/uv_detail.jinja:161 #: pedagogy/templates/pedagogy/uv_detail.jinja:176
msgid "Report this comment" msgid "Report this comment"
msgstr "Signaler ce commentaire" msgstr "Signaler ce commentaire"
@ -5425,7 +5446,8 @@ msgstr "Une nouvelle mailing list a besoin d'être modérée"
#: sith/settings.py:565 #: sith/settings.py:565
msgid "A new pedagogy comment has been signaled for moderation" msgid "A new pedagogy comment has been signaled for moderation"
msgstr "Un nouveau commentaire de la pédagogie a été signalé pour la modération" msgstr ""
"Un nouveau commentaire de la pédagogie a été signalé pour la modération"
#: sith/settings.py:567 #: sith/settings.py:567
#, python-format #, python-format

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

@ -21,7 +21,7 @@
<h1>{{ object.code }} - {{ object.title }}</h1> <h1>{{ object.code }} - {{ object.title }}</h1>
<br> <br>
<div class="department-credit-type-semester-container"> <div class="uv-quick-info-container">
<div class="department"> <div class="department">
{{ object.department }} {{ object.department }}
</div> </div>
@ -31,11 +31,26 @@
<div class="semester"> <div class="semester">
{{ object.semester_translated }} {{ object.semester_translated }}
</div> </div>
<div class="hours-cm">
<b>{% trans %}CM: {% endtrans %}</b>{{ object.hours_CM }}
</div>
<div class="hours-td">
<b>{% trans %}TD: {% endtrans %}</b>{{ object.hours_TD }}
</div>
<div class="hours-tp">
<b>{% trans %}TP: {% endtrans %}</b>{{ object.hours_TP }}
</div>
<div class="hours-te">
<b>{% trans %}TE: {% endtrans %}</b>{{ object.hours_TE }}
</div>
<div class="hours-the">
<b>{% trans %}THE: {% endtrans %}</b>{{ object.hours_THE }}
</div>
</div> </div>
<br> <br>
<div class="grid-container"> <div class="uv-details-container">
<div class="grade"> <div class="grade">
<p>{% trans %}global grade{% endtrans %}</p> <p>{% trans %}global grade{% endtrans %}</p>
<p>{% trans %}utility{% endtrans %}</p> <p>{% trans %}utility{% endtrans %}</p>