Commit 7efd654

mo khan <mo@mokhan.ca>
2016-07-16 19:43:49
no rest message for warm up sets.
1 parent f9ae366
Changed files (3)
app
assets
views
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"
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')
app/views/sets/_set.jbuilder
@@ -1,4 +1,5 @@
 json.id set.id
+json.type set.type
 json.target_weight set.target_weight.pretty_print
 json.weight_per_side set.weight_per_side
 json.target_repetitions set.target_repetitions