diff --git a/cms/pdf.py b/cms/pdf.py index 5d1e9bb..65bb092 100644 --- a/cms/pdf.py +++ b/cms/pdf.py @@ -307,7 +307,7 @@ class FormationPlanPdf(EpcBaseDocTemplate): self.build(self.story) -class PeriodSemesterPdf(EpcBaseDocTemplate): +class PeriodeSemestrePdf(EpcBaseDocTemplate): """ PDF for periods during semesters """ @@ -319,7 +319,7 @@ class PeriodSemesterPdf(EpcBaseDocTemplate): def produce(self, context): for sem in range(1, 7): - modules = context['sem{0}'.format(str(sem))] + modules = [m for m in context['modules'] if getattr(m, 'sem{0}'.format(sem))] total = context['tot{0}'.format(str(sem))] data = [['Semestre {0}'.format(sem), '{0} h.'.format(total)]] for line in modules: diff --git a/cms/static/css/main3.css b/cms/static/css/main3.css index c603065..b3fae94 100644 --- a/cms/static/css/main3.css +++ b/cms/static/css/main3.css @@ -149,14 +149,14 @@ ul li { } .p { - border:1px solid black; -font-size:105%; + border:1px solid black; + font-size:105%; vertical-align:middle; } .m { border:1px solid black; -font-size:105%; + font-size:105%; text-align:center; vertical-align:middle; height:20px; diff --git a/cms/tests.py b/cms/tests.py index fadc8fe..e21f6cc 100644 --- a/cms/tests.py +++ b/cms/tests.py @@ -1,6 +1,6 @@ import os -from django.db.models import Sum +from django.db.models import Sum, F from django.conf import settings from django.contrib.auth.models import User @@ -37,11 +37,19 @@ class PdfTestCase(TestCase): self.assertEqual(response['content-type'], 'application/pdf') self.assertGreater(len(response.content), 200) + def test_periodes_pdf(self): + response = self.client.get(reverse('periodes-pdf')) + self.assertEqual( + response['content-disposition'], + 'attachment; filename="periode_formation.pdf"' + ) + self.assertEqual(response['content-type'], 'application/pdf') + self.assertGreater(len(response.content), 200) + def test_periode_presentiel(self): tot = 0 for m in Module.objects.all(): tot += m.total_presentiel - tot = Module.objects.aggregate(Sum('total_presentiel')) self.assertEqual(tot, 1200) def test_periode_pratique(self): @@ -50,4 +58,15 @@ class PdfTestCase(TestCase): def test_periode_travail_perso(self): tot = Module.objects.aggregate(Sum('travail_perso')) - self.assertEqual(tot['travail_perso__sum'], 1200) \ No newline at end of file + self.assertEqual(tot['travail_perso__sum'], 1200) + + def test_periode(self): + liste = Module.objects.filter(pratique_prof=0) + context = {} + for i in range(1, 7): + semestre = 'sem{}'.format(i) + context.update({ + semestre: liste.exclude(semestre=0), + 'tot{}'.format(i): liste.aggregate(Sum(F(semestre)))['{}__sum'.format(semestre)] + }) + print(context) diff --git a/cms/views.py b/cms/views.py index 1839546..d4a26c4 100644 --- a/cms/views.py +++ b/cms/views.py @@ -7,11 +7,11 @@ import os import tempfile -from django.db.models import F, Sum +from django.db.models import Sum from django.http import HttpResponse from django.views.generic import ListView, TemplateView, DetailView -from cms.pdf import PeriodSemesterPdf, ModuleDescriptionPdf, FormationPlanPdf +from cms.pdf import PeriodeSemestrePdf, ModuleDescriptionPdf, FormationPlanPdf from cms.models import ( Domaine, Processus, Module, Competence, Concept, UploadDoc @@ -95,6 +95,7 @@ def print_module_pdf(request, pk): pdf = ModuleDescriptionPdf(path) module = Module.objects.get(pk=pk) pdf.produce(module) + with open(path, mode='rb') as fh: response = HttpResponse(fh.read(), content_type='application/pdf') response['Content-Disposition'] = 'attachment; filename="EDS_module_{0}.pdf"'.format(module.code) @@ -119,8 +120,8 @@ def print_periode_formation(request): filename = 'periode_formation.pdf' path = os.path.join(tempfile.gettempdir(), filename) context = {} - context = get_context(context) - pdf = PeriodSemesterPdf(path) + context = get_detail_semestre(context) + pdf = PeriodeSemestrePdf(path) pdf.produce(context) with open(path, mode='rb') as fh: @@ -129,30 +130,21 @@ def print_periode_formation(request): return response -def get_context(context): +def get_detail_semestre(context): """ Retrive periods """ - # liste = Module.objects.exclude(total_presentiel=0) + context['tot']= 0 liste = Module.objects.filter(pratique_prof=0) + for i in range(1, 7): + sss = 'sem{}'.format(i) + tot_sem = liste.aggregate(Sum(sss))['{}__sum'.format(sss)] # total du semestre + context.update({ + 'tot{}'.format(i): tot_sem + }) + context['tot'] += tot_sem # total des semestres - context['sem1'] = liste.exclude(sem1=0) - context['tot1'] = liste.aggregate(Sum(F('sem1')))['sem1__sum'] - context['sem2'] = liste.exclude(sem2=0) - context['tot2'] = liste.aggregate(Sum(F('sem2')))['sem2__sum'] - context['sem3'] = liste.exclude(sem3=0) - context['tot3'] = liste.aggregate(Sum(F('sem3')))['sem3__sum'] - context['sem4'] = liste.exclude(sem4=0) - context['tot4'] = liste.aggregate(Sum(F('sem4')))['sem4__sum'] - context['sem5'] = liste.exclude(sem5=0) - context['tot5'] = liste.aggregate(Sum(F('sem5')))['sem5__sum'] - context['sem6'] = liste.exclude(sem6=0) - context['tot6'] = liste.aggregate(Sum(F('sem6')))['sem6__sum'] - - context['tot'] = ( - context['tot1'] + context['tot2'] + context['tot3'] + context['tot4'] - + context['tot5'] + context['tot6'] - ) + context['modules'] = liste return context @@ -161,7 +153,7 @@ class PeriodeView(TemplateView): def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) - return get_context(context) + return get_detail_semestre(context) class CompetenceListView(ListView): @@ -175,8 +167,10 @@ class TravailPersoListView(ListView): def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) - context = get_context(context) - context['total_perso'] = Module.objects.aggregate((Sum('travail_perso')))['travail_perso__sum'] - context['total_presentiel'] = context['tot'] - context['total_pratique'] = Module.objects.aggregate((Sum('pratique_prof')))['pratique_prof__sum'] - return get_context(context) + context = get_detail_semestre(context) + context.update({ + 'total_perso' : Module.objects.aggregate((Sum('travail_perso')))['travail_perso__sum'], + 'total_presentiel' : context['tot'], + 'total_pratique': Module.objects.aggregate((Sum('pratique_prof')))['pratique_prof__sum'] + }) + return context diff --git a/common/settings.py b/common/settings.py index 3cbed36..149787e 100644 --- a/common/settings.py +++ b/common/settings.py @@ -24,7 +24,7 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True -ALLOWED_HOSTS = ['eds.webzos.net', 'localhost', '127.0.0.1'] +ALLOWED_HOSTS = ['eds.webzos.net', 'localhost'] # Application definition @@ -136,6 +136,7 @@ TINYMCE_DEFAULT_CONFIG = { TINYMCE_SPELLCHECKER = True TINYMCE_COMPRESSOR = True + PDF_FOOTER_TEXT = 'Ecole Santé-social Pierre-Coullery | Prévoyance 82 - 2300 La Chaux-de-Fonds | 032 886 33 00 | cifom-epc@rpn.ch' diff --git a/common/urls.py b/common/urls.py index c58923a..f92c020 100644 --- a/common/urls.py +++ b/common/urls.py @@ -2,7 +2,7 @@ """ import os -from django.urls import path, re_path, include +from django.urls import path, include from django.contrib import admin from django.conf import settings from django.views.static import serve @@ -19,15 +19,14 @@ urlpatterns = [ path('processus/', views.ProcessusListView.as_view(), name='processus-list'), path('module//', views.ModuleDetailView.as_view(), name='module-detail'), path('modules/', views.ModuleListView.as_view(), name='module-list'), + path('module_pdf//', views.print_module_pdf, name='module-pdf'), path('periodes/', views.PeriodeView.as_view(), name='periodes'), path('periodes_pdf/', views.print_periode_formation, name='periodes-pdf'), - path('evaluation/', views.EvaluationView.as_view(), name='evaluation'), path('competences/', views.CompetenceListView.as_view(), name='competences'), path('travail/', views.TravailPersoListView.as_view(), name='travail'), - path('module_pdf//', views.print_module_pdf, name='module-pdf'), + path('upload/', views.UploadDocListView.as_view(), name='uploaddoc-list'), - path('document//', views.ConceptDetailView.as_view(), name='concept-detail'), - path('upload//', views.UploadDocDetailView.as_view(), name='uploaddoc-detail'), + path('concept//', views.ConceptDetailView.as_view(), name='concept-detail'), path('tinymce/', include('tinymce.urls'), name='tinymce-js'), # Serve docs by Django to allow LoginRequiredMiddleware to apply diff --git a/templates/admin/base.html b/templates/admin/base.html deleted file mode 100644 index e58ca4f..0000000 --- a/templates/admin/base.html +++ /dev/null @@ -1,94 +0,0 @@ -{% load i18n static %} -{% get_current_language as LANGUAGE_CODE %}{% get_current_language_bidi as LANGUAGE_BIDI %} - - - {% block title %}{% endblock %} - - {% block extrastyle %}{% endblock %} - {% if LANGUAGE_BIDI %} - - {% endif %} - {% block extrahead %} - - {% endblock %} - {% block blockbots %} - - {% endblock %} - -{% load i18n %} - - - - -
- - {% if not is_popup %} - - - - {% block breadcrumbs %} -
- {% trans 'Home' %} - {% if title %} › {{ title }}{% endif %} -
- {% endblock %} - {% endif %} - - {% block messages %} - {% if messages %} -
    {% for message in messages %} - {{ message|capfirst }} - {% endfor %}
- {% endif %} - {% endblock messages %} - - -
- {% block pretitle %}{% endblock %} - {% block content_title %}{% if title %}

{{ title }}

{% endif %}{% endblock %} - {% block content %} - {% block object-tools %}{% endblock %} - {{ content }} - {% endblock %} - {% block sidebar %}{% endblock %} -
-
- - - {% block footer %}{% endblock %} -
- - - - diff --git a/templates/admin/base_site.html b/templates/admin/base_site.html deleted file mode 100644 index b90c23b..0000000 --- a/templates/admin/base_site.html +++ /dev/null @@ -1,13 +0,0 @@ -{% extends "./base.html" %} -{% block title %}EDS{% endblock %} - -{% block branding %} -

{{ site_header|default:_('Django administration') }}

-{% endblock %} - -{% block nav-global %}{% endblock %} -{% block breadcrumbs %} -
- Accueil   -
-{% endblock %} diff --git a/templates/admin/cms/processus/edit_inline/tabular.html b/templates/admin/cms/processus/edit_inline/tabular.html deleted file mode 100644 index baf0941..0000000 --- a/templates/admin/cms/processus/edit_inline/tabular.html +++ /dev/null @@ -1 +0,0 @@ -helle \ No newline at end of file diff --git a/templates/cms/base_site.html b/templates/cms/base_site.html index 8cbd1f5..8b4ab2e 100644 --- a/templates/cms/base_site.html +++ b/templates/cms/base_site.html @@ -3,7 +3,7 @@ {% block title %}EDS{% endblock %} {% block branding %} -

Ecole Santé-social Pierre-Coullery   Formation en Education sociale

+

Ecole Santé-social Pierre-Coullery    Formation en Education sociale, dipl. ES

{% endblock %} {% block usertools %}
diff --git a/templates/cms/competence_list.html b/templates/cms/competence_list.html index 2418a9a..ea8328c 100644 --- a/templates/cms/competence_list.html +++ b/templates/cms/competence_list.html @@ -1,10 +1,6 @@ {% extends "./base_site.html" %} {% load i18n static %} -{% block coltype %}colMS{% endblock %} - -{% block bodyclass %}{{ block.super }}{% endblock %} - {% block content %}

Liste des compétences du PEC avec les modules correspondants

diff --git a/templates/cms/concept_detail.html b/templates/cms/concept_detail.html index bc0f5a5..4e0a474 100644 --- a/templates/cms/concept_detail.html +++ b/templates/cms/concept_detail.html @@ -1,13 +1,13 @@ {% extends "./base_site.html" %} {% load i18n static %} -{% block coltype %}colMS{% endblock %} + {% block content %}
-
-

{{object}}

+
+

{{ object }}

{% if object.published %} -

{{object.texte|safe}}

+

{{ object.texte|safe }}

{% else %}

Le document est en travail

{% endif %} diff --git a/templates/cms/domaine_detail.html b/templates/cms/domaine_detail.html index bee8acf..97f82d5 100644 --- a/templates/cms/domaine_detail.html +++ b/templates/cms/domaine_detail.html @@ -1,12 +1,10 @@ {% extends "./base_site.html" %} {% load i18n static %} -{% block coltype %}colMS{% endblock %} - {% block content %}
-

Domaine: {{object}}

+

Domaine: {{ object }}

{% for p in object.processus_set.all %}

Processus: {{ p.url|safe }}

{% for m in p.module_set.all %} diff --git a/templates/cms/domaine_list.html b/templates/cms/domaine_list.html index 67b3374..ed3b2a2 100644 --- a/templates/cms/domaine_list.html +++ b/templates/cms/domaine_list.html @@ -1,8 +1,6 @@ {% extends "./base_site.html" %} {% load i18n static %} -{% block coltype %}colMS{% endblock %} -{% block bodyclass %}{{ block.super }}{% endblock %} {% block content %}
@@ -10,17 +8,17 @@ {% for d in object_list %} - + {% for p in d.processus_set.all %} - + {% for m in p.module_set.all %} - + {% endfor %} {% endfor %} diff --git a/templates/cms/evaluation.html b/templates/cms/evaluation.html deleted file mode 100644 index 1dc8255..0000000 --- a/templates/cms/evaluation.html +++ /dev/null @@ -1,119 +0,0 @@ -{% extends "./base_site.html" %} -{% load i18n static %} - - - - -{% block coltype %}colMS{% endblock %} - -{% block bodyclass %}{{ block.super }}{% endblock %} - - -{% block content %} - - - -
-

Evaluation des compétences

-
-
-
    -
  • P01
    • -
  • P02
    • -
  • P03
    • -
  • P04
    • -
  • P05
    • -
  • P06
    • -
  • P07
    • -
  • P08
    • -
-
-
- {% for p in object_list %} -
-
{{d}}{{ d }}
 {{p}}{{ p }}
 {{m}}{{ m }}
- - - - - {% for c in p.competence_set.all %} - - - - - {% endfor %} -
{{p}} -
-
{{c}} - -
-
- {% endfor %} -
-
-{% endblock %} - - diff --git a/templates/cms/index.html b/templates/cms/index.html index 8114c2c..207d0dc 100644 --- a/templates/cms/index.html +++ b/templates/cms/index.html @@ -1,12 +1,10 @@ {% extends "./base_site.html" %} {% load i18n static %} -{% block coltype %}colMS{% endblock %} - {% block content %}
- +

Plan général de la formation

@@ -19,9 +17,9 @@ - - - + + + @@ -29,7 +27,7 @@ - + @@ -37,11 +35,11 @@ - + - + @@ -56,92 +54,92 @@ - - - + + + - + - - + - - + + + - -   + - - - + + - - + + + - - + - + + - - - + + - - + + + - - - + + + - - - - - + + + + + - - - - - + + + + + - - - + + +
DomainesSem6
{{D1.url|safe}}{{P01.url|safe}}{{M01.url_code|safe}}{{ D1.url|safe }}{{ P01.url|safe }}{{ M01.url_code|safe }}       
{{M02.url_code|safe}}{{ M02.url_code|safe }}       
{{P02.url|safe}}{{ P02.url|safe }}    {{M03.url_code|safe}}{{ M03.url_code|safe }}    
{{D2.url|safe}}{{P03.url|safe}}{{M05.url_code|safe}}{{ D2.url|safe }}{{ P03.url|safe }}{{ M05.url_code|safe }}  {{M06.url_code|safe}}{{ M06.url_code|safe }}      
{{P04.url|safe}}{{ P04.url|safe }}      {{M07.url_code|safe}}{{M09.url_code|safe}} {{ M07.url_code|safe }}{{ M09.url_code|safe }}
     {{M08.url_code|safe}}{{ M08.url_code|safe }} 
{{D3.url|safe}}{{P05.url|safe}} {{ D3.url|safe }}{{ P05.url|safe }}  {{M10.url_code|safe}}{{M12.url_code|safe}} {{ M10.url_code|safe }}{{ M12.url_code|safe }}  
{{P06.url|safe}} {{ P06.url|safe }}  {{M11.url_code|safe}} {{ M11.url_code|safe }}    
{{D4.url|safe}}{{P07.url|safe}} {{ D4.url|safe }}{{ P07.url|safe }}  {{M13.url_code|safe}}  {{M14.url_code|safe}}{{ M13.url_code|safe }} {{ M14.url_code|safe }}  
{{D5.url|safe}}{{P08.url|safe}}{{M15.url_code|safe}}{{ D5.url|safe }}{{ P08.url|safe }}{{ M15.url_code|safe }}
{{D6.url|safe}}{{P09.url|safe}}{{M16_1a.url_code|safe}} / {{M16_1b.url_code|safe}} / {{M16_1c.url_code|safe}} / {{M16_1d.url_code|safe}} / {{M16_1e.url_code|safe}}{{M16_2a.url_code|safe}} / {{M16_2b.url_code|safe}} {{M16_3a.url_code|safe}} / {{M16_3b.url_code|safe}} / {{M16_3c.url_code|safe}}{{ D6.url|safe }}{{ P09.url|safe }}{{ M16_1a.url_code|safe }} / {{ M16_1b.url_code|safe }} / {{ M16_1c.url_code|safe }} / {{ M16_1d.url_code|safe }} / {{ M16_1e.url_code|safe }}{{ M16_2a.url_code|safe }} / {{ M16_2b.url_code|safe }} {{ M16_3a.url_code|safe }} / {{ M16_3b.url_code|safe }} / {{ M16_3c.url_code|safe }}
{{D7.url|safe}}{{P10.url|safe}}{{M17_1.url_code|safe}}{{M17_2.url_code|safe}}{{M17_3.url_code|safe}}{{ D7.url|safe }}{{ P10.url|safe} }{{ M17_1.url_code|safe }}{{ M17_2.url_code|safe }}{{ M17_3.url_code|safe }}
{{D8.url|safe}}{{P11.url|safe}}{{MACC.url_code|safe}}{{ D8.url|safe }}{{ P11.url|safe }}{{ MACC.url_code|safe }}

diff --git a/templates/cms/module_detail.html b/templates/cms/module_detail.html index f0882de..9f66e40 100644 --- a/templates/cms/module_detail.html +++ b/templates/cms/module_detail.html @@ -1,30 +1,28 @@ {% extends "./base_site.html" %} {% load i18n static %} -{% block coltype %}colMS{% endblock %} - {% block content %}
-

{{object}}

+

{{ object }}

- + - + - + @@ -33,8 +31,8 @@ @@ -43,7 +41,7 @@ @@ -54,37 +52,37 @@ - + - + - + {% if object.total_presentiel > 0 %} - + {% endif %} {% if object.pratique_prof > 0 %} - + {% endif %} {% if object.travail_perso > 0 %} - + {% endif %} - +
Domaine{{object.processus.domaine.url|safe}}{{ object.processus.domaine.url|safe }}
Processus{{object.processus.url|safe}}{{ object.processus.url|safe }}
Situation emblématique{{object.situation|linebreaksbr}}{{ object.situation|linebreaksbr }}
Compétences visées

L'éducateur social, l'éducatrice sociale:

{% for c in object.competence_set.all %} - - {{c.nom}} ({{c.code}})
+ - {{ c.nom }} ({{ c.code }})
{% endfor %}
{% for c in object.competence_set.all %} {% for sc in c.souscompetence_set.all %} - - {{sc.nom}} (voir {{sc.competence.code}})
- {%endfor %} + - {{ sc.nom }} (voir {{ sc.competence.code }})
+ {% endfor %} {% endfor %}
Objectifs à atteindre {% for c in object.objectif_set.all %} - - {{c}}
+ - {{ c }}
{% endfor %}
Evaluation{{object.evaluation|linebreaksbr}}{{ object.evaluation|linebreaksbr }}
Type{{object.type}}, obligatoire{{ object.type }}, obligatoire
SemestreSem. {{object.semestre}}Sem. {{ object.semestre }}
Présentiel{{object.total_presentiel}} heures{{ object.total_presentiel }} heures
Pratique prof.{{object.pratique_prof}} heures{{ object.pratique_prof }} heures
Travail perso.{{object.travail_perso}} heures{{ object.travail_perso }} heures
Responsable{{object.processus.domaine.responsable.descr|safe}}{{ object.processus.domaine.responsable.descr|safe }}

Imprimer en PDF

diff --git a/templates/cms/module_detail_old.html b/templates/cms/module_detail_old.html deleted file mode 100644 index 2a6633e..0000000 --- a/templates/cms/module_detail_old.html +++ /dev/null @@ -1,89 +0,0 @@ -{% extends "./base_site.html" %} -{% load i18n static %} - -{% block coltype %}colMS{% endblock %} - -{% block content %} - -
-

{{object}}

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {% if object.periode_presentiel > 0 %} - - - - - {% endif %} - {% if object.pratique_prof > 0 %} - - - - - {% endif %} - {% if object.travail_perso > 0 %} - - - - - {% endif %} - - - - -
Domaine{{object.processus.domaine.url|safe}}
Processus{{object.processus.url|safe}}
Situation emblématique{{object.situation|linebreaksbr}}
Compétences visées

L'éducateur social, l'éducatrice sociale:

- {% for c in object.competence_set.all %} - - {{c.nom}} ({{c.code}})
- {% if user.is_authenticated %} - {% for sc in c.souscompetence_set.all %} -     -- {{sc.nom}}
- {%endfor %} - {% endif %} - {% endfor %} -
Objectifs à atteindre - {% for c in object.objectif_set.all %} - - {{c}}
- {% endfor %} -
Didactique{{ object.didactique }}
Evaluation{{object.evaluation|linebreaksbr}}
Type{{object.type}}, obligatoire
SemestreSem. {{object.semestre}}
Présentiel{{object.periode_presentiel}} heures
Pratique prof.{{object.pratique_prof}} heures
Travail perso.{{object.travail_perso}} heures
Responsable{{object.processus.domaine.responsable.descr|safe}}
-

Imprimer en PDF

-
-{% endblock %} - - diff --git a/templates/cms/module_list.html b/templates/cms/module_list.html index 2339d8c..5705f20 100644 --- a/templates/cms/module_list.html +++ b/templates/cms/module_list.html @@ -1,10 +1,6 @@ {% extends "./base_site.html" %} {% load i18n static %} -{% block coltype %}colMS{% endblock %} - -{% block bodyclass %}{{ block.super }}{% endblock %} - {% block content %}
@@ -12,8 +8,8 @@ {% for m in object_list %} - - + + {% endfor %}
{{m.code}}{{m.nom}}{{ m.code }}{{ m.nom }}
diff --git a/templates/cms/periodes.html b/templates/cms/periodes.html index 1c75119..0d3738e 100644 --- a/templates/cms/periodes.html +++ b/templates/cms/periodes.html @@ -1,33 +1,34 @@ {% extends "./base_site.html" %} {% load i18n static %} -{% block coltype %}colMS{% endblock %} - - {% block content %}

Périodes de formation

- + - + @@ -38,27 +39,31 @@ - + - + @@ -69,34 +74,38 @@ - + - +
Semestre 1{{tot1}}h.{{ tot1 }}h. Semestre 2{{tot2}}h.{{ tot2 }}h.
- {% for s in sem1 %} - + {% for s in modules %} + {% if s.sem1 > 0 %} + + {% endif %} {% endfor %}
{{s}}{{s.sem1}} h.
{{ s }}{{ s.sem1 }} h.
 - {% for s in sem2 %} - + {% for s in modules %} + {% if s.sem2 > 0 %} + + {% endif %} {% endfor %}
{{s}}{{s.sem2}} h.
{{ s }}{{ s.sem2 }} h.
Semestre 3{{tot3}}h.{{ tot3 }}h. Semestre 4{{tot4}}h.{{ tot4 }}h.
- {% for s in sem3 %} - + {% for s in modules %} + {% if s.sem3 > 0 %} + + {% endif %} {% endfor %}
{{s}}{{s.sem3}} h.
{{ s }}{{ s.sem3 }} h.
 - {% for s in sem4 %} - - - - + {% for s in modules %} + {% if s.sem4 > 0 %} + + + + + {% endif %} {% endfor %}
{{s}}{{s.sem4}} h.
{{ s }}{{ s.sem4 }} h.
Semestre 5{{tot5}}h.{{ tot5 }}h. Semestre 6{{tot6}}h.{{ tot6 }}h.
- {% for s in sem5 %} - + {% for s in modules %} + {% if s.sem5 > 0 %} + + {% endif %} {% endfor %}
{{s}}{{s.sem5}} h.
{{ s }}{{ s.sem5 }} h.
 - {% for s in sem6 %} - - - - + {% for s in modules %} + {% if s.sem6 > 6 %} + + + + + {% endif %} {% endfor %}
{{s}}{{s.sem6}} h.
{{ s }}{{ s.sem6 }} h.

-

Total des heures de cours: {{tot}} heures

+

Total des heures de cours: {{ tot }} heures

Imprimer en PDF
{% endblock %} diff --git a/templates/cms/processus_detail.html b/templates/cms/processus_detail.html index 7cefc16..7ad6c3e 100644 --- a/templates/cms/processus_detail.html +++ b/templates/cms/processus_detail.html @@ -1,17 +1,13 @@ {% extends "./base_site.html" %} {% load i18n static %} -{% block coltype %}colMS{% endblock %} - -{% block bodyclass %}{{ block.super }} dashboard{% endblock %} - {% block content %}
-

{{object}}

+

{{ object }}

- + @@ -19,24 +15,24 @@

L'éducateur social, l'éducatrice sociale:

{% for m in object.module_set.all %} {% for c in m.competences.all %} - - {{c.libelle}} ({{c.code}})
+ - {{ c.libelle }} ({{ c.code }})
{% endfor %} {% endfor %} - + - + diff --git a/templates/cms/processus_list.html b/templates/cms/processus_list.html index bc8997c..ab2ed22 100644 --- a/templates/cms/processus_list.html +++ b/templates/cms/processus_list.html @@ -1,23 +1,19 @@ {% extends "./base_site.html" %} {% load i18n static %} -{% block coltype %}colMS{% endblock %} - -{% block bodyclass %}{{ block.super }}{% endblock %} - {% block content %}

Liste des processus

Description{{object.description}}{{ object.description }}
Compétences visées
Domaine{{object.domaine.url|safe}}{{ object.domaine.url|safe }}
Responsable{{object.domaine.responsable.descr|safe}}{{ object.domaine.responsable.descr|safe }}
Modules concernés {% for m in object.module_set.all %} - {{m.url|safe}}
+ {{ m.url|safe }}
{% endfor %}
{% for p in object_list %} - - + + {% for m in p.module_set.all %} - + {% endfor %} {% endfor %} diff --git a/templates/cms/travail_perso.html b/templates/cms/travail_perso.html index ac530eb..9d2a18a 100644 --- a/templates/cms/travail_perso.html +++ b/templates/cms/travail_perso.html @@ -3,8 +3,6 @@ {% block coltype %}colMS{% endblock %} -{% block bodyclass %}{{ block.super }}{% endblock %} - {% block content %}
diff --git a/templates/cms/uploaddoc_detail.html b/templates/cms/uploaddoc_detail.html deleted file mode 100644 index cb7e7b3..0000000 --- a/templates/cms/uploaddoc_detail.html +++ /dev/null @@ -1,13 +0,0 @@ -{% extends "./base_site.html" %} -{% load i18n static %} - -{% block coltype %}colMS{% endblock %} - -{% block content %} - -
- -
-{% endblock %} - - diff --git a/templates/cms/uploaddoc_list.html b/templates/cms/uploaddoc_list.html index b4bbabb..e2ce8c3 100644 --- a/templates/cms/uploaddoc_list.html +++ b/templates/cms/uploaddoc_list.html @@ -1,33 +1,20 @@ {% extends "./base_site.html" %} {% load i18n static %} -{% block extrastyle %}{{ block.super }} -{% endblock %} - -{% block coltype %}colMS{% endblock %} - -{% block bodyclass %}{{ block.super }} dashboard{% endblock %} - -{% block breadcrumbs %} -
- Accueil - Téléchargements -
-{% endblock %} - {% block content %}
-

Documents en téléchargement

- {% if object_list %} - - {% else %} -

No documents.

- {% endif %} - +
+

Documents en téléchargement

+ {% if object_list %} + + {% else %} +

No documents.

+ {% endif %} +
{% endblock %}
{{p.code}}{{p.nom}}{{ p.code }}{{ p.nom }}
 {{m}}{{ m }}