Transformé le formulaire de financement en un formulaire AJAX

diff --git a/project/dae/templates/dae/financement-full.html b/project/dae/templates/dae/financement-full.html
new file mode 100644 (file)
index 0000000..132dc93
--- /dev/null
+++ b/project/dae/templates/dae/financement-full.html
@@ -0,0 +1,9 @@
+{% extends 'base.html' %}
+
+{% block title %}
+  Formulaire financement
+{% endblock %}
+
+{% block main %}
+  {% include 'dae/financement.html' %}
+{% endblock %}

diff --git a/project/dae/templates/dae/financement.html b/project/dae/templates/dae/financement.html
index 158e307..06d3ed7 100644 (file)
--- a/project/dae/templates/dae/financement.html
+++ b/project/dae/templates/dae/financement.html
@@ -1,19 +1,11 @@
-{% extends 'base.html' %}
+<h2>Financement</h2>
 
-{% block title %}
-  Formulaire financement
-{% endblock %}
-
-{% block main %}
-  <h2>Financement</h2>
-
-  <form action="" method="post">
-    <table cellspacing="0">
-      {{ form.as_table }}
-    </table>
-    <input type="submit" name="save" value="Sauvegarder" />
-    {% if not new %}
-      <input type="submit" name="delete" value="Supprimer" />
-    {% endif %}
-  </form>
-{% endblock %}
+<form action="{% url financement poste_key financement_id %}" method="post">
+  <table cellspacing="0" width="100%">
+    {{ form.as_table }}
+  </table>
+  <input type="submit" name="save" value="Sauvegarder" />
+  {% if not new %}
+    <input type="submit" name="delete" value="Supprimer" />
+  {% endif %}
+</form>

diff --git a/project/dae/templates/dae/poste.html b/project/dae/templates/dae/poste.html
index 8648787..4784db9 100644 (file)
--- a/project/dae/templates/dae/poste.html
+++ b/project/dae/templates/dae/poste.html
@@ -1,8 +1,12 @@
 {% extends 'base.html' %}
 
 {% block extrahead %}
-  <script type="text/javascript"
-          src="{{ MEDIA_URL }}js/jquery-1.5.1.min.js"></script>
+  <script src="{{ MEDIA_URL }}js/jquery-1.5.1.min.js"
+          type="text/javascript"></script>
+  <script src="{{ MEDIA_URL }}js/jquery-ui-1.8.11.custom.min.js"
+          type="text/javascript"></script>
+  <link href="{{ MEDIA_URL }}/css/redmond/jquery-ui-1.8.11.custom.css"
+        rel="stylesheet" />
 {% endblock %}
 
 {% block title %}
@@ -25,15 +29,9 @@
     <input type="submit" name="save" value="Sauvegarder" />
   </form>
 
-  <script type="text/javascript">
-    $('#id_poste').change(function() {
-        window.location = '{% url poste %}/' + $(this).val();
-    });
-  </script>
-
   <h2>Financement</h2>
 
-  <table cellspacing="0">
+  <table cellspacing="0" id="financing">
     <tr>
       <th>Type</th>
       <th>Montant</th>
@@ -65,8 +63,25 @@
     {% endfor %}
   </table>
   {% if not new %}
-    <a href="{% url financement poste_key %}">
+    <a href="{% url financement poste_key %}" class="new">
       Ajouter une source de financement
     </a>
   {% endif %}
+
+  <div id="financing-form"></div>
+
+  <script type="text/javascript">
+    $('#id_poste').change(function() {
+        window.location = '{% url poste %}/' + $(this).val();
+    });
+    $('#financing a, a.new').click(function() {
+        $('#financing-form').load($(this).attr('href') + '?ajax=1')
+                            .dialog({
+                                modal: true,
+                                height: 460,
+                                width: 500
+                            });
+        return false;
+    });
+  </script>
 {% endblock %}

diff --git a/project/dae/views.py b/project/dae/views.py
index 93efeeb..d5ea303 100644 (file)
--- a/project/dae/views.py
+++ b/project/dae/views.py
@@ -62,11 +62,13 @@ def financement(request, key=None, id=None):
 
     if key:
         type, poste_id = key.split('-')
+        vars['poste_key'] = key
         if type == 'dae':
             poste = get_object_or_404(dae.Poste, pk=poste_id)
             if id:
                 # Financement existant
                 financement = get_object_or_404(dae.PosteFinancement, pk=id)
+                vars['financement_id'] = id
             else:
                 # Nouveau financement
                 financement = dae.PosteFinancement(poste_id=poste_id)
@@ -87,5 +89,8 @@ def financement(request, key=None, id=None):
 
     vars.update(dict(form=form, financement=financement))
 
-    return render_to_response('dae/financement.html', vars,
-                              RequestContext(request))
+    if 'ajax' in request.GET:
+        template = 'dae/financement.html'
+    else:
+        template = 'dae/financement-full.html'
+    return render_to_response(template, vars, RequestContext(request))