trip_leg.rb in fossil-0.5.27

- old
+ new

@@ -669,16 +669,22 @@
     DateTime.from_fos_date_time(dept_date_act_gmt, time)
   end
 
   column_view   :arrival_date_gmt,      :date,  :actual_arrival_date_gmt
   column_view   :arriv_time_act_gmt,    :time,  :actual_arrival_time_gmt
-  column_def_datetime :actual_arrival_date_time_gmt, :'arrival date gmt', :'arriv time act gmt'
+  # Fixed to check if actual fields are populated, on older records these fields are not populated so we can't use them.
+  # Jade Tucker 2/08/2011
+  def actual_arrival_date_time_gmt
+    date = (arr_date_act_gmt > 0 ? arr_date_act_gmt : arrival_date_gmt)
+    DateTime.from_fos_date_time(date, arriv_time_act_gmt)
+  end
 
   def actual_land_date_time_gmt
     time = land_time_act_gmt
     time -= 60*24 if land_time_act_gmt > arriv_time_act_gmt
-    DateTime.from_fos_date_time(arrival_date_gmt, time)
+    date = (arr_date_act_gmt > 0 ? arr_date_act_gmt : arrival_date_gmt)
+    DateTime.from_fos_date_time(date, time)
   end
 
   column_view   :dept_date_act_local,   :date,  :actual_departure_date_local
   column_view   :dept_time_act_local,   :time,  :actual_departure_time_local
   column_def_datetime :actual_departure_date_time_local, :'dept date act local', :'dept time act local'
@@ -707,18 +713,18 @@
 
   column_view   :dept_date_act_home,    :date,  :actual_departure_date_base
   column_view   :depart_time_act_home,  :time,  :actual_departure_time_base
   column_def_datetime :actual_departure_date_time_base_old, :'dept date act home', :'depart time act home'
   def actual_departure_date_time_base
-    (actual_departure_date_time_gmt.to_time + (home_tz_gmt_offset/10).hours).to_datetime
+    (actual_departure_date_time_gmt.to_time.utc + (home_tz_gmt_offset/10).hours).to_datetime
   end
 
   column_view   :arr_date_act_home,     :date,  :actual_arrival_date_base
   column_view   :arrival_time_act_hom,  :time,  :actual_arrival_time_base
   column_def_datetime :actual_arrival_date_time_base_old,   :'arr date act home', :'arrival time act hom'
   def actual_arrival_date_time_base
-    (actual_arrival_date_time_gmt.to_time + (home_tz_gmt_offset/10).hours).to_datetime
+    (actual_arrival_date_time_gmt.to_time.utc + (home_tz_gmt_offset/10).hours).to_datetime
   end
 
   column_view :ete,                 :time
   column_view :eft,                 :time
   column_view :flight_time_actual,  :time,  :aft_time
@@ -726,10 +732,9 @@
   column_view :t_o_time_act_gmt,    :time,  :actual_takeoff_time_gmt
   column_view :land_time_act_gmt,   :time,  :actual_land_time_gmt
   column_view :delay_1_time,        :time,  :delay_1_duration
   column_view :delay_2_time,        :time,  :delay_2_duration
   column_view :ron,                 :boolean
-
 
   # get pic or sic or purser for this trip leg. type should be :pic or :sic or :pur
   def pilot_code(type)
     crew_leg = pilot_crew(type)
     crew_leg ? crew_leg.crew : ''
\ No newline at end of file