Commit 3311140
Changed files (2)
app
models
ios
spec
models
ios
app/models/ios/import.rb
@@ -15,7 +15,9 @@ class Ios::Import
db[:ZBASEWORKOUT].each do |row|
workout_name = row[:ZTYPE] == 1 ? "A" : "B"
workout = program.workouts.find_by(name: workout_name)
- occurred_at = DateTime.parse(row[:ZLOGDATE])
+ time = row[:ZDATE].to_s.split(' ')
+ date_string = "#{row[:ZLOGDATE]} #{time[1]} #{time[2]}"
+ occurred_at = DateTime.parse(date_string)
body_weight = row[:ZBODYWEIGHT].to_f
training_session = user.begin_workout(workout, occurred_at, body_weight)
spec/models/ios/import_spec.rb
@@ -52,7 +52,7 @@ describe Ios::Import do
expect(first_exercises.count).to eql(3)
expect(first_exercises.first.sets).to eql(["5", "5", "5", "5", "5"])
- expected_date = DateTime.new(2015, 05, 02)
+ expected_date = DateTime.new(2015, 05, 02, 23, 27, 05)
expect(training_session.occurred_at.to_i).to eql(expected_date.to_i)
expect(training_session.workout).to eql(workout_a)
expect(training_session.body_weight).to eql(160.0)