version beta

templates/cms/base_site.html

@@ -2,8 +2,17 @@
 
 {% block title %}EDS{% endblock %}
 
-{% block branding %}<h1 id="site-name"><a href="{% url 'admin:index' %}">Formation EDS</a></h1>{% endblock %}
-{% block usertools %}<div id="user-tools"><a href="{% url 'admin:index' %}">Admin</a></div>{% endblock %}
+{% block branding %}<h1 id="site-name"><a href="{% url 'home' %}">Formation en Education sociale ES</a></h1>{% endblock %}
+{% block usertools %}
+<div id="user-tools">
+{% if user.is_authenticated %}
+{% block welcome-msg %}Bienvenue <strong>{% firstof user.username %}</strong>.{% endblock %}
+<a href="http://localhost:8000">Site public</a>&nbsp;&nbsp;<a href="{% url 'admin:index' %}">Admin</a>
+{% else %}
+<a href="{% url 'admin:index' %}">Admin</a>
+{% endif %}
+</div>
+{% endblock %}
 {% block nav-global %}{% endblock %}
 {% block breadcrumbs %}
 <div class="breadcrumbs">
@@ -12,7 +21,8 @@
 <li><a href="{% url 'domaine-list' %}">Domaines</a>&nbsp;&nbsp;</li>
 <li><a href="{% url 'processus-list' %}">Processus</a>&nbsp;&nbsp;</li>
 <li><a href="{% url 'module-list' %}">Modules</a>&nbsp;&nbsp;</li>
-<li><a href="#">Calendrier</a>&nbsp;&nbsp;</li>
+<li><a href="{% url 'periodes' %}">Périodes</a>&nbsp;&nbsp;</li>
+<!--  <li><a href="{% url 'pdf-view' %}">Calendrier</a>&nbsp;&nbsp;</li>-->
 {% if has_permission %}
 <li><a href="#">Calendrier</a>&nbsp;&nbsp;</li>
 {% endif %}

templates/cms/index.html

@@ -79,9 +79,9 @@
 <tr>
 	<td class="l6 d">{{D6.url|safe}}</td>
 	<td class="l6 p">{{P09.url|safe}}</td>
-	<td colspan="2" class="l6 m">{{M16_1a.url_code|safe}} - {{M16_1b.url_code|safe}} - {{M16_1c.url_code|safe}}</td>
-	<td colspan="2" class="l6 m">{{M16_2a.url_code|safe}} - {{M16_2b.url_code|safe}} - {{M16_2c.url_code|safe}}</td>
-	<td colspan="2" class="l6 m">{{M16_3a.url_code|safe}} - {{M16_3b.url_code|safe}} - {{M16_3c.url_code|safe}}</td>
+	<td colspan="2" class="l6 m">{{M16_1a.url_code|safe}} / {{M16_1b.url_code|safe}} / {{M16_1c.url_code|safe}}</td>
+	<td colspan="2" class="l6 m">{{M16_2a.url_code|safe}} / {{M16_2b.url_code|safe}} / {{M16_2c.url_code|safe}}</td>
+	<td colspan="2" class="l6 m">{{M16_3a.url_code|safe}} / {{M16_3b.url_code|safe}} / {{M16_3c.url_code|safe}}</td>
 </tr>
 <!-- Ligne 7 -->
 <tr>
@@ -97,6 +97,8 @@
 	<td colspan="6" class="l8 m">{{MACC.url_code|safe}}</td>
 </tr>
 </table>
+<br/>
+<a href="{% url 'plan-pdf' %}">Imprimer en PDF</a>
 </div>
 {% endblock %}
 

templates/cms/module_detail.html

@@ -10,13 +10,15 @@
 <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}}</td></tr>
-<tr><th>Compétences visées</th><td><p>L'éducateur social, l'éducatrice sociale</p>
-{% for c in object.competences.all %}- {{c.libelle}} ({{c.code}})<br />{% endfor %}</td></tr>
-<tr><th>Ressources</th><td>{% for c in object.ressource_set.all %}- {{c}}<br />{% endfor %}</td></tr>
-<tr><th>Objectifs</th><td>{% for c in object.objectif_set.all %}- {{c}}<br />{% endfor %}</td></tr>
-<tr><th>Contenu</th><td>{{object.contenu}}</td></tr>
-<tr><th>Evaluation</th><td>{{object.evaluation}}</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.competences.all %}- {{c.libelle}} ({{c.code}})<br />
+{% if user.is_authenticated %}
+{% for sc in c.souscompetence_set.all %}&nbsp;&nbsp;&nbsp; - {{sc.libelle}} <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>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}}</td></tr>
 <tr><th>Semestre</th><td>{{object.semestre}}</td></tr>
 {% if object.periode_presentiel > 0 %}
@@ -28,9 +30,9 @@
 {% 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}} ({{object.processus.domaine.responsable.email}})</td></tr>
+<tr><th>Responsable</th><td>{{object.processus.domaine.responsable.descr}}</td></tr>
 </table>
-
+<p><a href="{% url 'module-pdf' object.id %}">Imprimer en PDF</a></p>
 
 </div>
 {% endblock %}

templates/cms/periodes.html

@@ -1,47 +1,59 @@
 {% extends "./base_site.html" %}
 {% load i18n static %}
 
-{% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% static "admin/css/dashboard.css" %}" />
-<link rel="stylesheet" type="text/css" href="{% static "css/main.css" %}" />{% endblock %}
-
 {% block coltype %}colMS{% endblock %}
 
-{% block bodyclass %}{{ block.super }} dashboard{% endblock %}
-
-{% block breadcrumbs %}{% endblock %}
 
 {% block content %}
 
 <div id="content-main">
 <h1>Périodes de formation</h1>
 <table>
-<tr><th>Semestre 1</th><th text-align="right">{{tot1.sem1__sum}}h.</th></tr>
+<tr><th width="275px">Semestre 1</th><th text-align="right">{{tot1.sem1__sum}}h.</th><th width="275px">Semestre 2</th><th text-align="right">{{tot2.sem2__sum}}h.</th></tr>
+<tr><td colspan="2"><table>
 {% for s in sem1 %}
 <tr><td>{{s}}</td><td>{{s.sem1}} h.</td></tr>
 {% endfor %}
-<tr><th>Semestre 2</th><th text-align="right">{{tot2.sem2__sum}}h.</th></tr>
+</table>
+</td>
+<td colspan="2">
+<table>
 {% for s in sem2 %}
 <tr><td>{{s}}</td><td>{{s.sem2}} h.</td></tr>
 {% endfor %}
-<tr><th>Semestre 3</th><th text-align="right">{{tot3.sem3__sum}}h.</th></tr>
+</table>
+</td></tr>
+<tr><th>Semestre 3</th><th text-align="right">{{tot3.sem3__sum}}h.</th><th>Semestre 4</th><th text-align="right">{{tot4.sem4__sum}}h.</th> </tr>
+<tr><td colspan="2"><table>
 {% for s in sem3 %}
 <tr><td>{{s}}</td><td>{{s.sem3}} h.</td></tr>
 {% endfor %}
-<tr><th>Semestre 4</th><th text-align="right">{{tot4.sem4__sum}}h.</th></tr>
+</table></td>
+<td colspan="2"><table>
 {% for s in sem4 %}
 <tr><td>{{s}}</td><td>{{s.sem4}} h.</td></tr>
 {% endfor %}
-<tr><th>Semestre 5</th><th text-align="right">{{tot5.sem5__sum}}h.</th></tr>
+</table></td></tr>
+<tr><th>Semestre 5</th><th text-align="right">{{tot5.sem5__sum}}h.</th><th>Semestre 6</th><th text-align="right">{{tot6.sem6__sum}}h.</th></tr>
+<tr><td colspan="2"><table>
 {% for s in sem5 %}
 <tr><td>{{s}}</td><td>{{s.sem5}} h.</td></tr>
 {% endfor %}
-<tr><th>Semestre 6</th><th text-align="right">{{tot6.sem6__sum}}h.</th></tr>
+</table></td>
+<td colspan="2">
+<table>
 {% for s in sem6 %}
 <tr><td>{{s}}</td><td>{{s.sem6}} h.</td></tr>
 {% endfor %}
 </table>
-{{tot.tot__sum}}
+</td></tr>
+</table>
 
+<br/>
+Total des périodes de cours: {{tot.periode_presentiel__sum}} heures
+
+<br/><br/>
+<a href="{% url 'periodes-pdf' %}">Imprimer en PDF</a>
 </div>
 {% endblock %}
 

templates/cms/processus_detail.html

@@ -13,7 +13,7 @@
 <h1>{{object}}</h1>
 <table>
 <tr><th>Description</th><td>{{object.description}}</td></tr>
-<tr><th>Compétences visées</th><td><p>L'éducateur social, l'éducatrice sociale</p>
+<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>
 <tr><th>Domaine</th><td>{{object.domaine.url|safe}}</td></tr>