diff options
Diffstat (limited to 'src/main/scala/reading/models/Filter.scala')
| -rw-r--r-- | src/main/scala/reading/models/Filter.scala | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/main/scala/reading/models/Filter.scala b/src/main/scala/reading/models/Filter.scala index c3d81c6..d14ca63 100644 --- a/src/main/scala/reading/models/Filter.scala +++ b/src/main/scala/reading/models/Filter.scala @@ -14,6 +14,7 @@ object Filter { def apply(kind: FilterKind, nonFormattedName: String): Option[Filter] = kind match { case FilterKind.Period => Period.withNameOption(nonFormattedName).map(apply[Period]) + case FilterKind.GroupedTheme => GroupedTheme.withNameOption(nonFormattedName).map(apply[GroupedTheme]) case FilterKind.Theme => Theme.withNameOption(nonFormattedName).map(apply[Theme]) case FilterKind.Genre => Genre.withNameOption(nonFormattedName).map(apply[Genre]) case FilterKind.Level => Level.withNameOption(nonFormattedName).map(apply[Level]) @@ -29,6 +30,8 @@ object Filter { def remove(fs: Seq[Filter], rf: Filter): Seq[Filter] = fs.filterNot { f => - equals(f, rf) || rf.kind == FilterKind.Grade && f.kind == FilterKind.Program + (equals(f, rf) + || rf.kind == FilterKind.Grade && f.kind == FilterKind.Program + || rf.kind == FilterKind.GroupedTheme && f.kind == FilterKind.Theme) } } |