diff options
| author | mo khan <mo@mokhan.ca> | 2015-05-21 22:25:34 -0600 |
|---|---|---|
| committer | mo khan <mo@mokhan.ca> | 2015-05-21 22:25:34 -0600 |
| commit | 18fcd77ed53df609bf7ba32a739b2bc03aa2d77e (patch) | |
| tree | c8470ee2d61ea39dc21e0e672d15b3ec7a2385af /app | |
| parent | b45869a764d2f86469a7dc309b003649a815378e (diff) | |
display the target weight and the number of reps completed for each set.
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/training_session.rb | 1 | ||||
| -rw-r--r-- | app/views/training_sessions/_training_session.html.erb | 12 |
2 files changed, 11 insertions, 2 deletions
diff --git a/app/models/training_session.rb b/app/models/training_session.rb index cd4b007..104548b 100644 --- a/app/models/training_session.rb +++ b/app/models/training_session.rb @@ -12,6 +12,7 @@ class TrainingSession < ActiveRecord::Base workout.exercise_workouts.each_with_index do |exercise_workout, index| exercise_row = workout_row.exercises[index] session.exercise_sessions.create!( + target_weight: exercise_row['warmup']['targetWeight'], exercise_workout: exercise_workout, sets: [ exercise_row['set1'].to_i > 0 ? exercise_row['set1'] : 0, diff --git a/app/views/training_sessions/_training_session.html.erb b/app/views/training_sessions/_training_session.html.erb index 6a3307f..54b5853 100644 --- a/app/views/training_sessions/_training_session.html.erb +++ b/app/views/training_sessions/_training_session.html.erb @@ -2,7 +2,15 @@ <img src="http://placehold.it/1000x1000&text=Thumbnail"> <div class="panel"> - <h5><%= training_session.created_at %></h5> - <h6 class="subheader"><%= distance_of_time_in_words_to_now training_session.occurred_at %></h6> + <h5><%= training_session.workout.name %></h5> + <h6 class="subheader"><%= distance_of_time_in_words_to_now training_session.occurred_at %> ago</h6> + <% training_session.exercise_sessions.each do |exercise_session| %> + <p><%= exercise_session.exercise.name %> @ <%= exercise_session.target_weight %></p> + <ul> + <% exercise_session.sets.each do |set| %> + <li><%= set %></li> + <% end %> + </ul> + <% end %> </div> </div> |