Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Load and show variations for an exercise

Roland Geiderd8903db8b32c
diff --git a/angular/src/app/exercise/exercise-detail/exercise-detail.component.html b/angular/src/app/exercise/exercise-detail/exercise-detail.component.html
index d45a8d90c..d3495e0e0 100644
--- a/angular/src/app/exercise/exercise-detail/exercise-detail.component.html
+++ b/angular/src/app/exercise/exercise-detail/exercise-detail.component.html
@@ -64,3 +64,10 @@
<hr>
<h5 i18n>Variants</h5>
+<div class="col-12">
+ <div class="row row-cols-4 row-cols-md-4">
+ <div *ngFor="let variation of variations" class="col mt-4">
+ <app-exercise-preview [exercise]="variation"></app-exercise-preview>
+ </div>
+ </div>
+</div>
diff --git a/angular/src/app/exercise/exercise-detail/exercise-detail.component.ts b/angular/src/app/exercise/exercise-detail/exercise-detail.component.ts
index c1d184aa3..16e9990bd 100644
--- a/angular/src/app/exercise/exercise-detail/exercise-detail.component.ts
+++ b/angular/src/app/exercise/exercise-detail/exercise-detail.component.ts
@@ -12,6 +12,7 @@ export class ExerciseDetailComponent implements OnInit{
id?: number;
exercise!: Exercise;
+ variations: Exercise[] = [];
constructor(private exerciseService: ExerciseService,
private route: ActivatedRoute) {
@@ -28,6 +29,9 @@ export class ExerciseDetailComponent implements OnInit{
if(this.id != null) {
this.exercise = await this.exerciseService.loadExerciseById(this.id);
+ for(let variation in this.exercise.variations) {
+ this.variations.push(await this.exerciseService.loadExerciseById(this.exercise.variations[variation]));
+ }
}
}
}
diff --git a/angular/src/app/exercise/exercise-preview/exercise-preview.component.css b/angular/src/app/exercise/exercise-preview/exercise-preview.component.css
index e69de29bb..99152c0fa 100644
--- a/angular/src/app/exercise/exercise-preview/exercise-preview.component.css
+++ b/angular/src/app/exercise/exercise-preview/exercise-preview.component.css
@@ -0,0 +1,24 @@
+/*
+ * https://stackoverflow.com/questions/47479477/responsive-card-image-with-fixed-height-in-bootstrap-4
+ */
+
+.wrapper {
+ position: relative;
+ overflow: hidden;
+}
+
+.wrapper:after {
+ content: '';
+ display: block;
+ padding-top: 100%;
+}
+
+.wrapper img {
+ width: auto;
+ height: 100%;
+ max-width: none;
+ position: absolute;
+ left: 50%;
+ top: 0;
+ transform: translateX(-50%);
+}
diff --git a/angular/src/app/exercise/exercise-preview/exercise-preview.component.html b/angular/src/app/exercise/exercise-preview/exercise-preview.component.html
index aded3e275..3eff56454 100644
--- a/angular/src/app/exercise/exercise-preview/exercise-preview.component.html
+++ b/angular/src/app/exercise/exercise-preview/exercise-preview.component.html
@@ -1,12 +1,14 @@
<div class="card h-100">
- <span class="position-absolute badge badge-dark" style="left: -1em; top: 1em;">
+ <span class="position-absolute badge badge-dark" style="left: -1em; top: 1em; z-index: 2;">
{{exercise.category}}
</span>
<a routerLink="/de/exercise/{{exercise.id}}/view/">
+ <div class="wrapper">
<img
class="card-img-top p-2"
[src]="exercise.mainImage(true)!.url"
alt="">
+ </div>
</a>
<div class="card-body">
diff --git a/angular/src/app/exercise/exercise.service.ts b/angular/src/app/exercise/exercise.service.ts
index e902b4adb..3720aa3a0 100644
--- a/angular/src/app/exercise/exercise.service.ts
+++ b/angular/src/app/exercise/exercise.service.ts
@@ -91,6 +91,9 @@ export class ExerciseService {
exercise.comments.push(this.commentAdapter.fromJson(commentData));
}
+ // Variations
+ exercise.variations = exerciseData.variations;
+
return exercise;
}
diff --git a/angular/src/app/exercise/models/exercise.model.ts b/angular/src/app/exercise/models/exercise.model.ts
index f001361c7..c18c35269 100644
--- a/angular/src/app/exercise/models/exercise.model.ts
+++ b/angular/src/app/exercise/models/exercise.model.ts
@@ -37,7 +37,7 @@ export class Exercise {
comments: Comment[] = [];
license: number;
licenseAuthor: string;
- variations: number[];
+ variations: number[] = [];
constructor(public id: number,
public uuid: string,