Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Add basic filtering to exercise overview page

Roland Geidera178822c637c
diff --git a/angular/src/app/exercise/exercise-list/exercise-list.component.html b/angular/src/app/exercise/exercise-list/exercise-list.component.html
index 7f1e148bb..7dc2fd33c 100644
--- a/angular/src/app/exercise/exercise-list/exercise-list.component.html
+++ b/angular/src/app/exercise/exercise-list/exercise-list.component.html
@@ -16,15 +16,26 @@
<div class="col-3">
<h5 i18n>Categories</h5>
<div class="list-group">
- <a class="list-group-item list-group-item-action active" i18n>All categories</a>
- <a *ngFor="let category of categories" class="list-group-item list-group-item-action">{{category.name}}</a>
+ <a class="list-group-item list-group-item-action"
+ (click)="setSelectedCategory(null)"
+ [ngClass]="{'active': selectedCategory === null}"
+ i18n>All categories</a>
+ <a *ngFor="let category of categories"
+ class="list-group-item list-group-item-action"
+ (click)="setSelectedCategory(category.id)"
+ [ngClass]="{'active': selectedCategory === category.id}">{{category.name}}</a>
</div>
<h5 class="mt-3" i18n>Equipment</h5>
<div class="list-group">
- <div *ngFor="let equipment of equipment" class="list-group-item">
+ <div *ngFor="let equipment of equipment" class="list-group-item" [ngClass]="{'active': selectedEquipment.indexOf(equipment.id) !== -1}">
<div class="form-check">
- <input class="form-check-input" type="checkbox" id="equipment-{{equipment.id}}">
+ <input
+ class="form-check-input"
+ type="checkbox"
+ [checked]="selectedEquipment.indexOf(equipment.id) !== -1"
+ (click)="toggleSelectedEquipment(equipment.id)"
+ id="equipment-{{equipment.id}}">
<label class="form-check-label" for="equipment-{{equipment.id}}">
{{equipment.name}}
</label>
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 7465521d7..3a6b7542f 100644
--- a/angular/src/app/exercise/exercise-list/exercise-list.component.ts
+++ b/angular/src/app/exercise/exercise-list/exercise-list.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import {Component, OnInit} from '@angular/core';
import {ExerciseService} from '../exercise.service';
import {Category} from '../models/category.model';
import {Equipment} from '../models/equipment.model';
@@ -10,10 +10,14 @@ import {Exercise} from '../models/exercise.model';
styleUrls: ['./exercise-list.component.css']
})
export class ExerciseListComponent implements OnInit {
+ allExercises: Exercise[] = [];
exercises: Exercise[] = [];
categories: Category[] = [];
equipment: Equipment[] = [];
+ selectedCategory: number | null = null;
+ selectedEquipment: number[] = [];
+
/**
Starting page for the pagination
*/
@@ -30,7 +34,8 @@ export class ExerciseListComponent implements OnInit {
*/
maxPageShown = 7;
- constructor(private exerciseService: ExerciseService) { }
+ constructor(private exerciseService: ExerciseService) {
+ }
ngOnInit(): void {
this.getExercises();
@@ -38,13 +43,54 @@ export class ExerciseListComponent implements OnInit {
this.equipment = this.exerciseService.equipment;
}
+ /*
+ * Sets the given category ID as the currently selected one
+ */
+ setSelectedCategory(id: number | null) {
+ this.selectedCategory = id;
+ this.filterExercises();
+ }
+
+ /*
+ * Adds or removes the given equipment ID from the list of selected oness
+ */
+ toggleSelectedEquipment(id: number) {
+ const index = this.selectedEquipment.indexOf(id);
+
+ if (index < 0) {
+ this.selectedEquipment.push(id);
+ } else {
+ this.selectedEquipment.splice(index, 1);
+ }
+
+ this.filterExercises();
+ }
+
+ /*
+ * Loads initial exercise list from the server
+ */
async getExercises(): Promise<void> {
this.exercises = await this.exerciseService.loadExercises();
+ this.allExercises = this.exercises.slice();
}
- async loadExercise(id: number): Promise<void> {
+ /*
+ * Filter exercises based on the current selected equipments and category
+ */
+ filterExercises() {
+ let out = this.allExercises.slice();
+
+ if (this.selectedCategory != null) {
+ out = out.filter(exercise => exercise.category.id === this.selectedCategory);
+ }
+
+ 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));
+ }
+ }
- const tmp = await this.exerciseService.getExercise(id);
- //console.log(tmp);
+ this.exercises = out;
}
}