Fix distinct bug and fix display of validity

aleksis/apps/kort/forms.py

@@ -65,7 +65,7 @@ class CardIssueForm(forms.Form):
         cleaned_data["all_persons"] = Person.objects.filter(
             Q(pk__in=cleaned_data.get("persons", []))
             | Q(member_of__in=cleaned_data.get("groups", []))
-        )
+        ).distinct()
 
         if not cleaned_data["all_persons"].exists():
             raise forms.ValidationError(_("The selected groups don't have any members."))

aleksis/apps/kort/models.py

@@ -270,7 +270,7 @@ class Card(ExtensibleModel):
     @property
     def is_valid(self):
         return (
-            self.valid_until <= timezone.now().date() and not self.deactivated and self.chip_number
+            self.valid_until >= timezone.now().date() and not self.deactivated and self.chip_number
         )
 
     def deactivate(self):