Merge pull request #233 from jovandeginste/fix-legacy-keys

fix: add function to get filename of workout
jovandeginste · Aug 4, 2024 · a47a8de · a47a8de
2 parents e8ce84f + cb75c02
commit a47a8de
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/pkg/database/workouts.go b/pkg/database/workouts.go
@@ -41,6 +41,14 @@ type GPXData struct {
 	Filename  string // The filename of the file
 }
 
+func (w *Workout) Filename() string {
+	if !w.HasFile() {
+		return w.Name + ".txt"
+	}
+
+	return w.GPX.Filename
+}
+
 func (w *Workout) HasFile() bool {
 	if w.GPX == nil {
 		return false

diff --git a/views/workouts/workouts_edit.html b/views/workouts/workouts_edit.html
@@ -9,7 +9,9 @@
       {{ with .workout }}
       <div class="gap-4">
         <h2 class="{{ IconFor .Type.String }}">
-          {{ .Name }} {{ with .Filename }}({{ . }}){{ end }}
+          {{ .Name }} {{ if .HasFile }}(<span class="{{ IconFor `file` }}"
+            >{{ .Filename }}</span
+          >) {{ end }}
         </h2>
       </div>
       <div class="sm:flex sm:flex-wrap">

diff --git a/views/workouts/workouts_show.html b/views/workouts/workouts_show.html
@@ -28,7 +28,9 @@
         {{ end }}
 
         <h2 class="{{ IconFor .Type.String }}">
-          {{ .Name }} {{ with .Filename }}({{ . }}){{ end }}
+          {{ .Name }} {{ if .HasFile }}(<span class="{{ IconFor `file` }}"
+            >{{ .Filename }}</span
+          >) {{ end }}
         </h2>
       </div>
       <div class="lg:flex lg:flex-wrap print:block">