Commit e27aed2
app/models/android/import.rb
@@ -49,7 +49,6 @@ class Android::Import
end
def training_session_for(workout_row)
- puts workout_row.date.inspect
workout = program.workouts.find_by(name: workout_row.workout)
user.begin_workout(
workout,
@@ -74,9 +73,11 @@ class Android::Import
end
def map_from(row)
+ utc_date = DateTime.parse(row[:date].to_s).utc
+ puts [row[:date].to_s, utc_date].inspect
Android::Workout.new(
id: row[:id],
- date: row[:date],
+ date: utc_date,
workout: row[:workout],
exercise_1: JSON.parse(row[:e1]),
exercise_2: JSON.parse(row[:e2]),
app/models/user.rb
@@ -29,14 +29,13 @@ class User < ActiveRecord::Base
end
def begin_workout(workout, date, body_weight)
- utc_date = date.to_datetime.utc
- matching_workouts = training_sessions.where(occurred_at: utc_date)
+ matching_workouts = training_sessions.where(occurred_at: date)
if matching_workouts.any?
matching_workouts.first
else
training_sessions.create!(
workout: workout,
- occurred_at: utc_date,
+ occurred_at: date,
body_weight: body_weight.to_f
)
end