embauches tablesorter region/impl

diff --git a/project/dae/templates/dae/embauche-header.html b/project/dae/templates/dae/embauche-header.html
new file mode 100644 (file)
index 0000000..88de33a
--- /dev/null
+++ b/project/dae/templates/dae/embauche-header.html
@@ -0,0 +1,8 @@
+<tr>
+    <th>Région</th>
+    <th>Implantation</th>
+    <th>Embauche</th>
+    <th>Personne</th>
+    <th>Date</th>
+    <th>État</th>
+</tr>

diff --git a/project/dae/templates/dae/embauche-row.html b/project/dae/templates/dae/embauche-row.html
new file mode 100644 (file)
index 0000000..7791d69
--- /dev/null
+++ b/project/dae/templates/dae/embauche-row.html
@@ -0,0 +1,8 @@
+<tr>
+    <td>{{ dossier.poste.implantation.region }}</td>
+    <td>{{ dossier.poste.implantation }}</td>
+    <td><a href="{% url embauche_consulter dossier.id %}">{{ dossier.poste.nom }}</a></td>
+    <td>{{ dossier.employe }}</td>
+    <td>{{ dossier.date_creation|date:"d-m-Y" }}</td>
+    <td>{{ dossier.get_etat_display }}</td>
+</tr>

diff --git a/project/dae/templates/dae/embauches_liste.html b/project/dae/templates/dae/embauches_liste.html
index acaa134..10dce27 100644 (file)
--- a/project/dae/templates/dae/embauches_liste.html
+++ b/project/dae/templates/dae/embauches_liste.html
@@ -1,5 +1,22 @@
 {% extends 'base.html' %}
 
+{% block extrahead %}
+    <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/tablesorter.css" media="screen"/>
+    <script type="text/javascript" src="{{ MEDIA_URL }}js/jquery-1.5.1.min.js"></script> 
+    <script type="text/javascript" src="{{ MEDIA_URL }}js/jquery.tablesorter.min.js"></script> 
+    <script>
+        $(document).ready(function() { 
+            $(".tablesorter").tablesorter({
+                dateFormat: 'uk',
+                headers: {
+                    4: {sorter: "shortDate"},
+                }
+            }
+            ); 
+        });
+    </script> 
+{% endblock %}
+
 {% block title %}RH - DAE - Embauches{% endblock %}
 {% block titre %}Ressources humaines{% endblock %}
 {% block sous_titre %}Demande d'autorisation d'engagement{% endblock %}
@@ -9,21 +26,15 @@
 
 <h2>Mes demandes à traiter</h2>
 {% if embauches_a_traiter %}
-<table>
-    <tr>
-        <th>Embauche</th>
-        <th>Service</th>
-        <th>Région</th>
-        <th>État</th>
-    </tr>
+<table class="tablesorter">
+    <thead>
+    {% include "dae/embauche-header.html" %}
+    </thead>
+<tbody>
 {% for dossier in embauches_a_traiter %}
-    <tr>
-        <td><a href="{% url embauche_consulter dossier.id %}">{{ dossier }}</a></td>
-        <td>{{ dossier.poste.service }}</td>
-        <td>{{ dossier.poste.implantation.region }}</td>
-        <td>{{ dossier.get_etat_display }}</td>
-    </tr>
+    {% include "dae/embauche-row.html" %}
 {% endfor %}
+</tbody>
 </table>
 {% else %}
     <p>Vous n'avez aucune demande à traiter.</p>
@@ -31,21 +42,15 @@
 
 <h2>Les demandes en cours</h2>
 {% if embauches_en_cours %}
-<table>
-    <tr>
-        <th>Embauche</th>
-        <th>Service</th>
-        <th>Région</th>
-        <th>État</th>
-    </tr>
+<table class="tablesorter">
+    <thead>
+    {% include "dae/embauche-header.html" %}
+    </thead>
+<tbody>
 {% for dossier in embauches_en_cours %}
-    <tr>
-        <td><a href="{% url embauche_consulter dossier.id %}">{{ dossier }}</a></td>
-        <td>{{ dossier.poste.service }}</td>
-        <td>{{ dossier.poste.implantation.region }}</td>
-        <td>{{ dossier.get_etat_display }}</td>
-    </tr>
+    {% include "dae/embauche-row.html" %}
 {% endfor %}
+</tbody>
 </table>
 {% else %}
     <p>Il n'y a aucune demande en cours.</p>
@@ -53,21 +58,15 @@
 
 <h2>Les demandes non retenues</h2>
 {% if embauches_non_retenues %}
-<table>
-    <tr>
-        <th>Embauche</th>
-        <th>Service</th>
-        <th>Région</th>
-        <th>État</th>
-    </tr>
+<table class="tablesorter">
+    <thead>
+    {% include "dae/embauche-header.html" %}
+    </thead>
+<tbody>
 {% for dossier in embauches_non_retenues %}
-    <tr>
-        <td><a href="{% url embauche_consulter dossier.id %}">{{ dossier }}</a></td>
-        <td>{{ dossier.poste.service }}</td>
-        <td>{{ dossier.poste.implantation.region }}</td>
-        <td>{{ dossier.get_etat_display }}</td>
-    </tr>
+    {% include "dae/embauche-row.html" %}
 {% endfor %}
+</tbody>
 </table>
 {% else %}
     <p>Il n'y a aucune demande non retenue.</p>