diff --git a/find_individus.py b/find_individus.py index 8adc01c..d4d3ff4 100644 --- a/find_individus.py +++ b/find_individus.py @@ -43,11 +43,6 @@ for xml in root.glob('**/sts_emp*.xml'): etabs = list(set(etabs)) -def guess_uid(individu): - nom = individu[0]['nom'] - prenom = individu[0]['prenom'] - return f"{prenom.lower()}.{nom.lower()}" - if __name__ == '__main__': from argparse import ArgumentParser parser = ArgumentParser() @@ -83,15 +78,15 @@ if __name__ == '__main__': for enseignant in etab_group[0][1].get('memberUid', []) if user._is_enseignant(enseignant)] members.extend(enseignants) - members = sorted(list(set(members))) - result = [] - for member, ind in [(member, user.get_attr(member, 'intid')) for member in members]: - user_etabs = set(repartition.get(ind[0], []) + user.get_etab(member, multi_etabs=True)) - if len(user_etabs) > 1: - partial_result = (member, ind[0], *sorted(user_etabs)) - result.append(partial_result) - result.sort(key=lambda x: x[2:]) - result = [f"{el[0]}\t\t{el[1]}\t{' '.join(el[2:])}" for el in result] + members = sorted(list(set(members))) + result = [] + for member, ind in [(member, user.get_attr(member, 'intid')) for member in members]: + user_etabs = set(repartition.get(ind[0], []) + user.get_etab(member, multi_etabs=True)) + if len(user_etabs) > 1: + partial_result = (member, ind[0], *sorted(user_etabs)) + result.append(partial_result) + result.sort(key=lambda x: x[2:]) + result = [f"{el[0]}\t\t{el[1]}\t{' '.join(el[2:])}" for el in result] else: result = [] print("\n".join(sorted(result)))