employes_avec_dae = [d.employe_id for d in dae.Dossier.objects.all()]
employes_orphelins = dae.Employe.objects.exclude(id__in=employes_avec_dae)
- def option_label(employe):
- return "%s %s" % (employe.nom.upper(), employe.prenom.title())
-
- return [('', 'Nouvel employé')] + \
- sorted(
- [('dae-%s' % p.id, option_label(p))
- for p in dae_ | copies | employes_orphelins] +
- [('rh-%s' % p.id, option_label(p)) for p in rhv1],
- key=lambda t: t[1]
- )
+ def option_label(employe, extra=""):
+ if extra:
+ extra = " [%s]" % extra
+ return "%s %s %s" % (employe.nom.upper(), employe.prenom.title(), extra)
+
+ lbl_rh = sorted([('rh-%s' % p.id, option_label(p, "existant dans rh")) for p in rhv1],
+ key=lambda t: t[1])
+ lbl_dae = sorted([('dae-%s' % p.id, option_label(p)) for p in dae_ | copies | employes_orphelins],
+ key=lambda t: t[1])
+ return [('', 'Nouvel employé')] + lbl_rh + lbl_dae
def label_poste_display(poste):