lib/models/trip_leg.rb in fossil-0.5.27 vs lib/models/trip_leg.rb in fossil-0.5.28

@@ -798,17 +798,15 @@
       end
     end.compact.uniq.join(' : ')
   end
 
   def leg_status
-    return "CANC" if cancel_code > 0
-    return "VERI" if verify_date > 0
-    return "FLOG" if status != 1 and flight_time_actual > 0
+    return "VERI" if verify_date > 0 or status == 1
+    return "FLOG" if flight_time_actual > 0
+    return "CANC" if cancel_code == 1 or [10,23].include? status
     case status.to_i
-      when 0 then "SCHED"
-      when 1 then "VERI"
-      when 10,23 then "CANC"
       when 21 then "MAINT"
+      when 0 then "SCHED"
       when 20 then "SCHED" #really is "RESVD"
       else status
     end
   end
 
\ No newline at end of file