X-Git-Url: https://git.mdrn.pl/edumed.git/blobdiff_plain/cb238bf65280df57db6158d437853475af4f2e18..5af38e73db5ac3793f7c157f18a46b5661e9ab0e:/wtem/management/commands/wtem_assign_submissions.py

diff --git a/wtem/management/commands/wtem_assign_submissions.py b/wtem/management/commands/wtem_assign_submissions.py
index f87b7f4..afb99ca 100644
--- a/wtem/management/commands/wtem_assign_submissions.py
+++ b/wtem/management/commands/wtem_assign_submissions.py
@@ -1,24 +1,46 @@
+from optparse import make_option
+
 from django.core.management.base import BaseCommand, CommandError
 from django.db.models import Count
 from django.contrib.auth.models import User
 
 from contact.models import Contact
-from wtem.models import Submission
+from wtem.models import Submission, Attachment
 
 
 class Command(BaseCommand):
 
+    option_list = BaseCommand.option_list + (
+        make_option('--with-attachments-only',
+            action='store_true',
+            dest='attachments_only',
+            default=False,
+            help='Take into account only submissions with attachments'),
+        make_option('--without-attachments-only',
+            action='store_true',
+            dest='no_attachments_only',
+            default=False,
+            help='Take into account only submissions without attachments'),
+        )
+
     def handle(self, *args, **options):
         how_many = int(args[0])
         examiner_names = args[1:]
 
+
         users = User.objects.filter(username__in = examiner_names)
         submissions_query = Submission.objects.annotate(examiners_count = Count('examiners'))
 
         submissions = submissions_query \
-            .filter(examiners_count__lt=2)[0:how_many]
-
-        for submission in submissions:
+            .filter(examiners_count__lt=2).exclude(answers = None)
+        
+        with_attachment_ids = Attachment.objects.values_list('submission_id', flat=True).all()
+        if options['attachments_only']:
+            submissions = submissions.filter(id__in = with_attachment_ids)
+        if options['no_attachments_only']:
+            submissions = submissions.exclude(id__in = with_attachment_ids)
+
+        for submission in submissions.order_by('id')[0:how_many]:
             submission.examiners.add(*users)
             submission.save()
             self.stdout.write('added to %s:%s' % (submission.id, submission.email))