Revert "Changing all scheduled times to minutes for testing."

This reverts commit bf12825.

app/models/fixed_schedule.rb

@@ -6,8 +6,7 @@ def sort_messages
   end
 
   def expected_delivery_time message, subscriber
-    # subscriber.reference_time + message.offset.send(self.timescale.to_sym) toDo: rollback this before commit
-    subscriber.reference_time + message.offset.minutes
+    subscriber.reference_time + message.offset.send(self.timescale.to_sym)
   end
 
   protected

app/models/message.rb

@@ -23,8 +23,7 @@ def enqueue_dj_messages
         if last_job.nil?
           expected_delivery_time = Time.now.utc # TODO should snap no subscription_time 
         else
-          # expected_delivery_time = last_job.run_at + 1.send(schedule.timescale.to_sym) toDo: rollback this before commit
-          expected_delivery_time = last_job.run_at + 1.minute
+          expected_delivery_time = last_job.run_at + 1.send(schedule.timescale.to_sym)
         end
       end
 

app/models/random_schedule.rb

@@ -13,8 +13,7 @@ def reminders
 
   def enqueue_reminder message, index, recipient
     #this doesn't actually send once a day...
-    # schedule_message message, recipient, index.send(self.timescale.to_sym).from_now toDo: rollback this before commit
-    schedule_message message, recipient, index.minutes.from_now
+    schedule_message message, recipient, index.send(self.timescale.to_sym).from_now
   end
 
   def self.mode_in_words

app/models/subscriber.rb

@@ -45,8 +45,7 @@ def self.modify_subscription_according_to params
   end
 
   def reference_time
-    # self.subscribed_at - self.offset.send(self.schedule.timescale.to_sym) toDo: rollback this before commit
-    self.subscribed_at - self.offset.minutes
+    self.subscribed_at - self.offset.send(self.schedule.timescale.to_sym)
   end
 
   def can_receive_message