Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Sort equipment by OR, this makes more sense

Roland Geiderfbdde182b3cb
diff --git a/angular/src/app/exercise/exercise-list/exercise-list.component.ts b/angular/src/app/exercise/exercise-list/exercise-list.component.ts
index 3a6b7542f..9530d88d4 100644
--- a/angular/src/app/exercise/exercise-list/exercise-list.component.ts
+++ b/angular/src/app/exercise/exercise-list/exercise-list.component.ts
@@ -85,10 +85,9 @@ export class ExerciseListComponent implements OnInit {
}
if (this.selectedEquipment.length > 0) {
- console.log('aaaaaaa');
- for (let id of this.selectedEquipment) {
- out = out.filter(exercise => exercise.equipment.find(equipment => equipment.id === id));
- }
+ out = out.filter(exercise => exercise.equipment.findIndex(equipment =>
+ this.selectedEquipment.indexOf(equipment.id) !== -1
+ ) !== -1);
}
this.exercises = out;