diff options
| author | mo khan <mo@mokhan.ca> | 2016-07-16 13:43:49 -0600 |
|---|---|---|
| committer | mo khan <mo@mokhan.ca> | 2016-07-16 13:43:49 -0600 |
| commit | 7efd6544d1b8364d3a58e698ef16feafe60c1d1c (patch) | |
| tree | 83792157f69f3db07fb3bd15d6adf1b0bd5673c8 /app/assets/javascripts | |
| parent | f9ae366be3be52c6d128944d7976f2cbd8a4445d (diff) | |
no rest message for warm up sets.
Diffstat (limited to 'app/assets/javascripts')
| -rw-r--r-- | app/assets/javascripts/models/set.js.coffee | 3 | ||||
| -rw-r--r-- | app/assets/javascripts/views/workout_view.js.coffee | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/app/assets/javascripts/models/set.js.coffee b/app/assets/javascripts/models/set.js.coffee index 0c87dd4..61665fd 100644 --- a/app/assets/javascripts/models/set.js.coffee +++ b/app/assets/javascripts/models/set.js.coffee @@ -12,3 +12,6 @@ class Stronglifters.Set extends Backbone.Model successful: -> @get("target_repetitions") == @get("actual_repetitions") + + workSet: -> + @get("type") == "WorkSet" diff --git a/app/assets/javascripts/views/workout_view.js.coffee b/app/assets/javascripts/views/workout_view.js.coffee index 4cccf39..35931d5 100644 --- a/app/assets/javascripts/views/workout_view.js.coffee +++ b/app/assets/javascripts/views/workout_view.js.coffee @@ -29,7 +29,10 @@ class Stronglifters.WorkoutView extends Ractive model.save() if model.successful() - message = "If it was easy break for 1:30, otherwise rest for 3:00." + if model.workSet() + message = "If it was easy break for 1:30, otherwise rest for 3:00." + else + message = "No rest for the wicked. Let's do this!" @displayMessage(message, 'success') else @displayMessage("Take a 5:00 break.", 'alert') |