Chercheurs edition

diff --git a/auf_savoirs_en_partage/chercheurs/views.py b/auf_savoirs_en_partage/chercheurs/views.py
index e8047cc..66af106 100644 (file)
--- a/auf_savoirs_en_partage/chercheurs/views.py
+++ b/auf_savoirs_en_partage/chercheurs/views.py
@@ -123,13 +123,47 @@ def edit(request):
     context_instance = RequestContext(request)
     chercheur = context_instance['user_chercheur']    
     if request.method == 'POST':
-        personne_form = PersonneEditForm(request.POST, prefix="personne", instance=chercheur.personne)  
-        personne_form.save()
+        personne_form = PersonneEditForm(request.POST, prefix="personne", instance=chercheur.personne)
+        chercheur_form = ChercheurForm (request.POST, prefix="chercheur", instance=chercheur)
+        etablissement_form = EtablissementForm(request.POST, prefix="etablissement", instance=chercheur)
+        etablissement_autre_form = EtablissementAutreForm(request.POST, prefix="etablissement_autre", instance=chercheur)
+        discipline_form = DisciplineForm(request.POST, prefix="discipline", instance=chercheur)
+        publication1_form = PublicationForm(request.POST, prefix="publication1", instance=chercheur.publication1)
+        publication2_form = PublicationForm(request.POST, prefix="publication2", instance=chercheur.publication2) 
+        publication3_form = PublicationForm(request.POST, prefix="publication3", instance=chercheur.publication3) 
+        publication4_form = PublicationForm(request.POST, prefix="publication4", instance=chercheur.publication4)
+        
+
+        if( personne_form.is_valid() and discipline_form.is_valid() and publication1_form.is_valid() and publication2_form.is_valid() and publication3_form.is_valid() and publication4_form.is_valid() and chercheur_form.is_valid() ):
+            personne_form.save()
+            chercheur_form.save()
+            discipline_form.save()
+            publication1_form.save()
+            publication2_form.save()
+            publication3_form.save()
+            publication4_form.save()
     else:
-        personne_form = PersonneEditForm(prefix="personne", instance=chercheur.personne)        
+        personne_form = PersonneEditForm(prefix="personne", instance=chercheur.personne) 
+        chercheur_form = ChercheurForm (prefix="chercheur", instance=chercheur)
+        etablissement_form = EtablissementForm(prefix="etablissement", instance=chercheur)
+        etablissement_autre_form = EtablissementAutreForm(prefix="etablissement_autre", instance=chercheur)
+        discipline_form = DisciplineForm(prefix="discipline", instance=chercheur)
+        publication1_form = PublicationForm(prefix="publication1", instance=chercheur.publication1)
+        publication2_form = PublicationForm(prefix="publication2", instance=chercheur.publication2) 
+        publication3_form = PublicationForm(prefix="publication3", instance=chercheur.publication3) 
+        publication4_form = PublicationForm(prefix="publication4", instance=chercheur.publication4)    
+    #import pdb; pdb.set_trace()    
         
     variables = { 'chercheur': chercheur,
                   'personne_form':personne_form,
+                  'chercheur_form': chercheur_form,
+                  'etablissement_form': etablissement_form,
+                  'discipline_form': discipline_form,
+                  'etablissement_autre_form': etablissement_autre_form,
+                  'publication1_form': publication1_form,
+                  'publication2_form': publication2_form,
+                  'publication3_form': publication3_form,
+                  'publication4_form': publication4_form,
                 }
     return render_to_response ("chercheurs/edit.html", \
             Context (variables), 

diff --git a/auf_savoirs_en_partage/templates/chercheurs/edit.html b/auf_savoirs_en_partage/templates/chercheurs/edit.html
index d17d6b9..6f50ff6 100644 (file)
--- a/auf_savoirs_en_partage/templates/chercheurs/edit.html
+++ b/auf_savoirs_en_partage/templates/chercheurs/edit.html
@@ -6,10 +6,89 @@
 <div class="contenu-wrapper">
 
 <form method="post">
-    <h5>Informations personnelles</h5>
-    {% with personne_form as form %}
-        {% include "table_form.html" %}
-    {% endwith %}
+    <fieldset>
+        <legend>Informations personnelles</legend>
+        {% with personne_form as form %}
+            {% include "table_form.html" %}
+        {% endwith %}
+    </fieldset>
+    
+    <fieldset>
+        <legend>Informations académiques</legend>
+        {% with chercheur_form as form %}
+            {% include "table_form.html" %}
+        {% endwith %}
+    </fieldset>
+    
+    <fieldset>
+        <legend>Etablissement de rattachement</legend>
+        {% with etablissement_form as form %}
+            {% include "table_form.html" %}
+        {% endwith %}
+        <p>Si l'établissement n'existe pas ci-dessus</p>
+        {% with etablissement_autre_form as form %}
+            {% include "table_form.html" %}
+        {% endwith %}
+    </fieldset>
+    
+    <fieldset>
+        <legend>Champ disciplinaire, thèmes de recherche</legend>
+        {% with discipline_form as form %}
+            {% include "table_form.html" %}
+        {% endwith %}
+    </fieldset>
+
+    <fieldset>
+        <legend>Publications</legend>
+        <div>
+            <div class="infotip">
+              <strong>Renseignements préalablements enregistrés</strong>
+              <p>{{publication1_form.instance.publication_affichage}}</p>
+            </div>
+            <div class="publication">
+              {% with publication1_form as form %}
+                  {% include "table_form.html" %}
+              {% endwith %}
+            </div>
+            <div style="clear:both"></div>
+        </div>
+        <p id="show_publications">+ Autres publications</p>
+        <div class="publications_autre">
+            <h6>- Publication 2</h6>
+            <div class="infotip">
+              <strong>Renseignements préalablements enregistrés</strong>
+              <p>{{publication2_form.instance.publication_affichage}}</p>
+            </div>
+            <div class="publication">
+                {% with publication2_form as form %}
+                    {% include "table_form.html" %}
+                {% endwith %} 
+            </div>
+            <div style="clear:both"></div>
+            <h6>- Publication 3</h6>
+            <div class="infotip">
+              <strong>Renseignements préalablements enregistrés</strong>
+              <p>{{publication3_form.instance.publication_affichage}}</p>
+            </div>
+            <div class="publication">
+                {% with publication3_form as form %}
+                    {% include "table_form.html" %}
+                {% endwith %}
+            </div>
+            <div style="clear:both"></div>     
+            <h6>- Publication 4</h6>
+            <div class="infotip">
+              <strong>Renseignements préalablements enregistrés</strong>
+              <p>{{publication4_form.instance.publication_affichage}}</p>
+            </div>
+            <div class="publication">
+                {% with publication4_form as form %}
+                    {% include "table_form.html" %}
+                {% endwith %}
+            </div>
+            <div style="clear:both"></div>
+        </div>
+    </fieldset>
 
     <input type="submit" name="Submit" value="Éditer" class="bouton" />
 </form>

diff --git a/auf_savoirs_en_partage/templates/chercheurs/inscription.html b/auf_savoirs_en_partage/templates/chercheurs/inscription.html
index 3b8f9e0..58322b1 100644 (file)
--- a/auf_savoirs_en_partage/templates/chercheurs/inscription.html
+++ b/auf_savoirs_en_partage/templates/chercheurs/inscription.html
@@ -41,10 +41,6 @@
     <fieldset>
         <legend>Publications</legend>
         <div>
-            <!--<div class="infotip">
-              <strong>Renseignements préalablements enregistrés</strong>
-              <p>{{publication1_form.publication1.publication_affichage}}</p>
-            </div>-->
             <div class="publication">
               {% with publication1_form as form %}
                   {% include "table_form.html" %}

diff --git a/auf_savoirs_en_partage/templates/savoirs/index.html b/auf_savoirs_en_partage/templates/savoirs/index.html
index 77a38d8..3f4341d 100644 (file)
--- a/auf_savoirs_en_partage/templates/savoirs/index.html
+++ b/auf_savoirs_en_partage/templates/savoirs/index.html
@@ -35,7 +35,7 @@
         {% for chercheur in chercheurs %}
             <li class="clearfix">
             <a href="{% url chercheurs.views.retrieve chercheur.id %}" class="le-titre">{{ chercheur }}</a>
-            <span class="la-date">Disciplines : {{ chercheur.discipline }}</span>
+            {% if chercheurs.disciplines %}<span class="la-date">Disciplines : {{ chercheur.discipline }}</span>{% endif %}
             </li>
         {% endfor %}
         </ul>
@@ -75,7 +75,7 @@
             <li class="clearfix">
             <a href="{% url sitotheque.views.retrieve site.id %}" class="le-titre">{{ site }}</a>
             <a href="{{ site.url }}" class="le-titre">{{ site.url }}</a>
-            <span class="la-date">Disciplines : {{ site.discipline.all|join:", " }}</span>
+            {% if site.discipline.all.count %}<span class="la-date">Disciplines : {{ site.discipline.all|join:", " }}</span>{% endif %}
             </li>
         {% endfor %}
         </ul>