Commit 4775ea8

mo khan <mo@mokhan.ca>
2015-06-09 03:23:35
use the users preferred timezone to parse the android dates.
1 parent 398f83e
Changed files (2)
app
models
app/models/android/import.rb
@@ -73,7 +73,8 @@ class Android::Import
   end
 
   def map_from(row)
-    utc_date = DateTime.parse(row[:date].to_s).utc
+    #utc_date = DateTime.parse(row[:date].to_s).utc
+    utc_date = user.timezone.local_to_utc(row[:date])
     puts [row[:date].to_s, utc_date].inspect
     Android::Workout.new(
       id: row[:id],
app/models/user.rb
@@ -8,6 +8,10 @@ class User < ActiveRecord::Base
   validates :email, presence: true, email: true, uniqueness: true
   validates_acceptance_of :terms_and_conditions
 
+  def timezone
+    TZInfo::Timezone.get('Canada/Mountain')
+  end
+
   def gravatar_id
     Digest::MD5::hexdigest(email.downcase)
   end