|
|
|
@ -65,8 +65,8 @@ open class Filter : RealmObject() { |
|
|
|
private set |
|
|
|
private set |
|
|
|
|
|
|
|
|
|
|
|
fun createOrUpdateFilterConditions(filterConditionRows: ArrayList<FilterElementRow>) { |
|
|
|
fun createOrUpdateFilterConditions(filterConditionRows: ArrayList<FilterElementRow>) { |
|
|
|
filterConditions.clear() |
|
|
|
val casted = arrayListOf<FilterElementRow>() |
|
|
|
filterConditionRows |
|
|
|
filterConditionRows |
|
|
|
.map { |
|
|
|
.map { |
|
|
|
it.filterName |
|
|
|
it.filterName |
|
|
|
} |
|
|
|
} |
|
|
|
@ -77,10 +77,14 @@ open class Filter : RealmObject() { |
|
|
|
it.filterName == filterName |
|
|
|
it.filterName == filterName |
|
|
|
} |
|
|
|
} |
|
|
|
.apply { |
|
|
|
.apply { |
|
|
|
val casted = arrayListOf<FilterElementRow>() |
|
|
|
|
|
|
|
casted.addAll(this) |
|
|
|
casted.addAll(this) |
|
|
|
filterConditions.add(FilterCondition(casted)) |
|
|
|
val newFilterCondition = FilterCondition(casted) |
|
|
|
} |
|
|
|
val previousCondition = filterConditions.filter { |
|
|
|
|
|
|
|
it.sectionName == newFilterCondition.filterName |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
filterConditions.removeAll(previousCondition) |
|
|
|
|
|
|
|
filterConditions.add(newFilterCondition) |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|