From 6d55d479b3559d64dd5a3242d13b50e6e90d1451 Mon Sep 17 00:00:00 2001
From: alazo <alain.zosso@webzos.com>
Date: Tue, 16 May 2017 20:45:01 +0200
Subject: [PATCH] Plus-value CFC-ASE

---
 cms/views.py                         |  6 ++++
 templates/cms/module_detail.html     | 15 +++++++---
 templates/cms/module_detail_old.html | 41 ++++++++++++++++++++++++++++
 templates/cms/processus_detail.html  |  2 +-
 4 files changed, 59 insertions(+), 5 deletions(-)
 create mode 100644 templates/cms/module_detail_old.html

diff --git a/cms/views.py b/cms/views.py
index 6543383..8eb8681 100644
--- a/cms/views.py
+++ b/cms/views.py
@@ -217,6 +217,11 @@ class ModulePDF(DetailView):
             if self.request.user.is_authenticated:
                 for sc in c.souscompetence_set.all():
                     str_comp += '    -- {0}\n'.format(sc.nom)
+        
+        str_scom = ''
+        for c in m.competence_set.all():
+            for sc in c.souscompetence_set.all():
+                str_scom += '- {0}\n'.format(sc.nom)
                     
         str_res = ''
         for c in m.ressource_set.all():
@@ -238,6 +243,7 @@ class ModulePDF(DetailView):
                 [Preformatted_left('Processus'), Preformatted_right(m.processus.__str__())],
                 [Preformatted_left('Situation emblématique'), Preformatted_right(m.situation)],
                 [Preformatted_left('Compétences visées'), Preformatted_right(str_comp)],
+                [Preformatted_left('Plus-value sur le CFC ASE'), Preformatted_right(str_scom)],
                 #[Preformatted_left('Ressources à acquérir'), Preformatted_right(str_res)],
                 [Preformatted_left('Objectifs à atteindre'), Preformatted_right(str_obj)],
                 [Preformatted_left('Didactique'), Preformatted_right(m.didactique)],
diff --git a/templates/cms/module_detail.html b/templates/cms/module_detail.html
index 9381379..daeec28 100644
--- a/templates/cms/module_detail.html
+++ b/templates/cms/module_detail.html
@@ -8,13 +8,20 @@
 <div id="content-main">
 <h1>{{object}}</h1>
 <table>
-<tr><th>Domaine</th><td>{{object.processus.domaine.url|safe}}</td></tr>
+<tr><th width="100px">Domaine</th><td>{{object.processus.domaine.url|safe}}</td></tr>
 <tr><th>Processus</th><td>{{object.processus.url|safe}}</td></tr>
 <tr><th>Situation emblématique</th><td>{{object.situation|linebreaksbr}}</td></tr>
 <tr><th>Compétences visées</th><td><p>L'éducateur social, l'éducatrice sociale:</p>
-{% for c in object.competence_set.all %}- {{c.nom}} ({{c.code}})<br />
-{% if user.is_authenticated %}
-{% for sc in c.souscompetence_set.all %}&nbsp;&nbsp;&nbsp; -- {{sc.nom}} <br />{%endfor %}{% endif %}{% endfor %}</td></tr>
+{% for c in object.competence_set.all %}- {{c.nom}} ({{c.code}})<br />{% endfor %}</td></tr>
+<tr><th>Plus-value sur le CFC ASE</th><td>
+{% for c in object.competence_set.all %}
+{% for sc in c.souscompetence_set.all %}
+- {{sc.nom}} <br />
+{%endfor %}
+{% endfor %}
+</td></tr>
+
+
 <!-- <tr><th>Ressources à acquérir</th><td>{% for c in object.ressource_set.all %}- {{c}}<br />{% endfor %}</td></tr> -->
 <tr><th>Objectifs à atteindre</th><td>{% for c in object.objectif_set.all %}- {{c}}<br />{% endfor %}</td></tr>
 <tr><th>Didactique</th><td>{{ object.didactique }}</td></tr>
diff --git a/templates/cms/module_detail_old.html b/templates/cms/module_detail_old.html
new file mode 100644
index 0000000..9381379
--- /dev/null
+++ b/templates/cms/module_detail_old.html
@@ -0,0 +1,41 @@
+{% extends "./base_site.html" %}
+{% load i18n static %}
+
+{% block coltype %}colMS{% endblock %}
+
+{% block content %}
+
+<div id="content-main">
+<h1>{{object}}</h1>
+<table>
+<tr><th>Domaine</th><td>{{object.processus.domaine.url|safe}}</td></tr>
+<tr><th>Processus</th><td>{{object.processus.url|safe}}</td></tr>
+<tr><th>Situation emblématique</th><td>{{object.situation|linebreaksbr}}</td></tr>
+<tr><th>Compétences visées</th><td><p>L'éducateur social, l'éducatrice sociale:</p>
+{% for c in object.competence_set.all %}- {{c.nom}} ({{c.code}})<br />
+{% if user.is_authenticated %}
+{% for sc in c.souscompetence_set.all %}&nbsp;&nbsp;&nbsp; -- {{sc.nom}} <br />{%endfor %}{% endif %}{% endfor %}</td></tr>
+<!-- <tr><th>Ressources à acquérir</th><td>{% for c in object.ressource_set.all %}- {{c}}<br />{% endfor %}</td></tr> -->
+<tr><th>Objectifs à atteindre</th><td>{% for c in object.objectif_set.all %}- {{c}}<br />{% endfor %}</td></tr>
+<tr><th>Didactique</th><td>{{ object.didactique }}</td></tr>
+<!-- <tr><th>Contenu</th><td>{{object.contenu|linebreaksbr}}</td></tr> -->
+<tr><th>Evaluation</th><td>{{object.evaluation|linebreaksbr}}</td></tr>
+<tr><th>Type</th><td>{{object.type}}, obligatoire</td></tr>
+<tr><th>Semestre</th><td>Sem. {{object.semestre}}</td></tr>
+{% if object.periode_presentiel > 0 %}
+<tr><th>Présentiel</th><td>{{object.periode_presentiel}} heures</td></tr>
+{% endif %}
+{% if object.pratique_prof > 0 %}
+<tr><th>Pratique prof.</th><td>{{object.pratique_prof}} heures</td></tr>
+{% endif %}
+{% if object.travail_perso > 0 %}
+<tr><th>Travail perso.</th><td>{{object.travail_perso}} heures</td></tr>
+{% endif %}
+<tr><th>Responsable</th><td>{{object.processus.domaine.responsable.descr|safe}}</td></tr>
+</table>
+<p><a href="{% url 'module-pdf' object.id %}">Imprimer en PDF</a></p>
+
+</div>
+{% endblock %}
+
+
diff --git a/templates/cms/processus_detail.html b/templates/cms/processus_detail.html
index abb8f71..0d37507 100644
--- a/templates/cms/processus_detail.html
+++ b/templates/cms/processus_detail.html
@@ -12,7 +12,7 @@
 <div id="content-main">
 <h1>{{object}}</h1>
 <table>
-<tr><th>Description</th><td>{{object.description}}</td></tr>
+<tr><th width="100px">Description</th><td>{{object.description}}</td></tr>
 <tr><th>Compétences visées</th><td><p>L'éducateur social, l'éducatrice sociale:</p>
 {% for m in object.module_set.all %}{% for c in  m.competences.all %}
 - {{c.libelle}} ({{c.code}})<br />{% endfor %}{% endfor %}</td></tr>