diff --git a/cms/admin.py b/cms/admin.py index 669a5c3..8d293a2 100644 --- a/cms/admin.py +++ b/cms/admin.py @@ -1,19 +1,30 @@ from django.contrib import admin from .models import (Enseignant, Domaine, Competence, SousCompetence, Objectif, Ressource, Module, Processus) -from .forms import ProcessusAdminForm, ModuleAdminForm, DomaineAdminForm +from .forms import (ProcessusAdminForm, ModuleAdminForm, DomaineAdminForm, CompetenceAdminForm, +SousCompetenceInlineAdminForm, CompetenceInlineAdminForm, ObjectifAdminForm, RessourceAdminForm, +SousCompetenceAdminForm) # Register your models here. class SousCompetenceInline(admin.TabularInline): + form = SousCompetenceInlineAdminForm model = SousCompetence extra = 0 class CompetenceInline(admin.TabularInline): + form = CompetenceInlineAdminForm model = Competence extra=0 #template ='templates/admin/cms/processus/edit_inline/tabular.html' +class SousCompetenceAdmin(admin.ModelAdmin): + form = SousCompetenceAdminForm + + + + class RessourceAdmin(admin.ModelAdmin): + form = RessourceAdminForm list_display = ('nom', 'module') @@ -26,12 +37,18 @@ class ModuleAdmin(admin.ModelAdmin): class ProcessusAdmin(admin.ModelAdmin): form = ProcessusAdminForm + +class ObjectifAdmin(admin.ModelAdmin): + form = ObjectifAdminForm + + class ProcessusAdminInline(admin.TabularInline): model = Processus extra=0 class CompetenceAdmin(admin.ModelAdmin): + form = CompetenceAdminForm list_display = ('code', 'nom', 'module') list_editable = ('module',) inlines = (SousCompetenceInline,) @@ -46,8 +63,8 @@ class DomaineAdmin(admin.ModelAdmin): admin.site.register(Enseignant) admin.site.register(Domaine, DomaineAdmin) admin.site.register(Competence, CompetenceAdmin) -admin.site.register(SousCompetence) -admin.site.register(Objectif) +admin.site.register(SousCompetence, SousCompetenceAdmin) +admin.site.register(Objectif, ObjectifAdmin) admin.site.register(Ressource, RessourceAdmin) admin.site.register(Module, ModuleAdmin) admin.site.register(Processus, ProcessusAdmin) diff --git a/cms/forms.py b/cms/forms.py index ec95593..22e91ba 100644 --- a/cms/forms.py +++ b/cms/forms.py @@ -4,7 +4,7 @@ Created on 17 nov. 2012 @author: alzo ''' -from .models import Processus, Module, Domaine +from .models import Processus, Module, Domaine, Competence, SousCompetence from django import forms from django.contrib import admin @@ -14,7 +14,8 @@ from _collections_abc import __all__ class DocumentForm(forms.Form): docfile = forms.FileField(label='Selectionner un fichier', help_text='Taille max.: 42 megabytes') - + + class ProcessusAdminForm(forms.ModelForm): def __init__(self, *args, **kwargs): @@ -25,7 +26,8 @@ class ProcessusAdminForm(forms.ModelForm): model = Processus fields = ('code', 'nom', 'domaine', 'description') widgets = { - 'nom': forms.Textarea(attrs={'cols': 75, 'rows':2}), + 'nom': forms.Textarea(attrs={'cols': 125, 'rows':2}), + 'description': forms.Textarea(attrs={'cols': 125, 'rows':8}), } class DomaineAdminForm(forms.ModelForm): @@ -37,9 +39,89 @@ class DomaineAdminForm(forms.ModelForm): model = Domaine fields = ('code', 'nom', 'responsable') widgets = { - 'nom': forms.Textarea(attrs={'cols': 75, 'rows':2}), + 'nom': forms.Textarea(attrs={'cols': 125, 'rows':2}), } - + +class CompetenceAdminForm(forms.ModelForm): + + def __init__(self, *args, **kwargs): + super(CompetenceAdminForm, self).__init__(*args, **kwargs) + + class Meta: + model = Competence + fields = ('__all__') + widgets = { + 'nom': forms.Textarea(attrs={'cols': 125, 'rows':2}), + } + + +class SousCompetenceAdminForm(forms.ModelForm): + + def __init__(self, *args, **kwargs): + super(SousCompetenceAdminForm, self).__init__(*args, **kwargs) + + class Meta: + model = SousCompetence + fields = ('__all__') + widgets = { + 'nom': forms.Textarea(attrs={'cols': 125, 'rows':2}), + } + + +class CompetenceInlineAdminForm(forms.ModelForm): + + def __init__(self, *args, **kwargs): + super(CompetenceInlineAdminForm, self).__init__(*args, **kwargs) + + class Meta: + model = SousCompetence + fields = ('__all__') + widgets = { + 'code': forms.Textarea(attrs={'cols': 5, 'rows':1}), + 'nom': forms.Textarea(attrs={'cols': 125, 'rows':2}), + } + + +class SousCompetenceInlineAdminForm(forms.ModelForm): + + def __init__(self, *args, **kwargs): + super(SousCompetenceInlineAdminForm, self).__init__(*args, **kwargs) + + class Meta: + model = SousCompetence + fields = ('__all__') + widgets = { + 'code': forms.Textarea(attrs={'cols': 5, 'rows':1}), + 'nom': forms.Textarea(attrs={'cols': 125, 'rows':1}), + } + + +class ObjectifAdminForm(forms.ModelForm): + + def __init__(self, *args, **kwargs): + super(ObjectifAdminForm, self).__init__(*args, **kwargs) + + class Meta: + model = SousCompetence + fields = ('__all__') + widgets = { + 'nom': forms.Textarea(attrs={'cols': 125, 'rows':2}), + } + + +class RessourceAdminForm(forms.ModelForm): + + def __init__(self, *args, **kwargs): + super(RessourceAdminForm, self).__init__(*args, **kwargs) + + class Meta: + model = SousCompetence + fields = ('__all__') + widgets = { + 'nom': forms.Textarea(attrs={'cols': 125, 'rows':3}), + } + + class ModuleAdminForm(forms.ModelForm): def __init__(self, *args, **kwargs): @@ -50,11 +132,11 @@ class ModuleAdminForm(forms.ModelForm): model = Module fields = ('__all__') widgets = { - 'nom': forms.Textarea(attrs={'cols': 73, 'rows':2}), - 'description': forms.Textarea(attrs={'cols': 73, 'rows':4}), - 'situation': forms.Textarea(attrs={'cols': 73, 'rows':6}), - 'contenu': forms.Textarea(attrs={'cols': 73, 'rows':4}), - 'didactique': forms.Textarea(attrs={'cols': 73, 'rows':4}), - 'evaluation': forms.Textarea(attrs={'cols': 73, 'rows':2}), + 'nom': forms.Textarea(attrs={'cols': 125, 'rows':2}), + 'description': forms.Textarea(attrs={'cols': 125, 'rows':4}), + 'situation': forms.Textarea(attrs={'cols': 125, 'rows':6}), + 'contenu': forms.Textarea(attrs={'cols': 125, 'rows':4}), + 'didactique': forms.Textarea(attrs={'cols': 125, 'rows':2}), + 'evaluation': forms.Textarea(attrs={'cols': 125, 'rows':2}), } \ No newline at end of file diff --git a/cms/migrations/0017_auto_20170308_0437.py b/cms/migrations/0017_auto_20170308_0437.py new file mode 100644 index 0000000..784ddb6 --- /dev/null +++ b/cms/migrations/0017_auto_20170308_0437.py @@ -0,0 +1,30 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.4 on 2017-03-08 03:37 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('cms', '0016_remove_module_description'), + ] + + operations = [ + migrations.AlterField( + model_name='module', + name='periode_presentiel', + field=models.IntegerField(verbose_name='Période en présentiel'), + ), + migrations.AlterField( + model_name='module', + name='pratique_prof', + field=models.IntegerField(default=0, verbose_name='Pratique professionnelle'), + ), + migrations.AlterField( + model_name='module', + name='travail_perso', + field=models.IntegerField(verbose_name='Travail personnel'), + ), + ] diff --git a/cms/models.py b/cms/models.py index 07d7b9a..e2709dc 100644 --- a/cms/models.py +++ b/cms/models.py @@ -107,9 +107,9 @@ class Module(models.Model): situation = models.TextField() evaluation = models.TextField() contenu = models.TextField() - periode_presentiel = models.IntegerField() - travail_perso = models.IntegerField() - pratique_prof = models.IntegerField(default=0) + periode_presentiel = models.IntegerField(verbose_name='Période en présentiel') + travail_perso = models.IntegerField(verbose_name = 'Travail personnel') + pratique_prof = models.IntegerField(default=0, verbose_name='Pratique professionnelle') didactique = models.TextField() evaluation = models.TextField() sem1 = models.IntegerField(default=0) diff --git a/templates/cms/404.html b/templates/cms/404.html new file mode 100644 index 0000000..e508b42 --- /dev/null +++ b/templates/cms/404.html @@ -0,0 +1,25 @@ +{% extends "./base_site.html" %} +{% load i18n static %} + +{% block extrastyle %}{{ block.super }} +{% endblock %} + +{% block coltype %}colMS{% endblock %} + +{% block bodyclass %}{{ block.super }} dashboard{% endblock %} + +{% block breadcrumbs %} +
+ {% endblock %} + +{% block content %} + +