Juries are volunteers

apps/participation/forms.py

@@ -244,9 +244,10 @@ class UploadNotesForm(forms.Form):
 
             first_name, last_name = tuple(name.split(' ', 1))
 
-            jury = User.objects.filter(first_name=first_name, last_name=last_name)
+            jury = User.objects.filter(first_name=first_name, last_name=last_name,
+                                       registration__volunteerregistration__isnull=False)
             if jury.count() != 1:
-                self.form.add_error('file', _("The following user was not found:") + " " + name)
+                self.add_error('file', _("The following user was not found:") + " " + name)
                 continue
             jury = jury.get()
 

apps/participation/views.py

@@ -730,7 +730,7 @@ class PoolUploadNotesView(VolunteerMixin, FormView, DetailView):
                 form.add_error('file', _("The following user is not registered as a jury:") + " " + str(vr))
 
             for i, passage in enumerate(pool.passages.all()):
-                note = Note.objects.get(jury=vr, passage=passage)
+                note = Note.objects.get_or_create(jury=vr, passage=passage)[0]
                 passage_notes = notes[6 * i:6 * (i + 1)]
                 note.set_all(*passage_notes)
                 note.save()