diff --git a/app/models/ruling_timer_temp.rb b/app/models/ruling_timer_temp.rb index 2b1b448..15864e9 100644 --- a/app/models/ruling_timer_temp.rb +++ b/app/models/ruling_timer_temp.rb @@ -136,6 +136,15 @@ class RulingTimerTemp end return last_work_time end + def get_first_work_time + first_work_time = self.work_times.first + if first_work_time.nil? + first_work_time = DateTime.now.utc.new_offset(self.time_offset) + else + first_work_time = convert_datetime(first_work_time).new_offset(self.time_offset) + end + return first_work_time + end def check_and_store unless self.new_record? time_now = DateTime.now.utc @@ -321,7 +330,7 @@ class RulingTimerTemp end ruling_timer_history.send("#{field_name}=",self.send(field_name)) end - ruling_timer_history.date = self.get_last_work_time.new_offset(self.time_offset).strftime("%Y/%m/%d %w") + ruling_timer_history.date = self.get_first_work_time.new_offset(self.time_offset).strftime("%Y/%m/%d %w") ruling_timer_history.user = self.user ruling_timer_history.save end