Commit 2fc6e39
Changed files (3)
app
models
views
training_sessions
spec
app/models/training_session.rb
@@ -11,16 +11,15 @@ class TrainingSession < ActiveRecord::Base
workout.exercise_workouts.each_with_index do |exercise_workout, index|
exercise_row = workout_row.exercises[index]
+ sets = []
+ 1.upto(exercise_workout.sets+1).each do |n|
+ sets.push(exercise_row["set#{n}"].to_i > 0 ? exercise_row["set#{n}"] : 0)
+ end
+
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,
- exercise_row['set2'].to_i > 0 ? exercise_row['set2'] : 0,
- exercise_row['set3'].to_i > 0 ? exercise_row['set3'] : 0,
- exercise_row['set4'].to_i > 0 ? exercise_row['set4'] : 0,
- exercise_row['set5'].to_i > 0 ? exercise_row['set5'] : 0,
- ]
+ sets: sets
)
end
session
app/views/training_sessions/_training_session.html.erb
@@ -1,6 +1,4 @@
<div class="large-4 small-6 columns">
- <img src="http://placehold.it/1000x1000&text=Thumbnail">
-
<div class="panel">
<h5><%= training_session.workout.name %></h5>
<h6 class="subheader"><%= distance_of_time_in_words_to_now training_session.occurred_at %> ago</h6>
spec/factories.rb
@@ -7,6 +7,7 @@ FactoryGirl.define do
end
factory :training_session do
association :user
+ occurred_at { DateTime.now }
end
factory :user do
username { FFaker::Internet.user_name }