diff --git a/changelog.md b/changelog.md index afb5332..da6f050 100644 --- a/changelog.md +++ b/changelog.md @@ -80,4 +80,5 @@ #### Fix - Card -- Deleting activities does not delete task \ No newline at end of file +- Deleting activities does not delete task +- Canceled status is not considered as "closed" in filters \ No newline at end of file diff --git a/src/Enum/StatusEnum.php b/src/Enum/StatusEnum.php index 44ed231..96629a9 100644 --- a/src/Enum/StatusEnum.php +++ b/src/Enum/StatusEnum.php @@ -45,4 +45,10 @@ self::IN_PROGRESS, self::PLANIFIED, ]; + + /** @var Status considered as closed */ + public const CLOSED_STATUS = [ + self::CLOSED, + self::CANCELED, + ]; } \ No newline at end of file diff --git a/src/Form/Activity/ActivityFilterForm.php b/src/Form/Activity/ActivityFilterForm.php index a9e075e..f736ce1 100644 --- a/src/Form/Activity/ActivityFilterForm.php +++ b/src/Form/Activity/ActivityFilterForm.php @@ -86,7 +86,7 @@ } if ($data['notClosed']) { $criteria->andWhere($criteria->expr() - ->neq('activity.status', StatusEnum::CLOSED)); + ->notIn('activity.status', StatusEnum::CLOSED_STATUS)); } // Filter dates