diff --git a/cms/admin.py b/cms/admin.py index 264b901..2ebf5bc 100644 --- a/cms/admin.py +++ b/cms/admin.py @@ -35,6 +35,18 @@ class ModuleAdmin(admin.ModelAdmin): form = ModuleAdminForm inlines = [CompetenceInline,] extra = 0 + fields = (('nom'), + ('situation'), + ('contenu', 'contenu_published'), + ('didactique', 'didactique_published'), + ('evaluation', 'evaluation_published'), + ('periode_presentiel', 'travail_perso', 'pratique_prof'), + ('type', 'semestre'), + ('sem1', 'sem2'), + ('sem3', 'sem4'), + ('sem5', 'sem6'), + ('processus'), + ) class ProcessusAdmin(admin.ModelAdmin): diff --git a/cms/models.py b/cms/models.py index 6f1293c..bb9e88c 100644 --- a/cms/models.py +++ b/cms/models.py @@ -120,9 +120,9 @@ class Module(models.Model): situation = models.TextField() evaluation = models.TextField() contenu = models.TextField() - periode_presentiel = models.IntegerField(verbose_name='Période en présentiel') + periode_presentiel = models.IntegerField(verbose_name='Présentiel') travail_perso = models.IntegerField(verbose_name = 'Travail personnel') - pratique_prof = models.IntegerField(default=0, verbose_name='Pratique professionnelle') + pratique_prof = models.IntegerField(default=0, verbose_name='Pratique prof.') didactique = models.TextField() evaluation = models.TextField() diff --git a/templates/cms/competence_list.html b/templates/cms/competence_list.html new file mode 100644 index 0000000..bfbeb99 --- /dev/null +++ b/templates/cms/competence_list.html @@ -0,0 +1,28 @@ +{% extends "./base_site.html" %} +{% load i18n static %} + +{% block coltype %}colMS{% endblock %} + +{% block bodyclass %}{{ block.super }}{% endblock %} + +{% block content %} + +
+

Liste des compétences

+ +{% for c in object_list %} + +{% for p in c.module_set.all %} + +{% for m in p.module_set.all %} + +{% endfor %} +{% endfor %} +{% endfor %} +
{{c}}
 {{p}}
 {{m}}
+ + +
+{% endblock %} + +