]> git.parisson.com Git - teleforma.git/commitdiff
fix previous user
authorGuillaume Pellerin <yomguy@parisson.com>
Wed, 17 Mar 2021 15:43:17 +0000 (16:43 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Wed, 17 Mar 2021 15:43:17 +0000 (16:43 +0100)
teleforma/views/crfpa.py

index 83da3cb5282cbb548fecc9cd4ed92eb8113ef6de..b30ce86b94deeb3f603fc897f7f57275b3976d48 100644 (file)
@@ -426,7 +426,16 @@ class UserXLSBook(object):
         period = Period.objects.get(name=period)
         users = User.objects.filter(first_name=first_name, last_name=last_name, email=email)
 
-        if not users:
+        student = None
+        if users:
+            for user in users:
+                students = Student.objects.filter(user=user, period=period)
+                if students:
+                    print(last_name.encode('utf8') + ' : updating')
+                    student = students[0]
+                    break
+
+        if not student:
             print(last_name.encode('utf8') + ' : creating')
             username = get_unique_username(first_name, last_name)
             user = User(first_name=first_name, last_name=last_name, email=email, username=username)
@@ -479,14 +488,6 @@ class UserXLSBook(object):
 
             student.save()
 
-        else:
-            print(last_name.encode('utf8') + ' : updating')
-            for user in users:
-                try:
-                    student = Student.objects.get(user=user, period=period)
-                except:
-                    continue
-
         i = 24
         for month in months_choices:
             amount = row[i]