reworked filters in jobs list view

[qcg-portal.git] / qcg / forms.py

diff --git a/qcg/forms.py b/qcg/forms.py
index 3d90145..d9d7a92 100644 (file)
--- a/qcg/forms.py
+++ b/qcg/forms.py
@@ -26,6 +26,8 @@ class FiltersForm(forms.Form):
 
     STATUS_MAP = {
         ACTIVE: (
+            Task.STATUS_CHOICES_REVERSED[TaskStatus.UNSUBMITTED],
+            Task.STATUS_CHOICES_REVERSED[TaskStatus.UNCOMMITTED],
             Task.STATUS_CHOICES_REVERSED[TaskStatus.QUEUED],
             Task.STATUS_CHOICES_REVERSED[TaskStatus.PREPROCESSING],
             Task.STATUS_CHOICES_REVERSED[TaskStatus.PENDING],
@@ -35,14 +37,13 @@ class FiltersForm(forms.Form):
         ),
         FINISHED: (
             Task.STATUS_CHOICES_REVERSED[TaskStatus.FINISHED],
-            Task.STATUS_CHOICES_REVERSED[TaskStatus.FAILED],
-            Task.STATUS_CHOICES_REVERSED[TaskStatus.CANCELED],
         ),
         FAILED: (
             Task.STATUS_CHOICES_REVERSED[TaskStatus.FAILED],
             Task.STATUS_CHOICES_REVERSED[TaskStatus.CANCELED],
         ),
     }
+    STATUS_CHOICES_DICT = dict(STATUS_CHOICES)
 
     status = forms.MultipleChoiceField(choices=STATUS_CHOICES, label=u"Status", required=False,
                                        widget=forms.CheckboxSelectMultiple)
@@ -51,6 +52,5 @@ class FiltersForm(forms.Form):
 
     # advanced
     keywords = forms.CharField(max_length=100, label=u"Wyszukaj frazę", required=False)
-    status_exact = forms.ChoiceField(choices=[(None, u"----------")] + Task.STATUS_CHOICES, label=u"Status", required=False)
     submission = forms.CharField(label=u"Data zlecenia", validators=[date_range_validator], required=False)
     finish = forms.CharField(label=u"Data zakończenia", validators=[date_range_validator], required=False)