{% table_header headers %}
</tr>
</thead>
-{% spaceless %}{% for c in employes %}
+{% spaceless %}{% for c in employes.values %}
<tr class="{% cycle 'row1' 'row2' %}">
<td>{{ c.employe.id }}</td>
<td>{{ c.employe.nom }}</td>
<td>{{ c.employe.prenom }}</td>
<td>
- {% for d in c.dossiers %}
- <a href="{% url admin:rh_dossier_change d.id %}">{{ d }}</a>
- {% endfor %}
+ {% if c.dossiers|length > 1 %}
+ <ul>
+ {% for d in c.dossiers %}
+ <li><a href="{% url admin:rh_dossier_change d.id %}">{{ d }}</a></li>
+ {% endfor %}
+ </ul>
+ {% else %}
+ {% for d in c.dossiers %}
+ <a href="{% url admin:rh_dossier_change d.id %}">{{ d }}</a>
+ {% endfor %}
+ {% endif %}
</td>
</tr>
{% endfor %}{% endspaceless %}
if 'o' in request.GET:
employes_query = employes_query.order_by("%s%s" % ('-' if 'ot' in request.GET and request.GET['ot'] == "desc" else '', request.GET['o']))
- employes = []
+ employes = {}
for e in employes_query.all():
dossiers = rh.Dossier.objects.filter(employe=e). \
filter(Q(date_fin=None) | Q(date_fin__gt=date.today())). \
for d in dossiers:
contrats = rh.Contrat.objects.filter(Q(dossier=d) & Q(date_fin__lt=date.today())).all()
if contrats:
- employes.append({'employe': e, 'dossiers': dossiers})
+ if e.id not in employes:
+ employes[e.id] = {'employe': e, 'dossiers': set([d])}
+ else:
+ employes[e.id]['dossiers'].add(d)
headers = [
("id", u"# de l'employé"),