added text formatting for workouts

abarnhard · Jan 11, 2015 · 42f030f · 42f030f
1 parent 1c981a0
commit 42f030f
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 3 deletions.
diff --git a/client/views/workouts/workouts.jade b/client/views/workouts/workouts.jade
@@ -52,9 +52,9 @@
                                   tbody
                                     tr(ng-repeat='exercise in set.exercises')
                                       td {{exercise.name}}
-                                      td(width='150') {{exercise.reps}} {{exercise.type}} 
-                                      td(width='150') {{exercise.weight}} lbs
-                              td {{set.rest}} Sec
+                                      td(width='150') {{formatReps(exercise.reps, exercise.type)}}
+                                      td(width='150') {{formatWeight(exercise.weight)}}
+                              td {{formatRest(set.rest)}}
                 p(ng-show='!workouts.length') Add A Workout
 
 include modals/regime_modal

diff --git a/client/views/workouts/workouts.js b/client/views/workouts/workouts.js
@@ -48,6 +48,30 @@
         });
       }
 
+    // functions to format exercise stats for display
+    $scope.formatWeight = function(lbs, verbose){
+      if(lbs === 0){
+        return verbose ? 'Body Weight' : 'BW'; // 0lbs is a body weight (bw) exercise
+      }else{
+        return lbs + ' lbs';
+      }
+    };
+    $scope.formatReps = function(reps, type){
+      // console.log(reps, type);
+      if(reps === 0){
+        return 'Till Fail';
+      }else{
+        return reps + ' ' + type[0].toUpperCase() + type.substring(1);
+      }
+    };
+    $scope.formatRest = function(rest){
+      if(rest === 0){
+        return 'None';
+      }else{
+        return rest + ' Sec';
+      }
+    };
+
       setDefaultNewWorkout();
       queryRegimes();