Commit cb9987e

mo khan <mo@mokhan.ca>
2016-06-07 03:29:29
add back button and make done button look nicer.
1 parent 25a2811
Changed files (4)
app
assets
javascripts
views
config
locales
app/assets/javascripts/templates/training_session_view.ractive
@@ -21,14 +21,16 @@
     {{else}}
       <div class="row">
         <div class="small-12 columns">
-        {{#each reps}}
-          <button on-click="updateProgress" class="button small round {{status}}">{{completed}}</button>
-        {{/each}}
+          <p class="text-center">
+            {{#each reps}}
+              <button on-click="updateProgress" class="button small round {{status}}">{{completed}}</button>
+            {{/each}}
+          </p>
         </div>
       </div>
       <div class="row">
         <div class="small-12 columns">
-          <button on-click="completeExercise">Done</button>
+          <button on-click="completeExercise" class="button expand">Done</button>
         </div>
       </div>
     {{/if}}
app/views/training_sessions/_training_session.jbuilder
@@ -6,7 +6,7 @@ json.exercises training_session.workout.exercise_workouts do |exercise|
   json.name exercise.name
   json.sets exercise.sets
   json.repetitions exercise.repetitions
-  json.reps training_session.progress_for(exercise.exercise).sets do |completed_reps|
+  json.reps training_session.progress_for(exercise.exercise).try(:sets) || exercise.sets.times.map { |x| 0 } do |completed_reps|
     json.target exercise.repetitions
     json.completed completed_reps.to_i
   end
app/views/training_sessions/edit.html.erb
@@ -1,7 +1,7 @@
 <div class="row">
   <div class="large-12 columns">
-    <div id="training-session-view">
-    </div>
+    <div id="training-session-view"></div>
+    <%= link_to t(:back_html), training_sessions_path %>
   </div>
 </div>
 
config/locales/en.yml
@@ -40,6 +40,7 @@ en:
     formats:
       short: "%a, %d %b %Y"
   add: Add
+  back_html: '&laquo Back'
   save: Save
   search: Search
   layouts: