RubyGems - fossil - Versions diffs - 0.1.0 → 0.1.1 - Mend

fossil 0.1.0 → 0.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (14) hide show

data/VERSION CHANGED Viewed

	@@ -1 +1 @@
1	- 0.1.0
1	+ 0.1.1

data/fossil.gemspec CHANGED Viewed

@@ -5,7 +5,7 @@
 Gem::Specification.new do |s|
   s.name = %q{fossil}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Patrick Lardin, Daniel Sudol"]
@@ -16,6 +16,7 @@ Gem::Specification.new do |s|
     "Rakefile",
      "VERSION",
      "fossil.gemspec",
+     "lib/fossil.rb",
      "lib/models/ac_qualification.rb",
      "lib/models/aircraft.rb",
      "lib/models/aircraft_cost.rb",
@@ -108,6 +109,7 @@ Gem::Specification.new do |s|
      "lib/models/vendor.rb",
      "lib/models/vendor_document.rb",
      "lib/models/visa.rb",
+     "lib/number_helper.rb",
      "lib/sequel/code_group.rb",
      "lib/sequel/fos_dates.rb",
      "lib/sequel/metaprogramming.rb",

data/lib/fossil.rb ADDED Viewed

@@ -0,0 +1,46 @@
+require 'rubygems'
+begin
+  gem 'sequel', '=3.5.0'
+  p require 'sequel'
+rescue LoadError => e
+  warn 'To use Fossil you need the sequel gem:'
+  warn '$ sudo gem install sequel -v=3.5.0'
+  exit(1)
+end
+begin
+  gem 'activesupport', '=2.3.5'
+  p require 'active_support'
+rescue LoadError => e
+  p e
+  warn 'To use Fossil you need the active_support gem:'
+  warn '$ sudo gem install active_support -v=2.3.5'
+  exit(1)
+end
+files = [File.join('lib','number_helper.rb')] +
+        [File.join('lib','sequel','serializer','serializer.rb')] +
+        Dir.glob(File.join('lib','sequel','*.rb')) +
+        Dir.glob(File.join('lib','models','*.rb'))
+class MockDataset < Sequel::Dataset
+  def insert(*args); end
+  def insert_select(*args); end
+  def update(*args); end
+  def fetch_rows(sql); end
+  def quoted_identifier(c); end
+end
+class MockDatabase < Sequel::Database
+  def execute(sql, opts={}); end
+  def reset; end
+  def transaction(opts={}); end
+  def dataset; MockDataset.new(self); end
+end
+MOCK_DB = MockDatabase.new unless defined?(MOCK_DB)
+Sequel::Model.db = MOCK_DB
+files.each{|file| p file;require file}

data/lib/models/aircraft.rb CHANGED Viewed

@@ -389,9 +389,5 @@ class Aircraft < Sequel::Model(:'aircraft')
 	column_alias :key9, :'key9'
 #### END GENERATED SECTION ####
-  AIRCRAFT_TYPES_IN_USE = ['C750','CL30','PRM1']
-  def self.in_use
-    filter(~:serial_number => '', :type_id => AIRCRAFT_TYPES_IN_USE).select(:aircraft_id, :type_id, :tail_number).order(:type_id, :tail_number).all
-  end
 end

data/lib/models/airport.rb CHANGED Viewed

@@ -243,14 +243,4 @@ class Airport < Sequel::Model(:'airport')
 	column_alias :key9, :'key9'
 #### END GENERATED SECTION ####
- INFO_BY_ICAO_FIELDS =
-   [:iata, :icao, :time_zone, :city, :state, :country, :runway_length, :runway_width, :elevation,
-    :runways, :instruments, :latitude, :longitude, :clearance_frequency,
-    :ground_frequency, :tower_frequency, :atis_frequency, :awos_frequency, :awos_phone]
-  #Information about an Airport given its ICAO code
-  def self.info_by_icao(icao)
-    airport = Airport.filter(:icao => icao.upcase).select(*INFO_BY_ICAO_FIELDS).first
-    airport ? airport.fill_hash(INFO_BY_ICAO_FIELDS) : {}
-  end
 end

data/lib/models/one_cost.rb CHANGED Viewed

@@ -85,14 +85,4 @@ class OneCost < Sequel::Model(:'one cost')
 	column_alias :key1, :'key1'
 #### END GENERATED SECTION ####
-  ####### for GetAdditionalCostsDetail web service #######
-  column_view :item_total,         :precision
-  ONE_COST_FIELDS = {
-    'cost_type_value_code' => 'CostType',
-    'item_total_precision' => 'ItemTotal',
-    'quantity'             => 'Quantity'
-  }
-  ONE_COST_FIELDS.each{|k,v| alias_method v, k }
-  ####### end GetAdditionalCostsDetail web service #######
 end

data/lib/models/passenger.rb CHANGED Viewed

@@ -328,9 +328,4 @@ class Passenger < Sequel::Model(:'passengers')
 	column_alias :key9, :'key9'
 #### END GENERATED SECTION ####
-  def self.requesters
-    requesters = filter(:pax_is_a_requester=>1).select(:kid_date,:kid_time,:kid_mult,:kid_comm,:name).order(:name).all
-    requesters.each{|r| r.name= r.name.strip} # some names have white space at the beginning
-    requesters
-  end
 end

data/lib/models/quote.rb CHANGED Viewed

@@ -333,133 +333,4 @@ class Quote < Sequel::Model(:'quotes - original')
 	column_alias :unused_quote_number, :'unused quote number'
 #### END GENERATED SECTION ####
-  ######## for ipc Quote Web Service ##########
-  column_view :deadhead_flight_time, :time
-  column_view :deadhead_ft,          :time
-  column_view :deadhead_bt,          :time
-  column_view :dh_taxi,              :time
-  column_view :standby_elap_time,    :time,     :standby_elapsed_time
-  column_view :pass_flight_time,     :time
-  column_view :time_quoted,          :time
-  column_view :taxi,                 :time
-  column_view :eft,                  :time,     :estimated_flight_time
-  column_view :ete,                  :time,     :estimated_time_enroute
-  column_view :date_quoted,          :date
-  column_view :invoice_date,         :date
-  column_view :sched_date,           :date
-  column_view :federal_tax,          :precision
-  column_view :federal_tax,          :precision
-  column_view :dh_legs_cost,         :precision
-  column_view :day_trip_addon_cost,  :precision
-  column_view :pax_legs_cost,        :precision
-  column_view :layover_cost,         :precision
-  column_view :standby_cost,         :precision
-  column_view :ron_cost,             :precision
-  column_view :delta_leg_cost,       :precision
-  column_view :delta_trip_cost,      :precision
-  column_view :ac_cost_subtotal,     :precision
-  column_view :rate_percent_adjust,  :precision
-  column_view :ac_cost_total,        :precision
-  column_view :fuel_cost,            :precision
-  column_view :additional_cost,      :precision
-  column_view :total_tax,            :precision
-  column_view :quote_total_cost,     :precision
-  column_view :rate_percent,         :precision
-  column_view :equivalent_rate_cost, :precision
-  column_view :state_tax,            :precision
-  column_view :ac_rate,              :precision
-  column_view :dh_rate,              :precision
-  column_view :day_trip_addon_cost,  :precision
-  column_view :paid,                 :boolean
-  column_view :actual_times,         :boolean
-  column_view :scheduled_itinerary,  :boolean
-  column_view :approved,             :boolean
-  column_view :scheduled,            :boolean
-  column_view :invoiced,             :boolean
-  column_view :invoice_ready,        :boolean
-  column_view :pass_ft_fixed,        :boolean
-  column_view :confirmed,            :boolean
-  delegate :employee_number,   :to => :requester,  :prefix => true,      :allow_nil => true
-  delegate :terms,             :to => :requester,  :prefix => true,      :allow_nil => true
-  delegate :bill_department,   :to => :requester,  :prefix => true,      :allow_nil => true
-  delegate :bill_name,         :to => :requester,  :prefix => true,      :allow_nil => true
-  delegate :costs,             :to => :group_cost, :prefix => :one_cost, :allow_nil => true
-  delegate :company_code_value_description, :to => :aircraft,   :prefix => :aircraft,     :allow_nil => true
-  delegate :base_code_value_description,    :to => :aircraft,   :prefix => :aircraft,     :allow_nil => true
-  QUOTE_FIELD_MAP = {
-    'confirmation_number'             => 'ConfirmationNumber',
-    'requester_employee_number'       => 'ClientNumber',
-    'invoice_number'                  => 'InvoiceNumber',
-    'date_quoted_date_view_mdy_ipc'   => 'DateQuoted',
-    'quoted_trip_departure_date_view_mdy_ipc'   => 'TripDepartureDate',
-    'contact_key'                     => 'ContactKey',
-    'company_key'                     => 'CompanyKey',
-    'quoted_for_company'              => 'QuotedForCompany',
-    'requester_bill_name'             => 'CompanyBillToName',
-    'quoted_trip_arrival_date_view_mdy_ipc'   => 'TripArrivalDate',
-    'time_quoted_time_view'           => 'TimeQuoted',
-    'pax_legs_cost_precision'         => 'PaxLegsCost',
-    'pax_legs_addon'                  => 'PaxLegsAddon',
-    'dh_legs_cost_precision'          => 'DHLegsCost',
-    'dh_legs_addon'                   => 'DHLegsAddon',
-    'standby_cost_precision'          => 'StandbyCost',
-    'layover_cost_precision'          => 'LayoverCost',
-    'ron_cost_precision'              => 'RONCost',
-    'day_trip_addon_cost_precision'   => 'Day_TripAddonCost',
-    'delta_leg_cost_precision'        => 'DeltaLegCost',
-    'delta_trip_cost_precision'       => 'DeltaTripCost',
-    'ac_cost_subtotal_precision'      => 'AircraftCostSubtotal',
-    'rate_percent_adjust_precision'   => 'RatePercentAdjust',
-    'ac_cost_total_precision'         => 'AircraftCostTotal',
-    'fuel_cost_precision'             => 'FuelCost',
-    'additional_cost_precision'       => 'AdditionalCost',
-    'total_tax_precision'             => 'TotalTax',
-    'quote_total_cost_precision'      => 'QuoteTotalCost',
-    'nautical_miles'                  => 'NauticalMiles',
-    'statute_miles'                   => 'StatuteMiles',
-    'standby_elapsed_time_view'       => 'StandbyElapsedTime',
-    'estimated_flight_time_view'      => 'EstimatedFlightTime',
-    'taxi_time_view'                  => 'Taxi',
-    'estimated_time_enroute_view'     => 'EstimatedTimeEnroute',
-    'pax'                             => 'Pax',
-    'crew'                            => 'Crew',
-    'rate_percent'                    => 'RatePercent',
-    'quoted_by'                       => 'QuotedBy',
-    'aircraft_type_id'                => 'AircraftTypeID',
-    'aircraft_id'                     => 'AircraftID',
-    'confirmed_boolean_view'          => 'Confirmed',
-    'scheduled_boolean_view'          => 'Scheduled',
-    'pass_flight_time_time_view'      => 'PassFlightTime',
-    'deadhead_flight_time_time_view'  => 'DHFlightTime',
-    'equivalent_rate_cost_precision'  => 'EquivalentRateCost',
-    'invoiced_boolean_view'           => 'Invoiced',
-    'paid_boolean_view'               => 'Paid',
-    'actual_times_boolean_view'       => 'ActualTimes',
-    'scheduled_itinerary_boolean_view'=> 'ScheduledItinerary',
-    'invoice_date_date_view_mdy_ipc'  => 'InvoiceDate',
-    'approved_boolean_view'           => 'Approved',
-    'invoice_ready_boolean_view'      => 'InvoiceReady',
-    'ac_base_code_value_description'  => 'AircraftBaseCode',
-    'aircraft_company_code_value_description' => 'AircraftCompanyCode',
-    'trip_type_value_description'     => 'TripType',
-    'purpose_code'                    => 'TripPurpose',
-    'federal_tax_precision'           => 'FederalTax',
-    'state_tax_precision'             => 'StateTax',
-    'ac_rate_precision'               => 'AircraftRate',
-    'dh_rate_precision'               => 'DHRate',
-    'deadhead_ft_time_view'           => 'DHFT',
-    'deadhead_bt_time_view'           => 'DHBT',
-    'sched_date_date_view_mdy_ipc'    => 'SchedDate',
-    'dh_taxi_time_view'               => 'DHTaxi',
-    'ac_cost_rate_ft'                 => 'AircraftCostRateFt',
-  }
-  QUOTE_FIELD_MAP.each{|k,v| alias_method v, k }
-  delegate :comment,  :to => :client_invoice_comment, :prefix => true, :allow_nil => true
-  CLIENT_INVOICE_MAP = {
-    'client_invoice_comment_comment' => 'Comment' }
-  CLIENT_INVOICE_MAP.each{|k,v| alias_method v, k }
-  ######## for for Quote Web Service ##########
 end

data/lib/models/quote_leg.rb CHANGED Viewed

@@ -336,66 +336,4 @@ class QuoteLeg < Sequel::Model(:'quote legs original')
 	column_alias :column_2, :'column_2'
 #### END GENERATED SECTION ####
-  def airframe_hours
-    aircraft_hours/60
-  end
-  ######## Fields and view mapping for QuoteLeg Web Service ##########
-  column_view   :arrival_date_local,  :date,   :planned_arrival_date_local
-  column_view   :depart_date_local,   :date,   :planned_departure_date_local
-  column_view   :eta_gmt,             :time,   :planned_arrival_time_gmt
-  column_view   :etd_gmt,             :time,   :planned_departure_time_gmt
-  column_view   :eta_local,           :time,   :planned_arrival_time_local
-  column_view   :etd_local,           :time,   :planned_departure_time_local
-  column_view   :arrival_date_gmt,    :date,   :planned_arrival_date_gmt
-  column_view   :dept_date_gmt,       :date,   :planned_departure_date_gmt
-  column_view   :ete,                 :time
-  column_view   :egt,                 :time
-  column_view   :eft,                 :time
-  column_view   :taxi_time,           :time
-  column_view   :additional_time,     :time
-  column_view   :deadhead,            :boolean
-  column_view   :status,              :boolean
-  column_view   :closed,              :boolean
-  column_view   :restricted,          :boolean
-  column_view   :never_scheduled,     :boolean
-  column_view   :international_leg,   :boolean
-  QUOTE_LEGS_FIELD_MAP = {
-    'leg_number'                => 'LegNumber',
-    'aircraft_type_id'          => 'AircraftTypeID',
-    'time_zone_change'          => 'TimeZoneChange',
-    'requester_name_key'        => 'RequesterNameKey',
-    'aircraft_id'               => 'AircraftID',
-    'departure_icao'            => 'DepartureICAO',
-    'arrival_icao'              => 'ArrivalICAO',
-    'planned_departure_time_gmt_view'           => 'ETDGMT',
-    'planned_arrival_time_gmt_view'             => 'ETAGMT',
-    'planned_departure_date_gmt_view_mdy_ipc'   => 'DeptDateGMT',
-    'planned_arrival_date_gmt_view_mdy_ipc'     => 'ArrivalDateGMT',
-    'planned_departure_time_local_view'         => 'ETDLocal',
-    'planned_arrival_time_local_view'           => 'ETALocal',
-    'planned_departure_date_local_view_mdy_ipc' => 'DepartDateLocal',
-    'planned_arrival_date_local_view_mdy_ipc'   => 'ArrivalDateLocal',
-    'egt_time_view'             => 'EGT',
-    'eft_time_view'             => 'EFT',
-    'taxi_time_time_view'       => 'TaxiTime',
-    'additional_time_time_view' => 'AdditionalTime',
-    'ete_time_view'             => 'ETE',
-    'pax_count'                 => 'PaxCount',
-    'nautical_miles'            => 'NauticalMiles',
-    'statute_miles'             => 'StatuteMiles',
-    'leg_type_value_description' => 'LegTypeCode',
-    'leg_purpose_value_code'    => 'LegPurposeCode',
-    'deadhead_boolean_view'     => 'Deadhead',
-    'status_boolean_view'       => 'Status',
-	  'closed_boolean_view'       => 'IsClosed',
-		'restricted_boolean_view'   => 'Restricted',
-		'never_scheduled_boolean_view'   => 'NeverScheduled',
-		'international_leg_boolean_view' => 'InternationalLeg',
-		'regulation_code_description' => 'Regulation'
-  }
-  QUOTE_LEGS_FIELD_MAP.each{|k,v| alias_method v, k }
-  ######## end Fields and view mapping for QuoteLeg Web Service ##########
 end

data/lib/models/trip.rb CHANGED Viewed

@@ -52,9 +52,6 @@ class Trip < Sequel::Model(:'trips')
   code_association :approval_code, :'approval_code', :trip_approval
   code_association :special_qualification, :'specialqualification', :special_qualification
-  # Column views
-  column_view :kid_date, :date, :scheduled_date
 #### BEGIN GENERATED SECTION ####
 	set_primary_key [:'kid - user', :'kid - mult', :'kid - comm', :'kid - date', :'kid - time']
@@ -270,73 +267,4 @@ class Trip < Sequel::Model(:'trips')
 	column_alias :reserved_3, :'reserved 3'
 #### END GENERATED SECTION ####
-  def passenger_list
-    return '' unless passengers
-    pax_list = passengers.collect{|v| (v.lead_pax==1 ? "Lead Pax " : '' ) + v.name}.uniq!
-    pax_list ? pax_list.join(" : ") : ''
-  end
-  ##### start     trip_invoicing_report   #######
-  TRIP_INVOICING_REPORT_PATH = File.join(RAILS_ROOT,'public','system','reports')
-  TRIP_INVOICING_FILE_NAME = 'AccountsReceiveableTripInvoicing.csv'
-  TRIP_INVOICING_REPORT_FILE_PATH = File.join(TRIP_INVOICING_REPORT_PATH,TRIP_INVOICING_FILE_NAME)
-  delegate :invoice_ready, :to=> :quote, :prefix => true, :allow_nil => true
-  column_view :status,              :boolean
-  column_view :status_closed,       :boolean
-  column_view :cancel_code,         :boolean
-  column_view :arrival_date_gmt,    :date,      :planned_arrival_date_gmt
-  def quote_status
-    ( quote_invoice_ready == 1 ) ? "Ready" : "Not Ready"
-  end
-  def date_difference(to_date)
-    (to_date - planned_arrival_date_gmt).to_i
-  end
-  def trip_requester_name
-    name = trip_requester.name if trip_requester
-    name || requester_name
-  end
-  TRIP_INVOICING_HEADERS =
-    ['Date Trip Completed', 'Trip Number', 'Tail Number', 'Client', 'Trip Completed',
-     'Trip Cancelled', 'Trip Closed', 'Quote Status', 'Trip Type', "Number of Days from PCS to AR"]
-  TRIP_INVOICING_FIELDS =
-    [:planned_arrival_date_gmt_view_mdy, :trip_number, :ac_tail_number, :trip_requester_name,
-     :status_boolean_view, :cancel_code_boolean_view, :status_closed_boolean_view,
-     :quote_status, :trip_type_value_description]
-  def self.create_trip_invoicing_report(to_date)
-    from_date = to_date - 30
-    trips = trip_invoicing_report_query(from_date, to_date).sort_by{|t| t.date_difference(to_date) }
-    # write the csv file
-    FasterCSV.open(TRIP_INVOICING_REPORT_FILE_PATH, "w") do |csv|
-      csv << TRIP_INVOICING_HEADERS
-      trips.each do |trip|
-        csv << TRIP_INVOICING_FIELDS.collect{|field| trip.send(field)} + [trip.date_difference(to_date)]
-      end
-    end
-  end
-  def self.trip_invoicing_report_query(from_date, to_date)
-    unless @trip_invoicing_report_ps
-      ds = Trip.
-        filter( :arrival_date_gmt >= :$from_date).filter( :arrival_date_gmt <= :$to_date ).
-        filter( :trip_number > 0 ).
-        eager_graph(:trip_requester, :quote, :trip_type_value).
-        select_fields(
-        :self => [:trip_number, :requester_name, :arrival_date_gmt, :trip_number, :trip_type_code,
-                  :ac_tail_number, :status, :status_closed, :cancel_code],
-        :quote => [:invoice_ready],
-        :trip_type_value => [:code, :description],
-        :trip_requester => [:name])
-      @trip_invoicing_report_ps = ds.prepare(:select, :trip_invoicing_report_ps)
-    end
-    @trip_invoicing_report_ps.call(:from_date=> from_date.to_fos_days, :to_date => (to_date+1).to_fos_days)
-  end
-  ##### end     trip_invoicing_report     #######
 end

data/lib/models/trip_leg.rb CHANGED Viewed

@@ -63,95 +63,6 @@ class TripLeg < Sequel::Model(:'trip legs')
   code_association :trip_type, :'leg type code', :trip_type
   code_association :special_qualification, :'specialqualification', :special_qualification
-  # Column alias overrides
-  column_view   :dept_date_act_gmt,     :date,  :actual_departure_date_gmt
-  column_view   :dept_time_act_gmt,     :time,  :actual_departure_time_gmt
-  column_def_datetime :actual_departure_date_time_gmt, :'dept date act gmt', :'dept time act gmt'
-  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, :'arr date act gmt', :'arriv time act gmt'
-  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'
-  column_view   :arrival_date_local,    :date,  :actual_arrival_date_local
-  column_view   :arriv_time_act_local,  :time,  :actual_arrival_time_local
-  column_def_datetime :actual_arrival_date_time_local, :'arr date act local', :'arriv time act local'
-  column_view   :dept_date_gmt,         :date,  :planned_departure_date_gmt
-  column_view   :etd_gmt,               :time,  :planned_departure_time_gmt
-  column_def_datetime :planned_departure_date_time_gmt, :'dept date gmt', :'etd - gmt'
-  column_view   :depart_date_local,     :date,  :planned_departure_date_local
-  column_view   :etd_local,             :time,  :planned_departure_time_local
-  column_def_datetime :planned_departure_date_time_local, :'depart date - local', :'etd - local'
-  column_view   :arrival_date_gmt,      :date,  :planned_arrival_date_gmt
-  column_view   :eta_gmt,               :time,  :planned_arrival_time_gmt
-  column_def_datetime :planned_arrival_date_time_gmt, :'arrival date gmt', :'eta - gmt'
-  column_view   :arrival_date_local,    :date,  :planned_arrival_date_local
-  column_view   :eta_local,             :time,  :planned_arrival_time_local
-  column_def_datetime :planned_arrival_date_time_local, :'arrival date - local', :'eta - local'
-  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 + (home_tz_gmt_offset*360); 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 + (home_tz_gmt_offset*360); end
-  #Time Formatting Methods
-  column_view :ete,                 :time
-  column_view :eft,                 :time
-  column_view :flight_time_actual,  :time,  :aft_time
-  column_view :block_time_actual,   :time,  :abt_time
-  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
-  delegate :tail_number,    :to => :aircraft
-  delegate :max_pax,        :to => :aircraft
-  delegate :name,           :to => :airport_fbo,        :prefix => true, :allow_nil => true
-  delegate :name,           :to => :fueler,             :prefix => true, :allow_nil => true
-  delegate :name,           :to => :lead_passenger,     :prefix => true, :allow_nil => true
-  delegate :name,           :to => :trip_requester,     :prefix => true, :allow_nil => true
-  delegate :lead_pax,       :to => :trip
-  delegate :passenger_list, :to => :trip
-  delegate :name,           :to => :lead_pax,           :prefix => true, :allow_nil => true
-  # :'status' utility methods
-  @@Statuses = {
-    'Scheduled Flight'=>0,
-    'Leg Verified'=>1,
-    'Cancelled'=>10,
-    'Reserved'=>20,
-    'Maintenance'=>21,
-    'Available'=>22,
-    'All Legs Cancelled'=>23,
-    'Standby'=>24,
-    'Note'=>31
-  }
-  def TripLeg.get_all_statuses
-    @@Statuses
-  end
-  def TripLeg.to_leg_status_values(names)
-    names.map{ |name| @@Statuses[name] }
-  end
-  def status_name
-    @@Statuses.index(self[:status])
-  end
 #### BEGIN GENERATED SECTION ####
 	set_primary_key [:'kid - user', :'kid - mult', :'kid - comm', :'kid - date', :'kid - time']
@@ -713,437 +624,4 @@ class TripLeg < Sequel::Model(:'trip legs')
 	column_alias :key8, :'key8'
 #### END GENERATED SECTION ####
-  def client_name
-    theStatus = trip_status
-    !(theStatus=='MAINT' || theStatus=='RESVD') ? requester : ''
-  end
-  def ebt_time
-    theStatus = trip_status
-    if theStatus='SCHED' || theStatus='VERI' || (arrival_ap_prefix != departure_ap_prefix)
-      minutes_between = (planned_arrival_date_time_gmt - planned_departure_date_time_gmt)/60;
-      return Time.from_fos_time(minutes_between)
-    end
-    Time.from_fos_time(0)
-  end
-  # get pic or sic or purser for this trip leg. type should be :pic or :sic or :pur
-  def pilot_code(type)
-    return '' unless type
-    cl = crew_legs.find{|cl| cl.position_code_code == type.to_s.upcase }
-    return cl ? cl.crew : ''
-  end
-  def pic; pilot_code(:pic); end
-  def sic; pilot_code(:sic); end
-  #####  for the web service TripLegsByDate #######
-  column_view :closed,           :boolean
-  column_view :cancelled,        :boolean
-  column_view :never_scheduled,  :boolean
-  column_view :trip_request,     :boolean
-  column_view :is_deadhead?,     :boolean
-  def status_code
-    return "Cancelled" if cancel_code != 0
-    case status
-      when 0  then "Scheduled"
-      when 1  then "Leg Verified"
-      when 10 then "Cancelled"
-      when 23 then "All Legs Cancelled"
-      when 21 then "Maintenance"
-      when 20 then "Reserved"
-      else "[#{status}]"
-    end
-  end
-  TRIP_LEGS_FIELD_MAP =
-  {
-    'status_code'          => 'TripLegStatus',
-    'leg_number'           => 'leg',
-    'trip_requester_name'  => 'Requester',
-    'requester_name_key'   => 'reqnamekey',
-    'aircraft_id'          => 'AircraftID',
-    'leg_count'            => 'LegCount',
-    'departure_icao'       => 'DepartICAO',
-    'arrival_icao'         => 'ArrivalICAO',
-    'planned_departure_date_gmt_view_mdy_ipc'   => 'DepartDateZulu',
-    'planned_arrival_date_gmt_view_mdy_ipc'     => 'ArriveDateZulu',
-    'planned_departure_date_local_view_mdy_ipc' => 'DepartDateLocal',
-    'planned_arrival_date_local_view_mdy_ipc'   => 'ArriveDateLocal',
-    'planned_departure_time_gmt_view'           => 'DepartTimeZulu',
-    'planned_arrival_time_gmt_view'             => 'ArriveTimeZulu',
-    'planned_departure_time_local_view'         => 'DepartTimeLocal',
-    'planned_arrival_time_local_view'           => 'ArriveTimeLocal',
-    'pax_count'                     => 'PaxCount',
-    'is_deadhead?_boolean_view'     => 'Deadhead',
-    'status'                        => 'Status',
-    'closed_boolean_view'           => 'Closed',
-    'cancelled_boolean_view'        => 'Cancelled',
-    'cancel_code'                   => 'CancelCode',
-    'never_scheduled_boolean_view'  => 'NeverScheduled',
-    'trip_request_boolean_view'     => 'TripRequest',
-    'trip_number'          => 'TripNumber',
-    'tail_number'          => 'TailNumber',
-    'aircraft_type_id'     => 'AircraftType',
-    'fueler_name'          => 'DEPFBOName',
-    'airport_fbo_name'     => 'ARRFBOName',
-    'pic'                  => 'CrewPIC',
-    'sic'                  => 'CrewSIC',
-    'lead_pax_name'        => 'LeadPax'
-  }
-  TRIP_LEGS_FIELD_MAP.each{|k,v| alias_method v, k }
-  ##### END  for web service TripLegsByDate #######
-  subset(:live_departures,  :'trip legs__status'=>[0,1], :'trip legs__cancel_code'=>0, ~:leg_type_code=>[7, 103, 113])
-  subset(:maintenance_legs, :status=>21, :leg_type_code=>7 )
-  def self.trip_legs_by_date_range(from_date, to_date)
-    unless @trip_legs_by_date_ps
-      ds = TripLeg.
-        filter( :depart_date_key >= :$from_date).filter( :depart_date_key <= :$to_date ).
-        filter( ~:'trip legs__status'=> 31 ). # exclude comments which have status 31
-        eager_graph(:crew_legs => :position_code).eager_graph(:aircraft, :fueler, :airport_fbo, :trip_requester, :trip).
-        select_fields(
-          :self => [:trip_number, :leg_number, :arrival_icao, :departure_icao, :depart_ap_prefix,
-               :arrival_icao_iata_id, :arrival_icao, :arrival_iata, :arrival_ap_prefix, :arrival_airport_id,
-               :time_zone_change, :dept_date_gmt, :arrival_date_gmt, :depart_date_local,
-               :arrival_date_local, :ete, :etd_local, :eta_local, :etd_gmt, :eta_gmt,
-               :passengers_actual, :pax_count, :leg_count, :requester, :requester_name_key,
-               :aircraft_type_id, :leg_type_code, :trip_request, :fuel_burned, :deadhead,
-               :status, :closed, :cancelled, :cancel_code, :never_scheduled],
-          :crew_legs => [:crew, :position],
-          :crew_legs__position_code => [:code],
-          :aircraft => [:max_pax, :tail_number, :aircraft_id],
-          :fueler => [:name],
-          :airport_fbo => [:name],
-          :trip_requester => [:name],
-          :trip => [:approval_code]).
-        order(:'trip legs__trip_number',:'trip legs__leg_number')
-      @trip_legs_by_date_ps = ds.prepare(:select, :trip_legs_by_date_ps)
-    end
-    @trip_legs_by_date_ps.call(:from_date=> from_date.to_fos_days, :to_date => to_date.to_fos_days)
-  end
-  def pic_val;  pic.blank? ? "N/A" : pic; end
-  def sic_val;  sic.blank? ? "N/A" : sic; end
-  CRES_LIVE_DEPARTURES_FIELDS = [
-    :trip_number, :leg_number, :arrival_icao, :departure_icao, :time_zone_change,
-    :pax_count, :passengers_actual, :tail_number, :max_pax,
-    :pic_val, :sic_val, :requester, :ete_time_view,
-    :actual_departure_date_gmt, :planned_arrival_date_gmt,
-    :planned_departure_time_local_view, :planned_arrival_time_local_view
-  ]
-  IROPS_LIVE_DEPARTURES_FIELDS = CRES_LIVE_DEPARTURES_FIELDS.dup << :lead_pax_name
-  def self.live_departures_by_date_range(from_date, to_date)
-    unless @live_departures_by_date_ps
-      ds = TripLeg.live_departures.
-        filter( :depart_date_key >= :$from_date).filter( :depart_date_key <= :$to_date ).
-        eager_graph(:crew_legs => :position_code).eager_graph(:aircraft,:trip).
-        select_fields(
-          :self => [:trip_number, :leg_number, :arrival_icao, :departure_icao, :requester,
-                   :time_zone_change, :dept_date_gmt, :arrival_date_gmt, :depart_date_local,
-                   :arrival_date_local, :ete, :etd_local, :eta_local, :etd_gmt, :eta_gmt, :dept_date_act_gmt,
-                   :status, :closed, :cancelled, :cancel_code, :passengers_actual, :pax_count],
-          :crew_legs => [:crew, :position],
-          :crew_legs__position_code => [:code],
-          :trip => [:approval_code],  # picked just any field so i can get the primary key fields also
-          :aircraft => [:max_pax, :tail_number]).
-        order(:'trip legs__trip_number',:'trip legs__leg_number')
-      @live_departures_by_date_ps = ds.prepare(:select, :live_departures_by_date_ps)
-    end
-    @live_departures_by_date_ps.call(:from_date=> from_date.to_fos_days, :to_date => to_date.to_fos_days)
-  end
-  def self.live_departures_by_date(date)
-    live_departures_by_date_range(date, date)
-  end
-  def self.daily_report_by_date_range(from_date, to_date)
-    unless @daily_report_by_date_ps
-      ds = TripLeg.live_departures.
-        filter( :depart_date_key >= :$from_date).filter( :depart_date_key <= :$to_date ).
-        filter( :cancel_code => 0).
-        eager_graph(:crew_legs => :position_code).eager_graph(:aircraft).
-        select_fields(
-          :self => [:trip_number, :leg_number, :arrival_icao, :departure_icao, :requester,
-                   :time_zone_change, :dept_date_gmt, :arrival_date_gmt, :depart_date_local,
-                   :arrival_date_local, :ete, :etd_local, :eta_local, :etd_gmt, :eta_gmt,
-                   :status, :closed, :cancelled, :cancel_code, :passengers_actual, :pax_count],
-          :crew_legs => [:crew, :position],
-          :crew_legs__position_code => [:code],
-          :aircraft => [:max_pax, :tail_number]).
-        order(:'trip legs__trip_number',:'trip legs__leg_number')
-      @daily_report_by_date_ps = ds.prepare(:select, :daily_report_by_date_ps)
-    end
-    @daily_report_by_date_ps.call(:from_date=> from_date.to_fos_days, :to_date => to_date.to_fos_days)
-  end
-  def self.daily_report_by_date(date)
-    daily_report_by_date_range(date, date)
-  end
-  def self.scheduled_maintenance_in_date_range(from_date, to_date)
-    maintenance_leg.filter(:depart_date_key => from_date.to_fos_days..to_date.to_fos_days)
-  end
-  #####  for the trip_report query/service on crewres #######
-  # fields to return
-  TRIP_REPORT_FIELDS = [:trip_number, :leg_number,
-    :departure_icao_val, :arrival_icao_val, :aircraft_type_id, :tail_number,
-    :statute_miles, :trip_total_statute_miles, :miles, :fuel_burned,
-    :passengers_actual, :pax_count, :trip_status,
-    :planned_departure_date_local, :planned_departure_time_local_view,
-    :actual_arrival_date_local, :planned_arrival_time_local_view,
-    :actual_departure_time_gmt_view, :actual_arrival_time_gmt_view,
-    :actual_takeoff_time_gmt_view, :actual_land_time_gmt_view,
-    :eft_time, :ebt_time, :aft_time, :abt_time ]
-  def self.trip_report(from_date, to_date, hash)
-    extra_fields = hash['extra_fields'] ? hash['extra_fields'] : []
-    filters = []
-    filters << [const_get(hash['status_filter'])]                   if hash['status_filter']
-    filters << [LIMIT_AIRCRAFT_IDS, hash['aircraft_id_filter']]     if hash['aircraft_id_filter']
-    filters << [LIMIT_REPORT_REQUESTER, hash['requester_filter']]   if hash['requester_filter']
-    filters << [const_get(hash['regional_filter'])]                 if hash['regional_filter']
-    filters << [const_get(hash['icao_filter'][0]), hash['icao_filter'][1].split(',')] if hash['icao_filter']
-    # perform query and use filters ( if any ) to select trips that match
-    trip_legs = trip_report_query(from_date, to_date, extra_fields).select do |tl|
-      # all filters applied must be true, so finding one being false will deselect this trip leg
-      !filters.find{|filter, args| filter.call(tl,args) == false}
-    end
-    return trip_legs, {:methods=>(TRIP_REPORT_FIELDS + extra_fields)}
-  end
-  TRIP_REPORT_SELECT_FIELDS = { # fields to select in the query
-   :self => [:status, :cancel_code, :trip_number, :leg_number,
-     :requester_kid_date, :requester_kid_time, :requester_kid_mult, :requester_kid_comm,
-     :arrival_icao, :departure_icao, :depart_ap_prefix, :depart_airport_id, :aircraft_type_id,
-     :arrival_ap_prefix, :arrival_airport_id, :arrival_iata, :departure_iata,
-     :statute_miles, :fuel_burned, :regulation, :leg_type_code, :passengers_actual, :pax_count,
-     :dept_date_gmt, :dept_time_act_gmt, :arrival_date_gmt, :depart_date_local, :arriv_time_act_gmt,
-     :arrival_date_gmt, :arrival_date_local, :ete, :etd_local, :eta_local, :etd_gmt, :eta_gmt,
-     :t_o_time_act_gmt, :land_time_act_gmt, :eft, :flight_time_actual, :block_time_actual],
-   :aircraft => [:type_id, :tail_number, :aircraft_id],
-   :trip     => [:total_statute_miles] }
-  EAGER_GRAPH_OPTIONS = [:aircraft, :trip]
-  def self.trip_report_query(from_date, to_date, extra_fields)
-    filter_args = {~:'trip legs__status'=> 31, :depart_date_key => from_date.to_fos_days..to_date.to_fos_days}
-    selecting_fields = TRIP_REPORT_SELECT_FIELDS.dup
-    eager_graph_options = EAGER_GRAPH_OPTIONS.dup
-    if extra_fields.include?('pic')
-      selecting_fields.merge!(:crew_legs => [:crew, :position],:crew_legs__position_code => [:code])
-      eager_graph_options += [{:crew_legs => :position_code}]
-    elsif extra_fields.include?('trip_requester_name')
-      selecting_fields.merge!(:trip_requester => [:name])
-      eager_graph_options += [:trip_requester]
-    end
-    TripLeg.filter(filter_args).eager_graph(eager_graph_options).select_fields(selecting_fields).all
-  end
-  #### aliases and special methods #####
-  # This method guarantees an icao for a view that needs one. If there is an icao, use it, otherwise make
-  # it from the prefix and airport_id .. which works as an icao, but beware, because these put together
-  # icao's that you make are valid icao codes, but you can't search the airport based it, since these
-  # airport rows don't have an icao code at all, they only have the prefix and airport_id. whacky.
-  def departure_icao_val
-    departure_icao || depart_ap_prefix + depart_airport_id
-  end
-  # same comment as above
-  def arrival_icao_val
-    arrival_icao || arrival_ap_prefix + arrival_airport_id
-  end
-  def departure_icao_expanded
-    "#{departure_icao_val} #{departure_airport.name} #{departure_airport.city} ,#{departure_airport.state_abbreviation}"
-  end
-  def arrival_icao_expanded
-    "#{arrival_icao_val} #{arrival_airport.name} #{arrival_airport.city} ,#{arrival_airport.state_abbreviation}"
-  end
-  def trip_status
-    return "CANC" if cancel_code != 0
-    case status
-      when 0 then "SCHED"
-      when 1 then "VERI"
-      when 10 then "CANC"
-      when 23 then "CANC"
-      when 21 then "MAINT"
-      when 20 then "SCHED" #was "RESVD"
-      else "[#{status}]"
-    end
-  end
-  def trip_total_statute_miles
-    trip ? trip.total_statute_miles.to_f/10.0 : 0
-  end
-  alias miles statute_miles
-  # special id which mushes 4 of the requester kids together.
-  # don't need 5th one( kid_user ) to get unique value, so not using it
-  def requester_id
-    [requester_kid_date,requester_kid_time,requester_kid_mult,requester_kid_comm].join('|')
-  end
-  #### status filters #####  ["CANC","SCHED", "VERI"]
-  LIMIT_REPORT_STATUS_ONLY_UNVERIFIED = lambda {|v,args| ["CANC","SCHED"].include?(v.trip_status) }
-  LIMIT_REPORT_STATUS_ONLY_VERIFIED = lambda {|v,args| ["VERI"].include?(v.trip_status) }
-  LIMIT_REPORT_STATUS_ONLY_SCHEDULED = lambda {|v,args| ["SCHED"].include?(v.trip_status) }
-  LIMIT_REPORT_STATUS_ONLY_UNVERIFIED_SHOW_CANCELLED_LEGS = lambda {|v,args| ["CANC","SCHED"].include?(v.trip_status) }
-  LIMIT_REPORT_STATUS_ONLY_VERIFIED_SHOW_CANCELLED_LEGS = lambda {|v,args| ["CANC","VERI"].include?(v.trip_status) }
-  LIMIT_REPORT_STATUS_ONLY_SCHEDULED_SHOW_CANCELLED_LEGS = lambda {|v,args| ["CANC","SCHED"].include?(v.trip_status) }
-  SHOW_CANCELLED_LEGS = lambda {|v,args| ["CANC"].include?(v.trip_status) }
-  #### region filters #####
-  US_PREFIXES = ["K","PA","PF","PO","PP","PH"]
-  LIMIT_REPORT_REGION_ONLY_INTERNATIONAL = lambda {|v,args| !US_PREFIXES.include?(v.depart_ap_prefix) }
-  LIMIT_REPORT_REGION_ONLY_USA = lambda {|v,args| US_PREFIXES.include?(v.depart_ap_prefix) }
-  #### request filter #####
-  LIMIT_REPORT_REQUESTER = lambda {|v,requester_id| v.requester_id == requester_id }
-  #### aircraft id filter #####
-  LIMIT_AIRCRAFT_IDS = lambda {|v,aircraft_ids| aircraft_ids.include?(v.aircraft_id) }
-  #### city pair filters #####
-  LIMIT_CITY_PAIR_FROM_ICAO = lambda {|trip_leg,icao_arr| icao_arr.include?(trip_leg.departure_icao_val) }
-  LIMIT_CITY_PAIR_TO_ICAO = lambda {|trip_leg,icao_arr| icao_arr.include?(trip_leg.arrival_icao_val) }
-  LIMIT_CITY_PAIR_FROM_ICAO_COUNTRY_CODE = lambda {|trip_leg,country_codes| country_codes.include?(trip_leg.depart_ap_prefix) }
-  LIMIT_CITY_PAIR_TO_ICAO_COUNTRY_CODE = lambda {|trip_leg,country_codes| country_codes.include?(trip_leg.arrival_ap_prefix) }
-  CITY_PAIR_SPECIFIC_FIELDS = [:depart_ap_prefix, :departure_iata, :arrival_ap_prefix, :arrival_iata]
-  # The vars param is an array of filters for the 4 fields that correspond to CITY_PAIR_SPECIFIC_FIELDS.
-  # If the vars array is ['K','SFO'] then this filter should check that the depart_ap_prefix matches 'K'
-  # and the depart_iata matches 'SFO'.
-  LIMIT_CITY_PAIR_SPECIFIC = lambda {|trip_leg,vars|
-    CITY_PAIR_SPECIFIC_FIELDS.enum_with_index.find{|field,idx|
-      # check to see if the field value is not equal to the filter but only check if there is a filter for that field
-      trip_leg.send(field) != vars[idx] unless vars[idx].blank?
-    }.blank?
-    # if all matched ok, then returns nil, and if one of the filters did not match then will have
-    # the value of that non matching field. So, if result is blank?, this trip leg is valid
-  }
-  #####  END   the trip_report query/service on crewres #######
-  ############ kbi report ###############
-  def is_deadhead?
-    status==1 and (deadhead==1 or pax_count==0) and [107, 115, 108, 104].include? leg_type_code
-  end
-  def is_owner_occupied?
-    status==1 and deadhead==0 and pax_count>0 and [107, 115, 108, 104].include? leg_type_code
-  end
-  def self.kbi_stats(date)
-    start_date_month, end_date_month = date.beginning_of_month, date.end_of_month
-    start_date_week, end_date_week = date.beginning_of_week.to_fos_days, date.end_of_week.to_fos_days
-    hash = Hash.new {|k,v| k[v]=0}
-    trips = TripLeg.filter(:arrival_date_home=>start_date_month.to_fos_days..end_date_month.to_fos_days).
-            select(:arrival_date_home, :aircraft_type_id, :flight_time_actual, :eft, :status, :pax_count, :deadhead, :leg_type_code)
-    occupied_hours = 0
-    trips.each do |trip|
-      # hours scheduled/flown per aircraft type
-      if ["C750","CL30"].include? trip.aircraft_type_id
-        # month totals
-        hash["hours_scheduled_month_#{trip.aircraft_type_id}"] += trip.eft / 60.0
-        hash["hours_flown_month_#{trip.aircraft_type_id}"] += (trip.flight_time_actual / 60.0) if trip.status == 1
-        # week totals
-        if trip.arrival_date_home.between? start_date_week,end_date_week
-          hash["hours_scheduled_week_#{trip.aircraft_type_id}"] += trip.eft / 60.0
-        end
-      end
-      # month charter hours scheduled/flown
-      if [100,11].include? trip.leg_type_code
-        hash["hours_scheduled_month_charter"] += trip.eft / 60.0
-        hash["hours_flown_month_charter"] += (trip.flight_time_actual / 60.0) if trip.status == 1
-      end
-      # owner deadhead month hours flown
-      hash[:hours_flown_month_deadhead] += trip.flight_time_actual / 60.0 if trip.is_deadhead?
-      # owner deadhead month hours flown
-      hash[:hours_flown_month_owner] += trip.flight_time_actual / 60.0 if trip.is_owner_occupied?
-      # other hours flown month
-      hash[:hours_flown_month_other] += trip.flight_time_actual / 60.0 if !([100,11,107,115,108,104].include? trip.leg_type_code)
-      # monthly passenger occupied hours
-      if trip.pax_count > 0 && trip.deadhead == 0 and trip.status == 1
-        occupied_hours += trip.flight_time_actual / 60.0
-      end
-    end
-    # calculate passenger utilization
-    hours_flown = hash["hours_flown_month_C750"] + hash["hours_flown_month_CL30"]
-    hash[:passenger_utilization] = (occupied_hours / hours_flown)*100 rescue 0
-    # owner guaranteed deadhead percentage month
-    hash[:owner_guarantee_deadhead] = (hash[:hours_flown_month_deadhead] / (hash[:hours_flown_month_deadhead] + hash[:hours_flown_month_owner])) * 100 rescue 0
-    hash
-  end
-  CUST_SATISFACTION_FIELDS =
-    [:status_code, :actual_departure_date_gmt, :actual_departure_trip]
-  # filtering on these leg_type codes ["FXL", 107], ["FXM", 115], ["FXO", 108], ["TPGC", 121], ["TPGP", 122], ["XOLP", 104]
-  #
-  def customer_satisfaction_trip_report(date)
-     trips = Trip.filter(:status=>1, ~:cancel_code=>1, :leg_type_code=> [104,107,108,115,121,122], :arrival_date_gmt=>date.to_fos_days).all
-    # :status, :dept_date_act_local, :dept_time_act_local, :requester
-    # :leg_requestor => [:name, :authorizer_string ]
-    # :status_code
-    # :actual_departure_date_local, :actual_departure_time_local,
-    # leg_requestor_name, :lead_pax_name
-    #  lead pax info: lead_pax.passenger.pax_office_phone, pax_email
-    #  planner info: lead_pax.passenger.travel_planner, pl_office_phone , pl_email
-    # :depture_icao, :arrival_icao,
-    # :leg_number
-    # leg_requestor.authorizer_string, leg_requestor.name
-    #
-    # delay_1_time, :delay_1_reson
-    # :statute_miles
-  end
-#pp ts.collect{|t| t.trip_legs.collect{|tl| [tl.trip_number,tl.leg_number,tl.arrival_date_gmt,tl.arriv_time_act_gmt,tl.leg_type_code,tl.leg_type_value_code,tl.is_deadhead?]}}
-# [[[68302, 1, 39928, 996, 11, "WHSL", false],
-#  [68302, 2, 39928, 1332, 11, "WHSL", false]],
-# [[68085, 1, 39924, 684, 11, "WHSL", false],
-#  [68085, 2, 39924, 930, 11, "WHSL", false],
-#  [68085, 3, 39928, 1224, 11, "WHSL", false]],
-# [[68206, 1, 39927, 1050, 107, "FXL", true],
-#  [68206, 2, 39928, 1218, 107, "FXL", false],
-#  [68206, 3, 39928, 1242, 107, "FXL", true]],
-# [[68376, 1, 39928, 216, 107, "FXL", false],
-#  [68376, 2, 39928, 222, 107, "FXL", true]],
-# [[68437, 1, 39928, 1068, 107, "FXL", true],
-#  [68437, 2, 39928, 1308, 107, "FXL", false]],
-# [[68550, 1, 39928, 1164, 107, "FXL", true],
-#  [68550, 2, 39928, 1398, 107, "FXL", false]],
-# [[68552, 1, 39928, 1332, 107, "FXL", false]],
-# [[68576, 1, 39928, 1404, 107, "FXL", false]],
-# [[68604, 1, 39928, 876, 107, "FXL", true],
-#  [68604, 2, 39928, 1218, 107, "FXL", false]],
-# [[68607, 1, 39927, 1104, 107, "FXL", true],
-#  [68607, 2, 39928, 738, 107, "FXL", false],
-#  [68607, 3, 39928, 1026, 107, "FXL", false],
-#  [68607, 4, 39928, 1074, 107, "FXL", true]],
-# [[68610, 1, 39928, 1122, 11, "WHSL", false],
-#  [68610, 2, 39928, 1356, 11, "WHSL", false],
-#  [68610, 3, 39928, 1374, 11, "WHSL", false]]]
-end
+end

data/lib/number_helper.rb ADDED Viewed

@@ -0,0 +1,303 @@
+module ActionView
+  module Helpers #:nodoc:
+    # Provides methods for converting numbers into formatted strings.
+    # Methods are provided for phone numbers, currency, percentage,
+    # precision, positional notation, and file size.
+    module NumberHelper
+      # Formats a +number+ into a US phone number (e.g., (555) 123-9876). You can customize the format
+      # in the +options+ hash.
+      #
+      # ==== Options
+      # * <tt>:area_code</tt>  - Adds parentheses around the area code.
+      # * <tt>:delimiter</tt>  - Specifies the delimiter to use (defaults to "-").
+      # * <tt>:extension</tt>  - Specifies an extension to add to the end of the
+      #   generated number.
+      # * <tt>:country_code</tt>  - Sets the country code for the phone number.
+      #
+      # ==== Examples
+      #  number_to_phone(5551234)                                           # => 555-1234
+      #  number_to_phone(1235551234)                                        # => 123-555-1234
+      #  number_to_phone(1235551234, :area_code => true)                    # => (123) 555-1234
+      #  number_to_phone(1235551234, :delimiter => " ")                     # => 123 555 1234
+      #  number_to_phone(1235551234, :area_code => true, :extension => 555) # => (123) 555-1234 x 555
+      #  number_to_phone(1235551234, :country_code => 1)                    # => +1-123-555-1234
+      #
+      #  number_to_phone(1235551234, :country_code => 1, :extension => 1343, :delimiter => ".")
+      #  => +1.123.555.1234 x 1343
+      def number_to_phone(number, options = {})
+        number       = number.to_s.strip unless number.nil?
+        options      = options.symbolize_keys
+        area_code    = options[:area_code] || nil
+        delimiter    = options[:delimiter] || "-"
+        extension    = options[:extension].to_s.strip || nil
+        country_code = options[:country_code] || nil
+        begin
+          str = ""
+          str << "+#{country_code}#{delimiter}" unless country_code.blank?
+          str << if area_code
+            number.gsub!(/([0-9]{1,3})([0-9]{3})([0-9]{4}$)/,"(\\1) \\2#{delimiter}\\3")
+          else
+            number.gsub!(/([0-9]{0,3})([0-9]{3})([0-9]{4})$/,"\\1#{delimiter}\\2#{delimiter}\\3")
+            number.starts_with?('-') ? number.slice!(1..-1) : number
+          end
+          str << " x #{extension}" unless extension.blank?
+          str
+        rescue
+          number
+        end
+      end
+      # Formats a +number+ into a currency string (e.g., $13.65). You can customize the format
+      # in the +options+ hash.
+      #
+      # ==== Options
+      # * <tt>:precision</tt>  -  Sets the level of precision (defaults to 2).
+      # * <tt>:unit</tt>       - Sets the denomination of the currency (defaults to "$").
+      # * <tt>:separator</tt>  - Sets the separator between the units (defaults to ".").
+      # * <tt>:delimiter</tt>  - Sets the thousands delimiter (defaults to ",").
+      # * <tt>:format</tt>     - Sets the format of the output string (defaults to "%u%n"). The field types are:
+      #
+      #     %u  The currency unit
+      #     %n  The number
+      #
+      # ==== Examples
+      #  number_to_currency(1234567890.50)                    # => $1,234,567,890.50
+      #  number_to_currency(1234567890.506)                   # => $1,234,567,890.51
+      #  number_to_currency(1234567890.506, :precision => 3)  # => $1,234,567,890.506
+      #
+      #  number_to_currency(1234567890.50, :unit => "&pound;", :separator => ",", :delimiter => "")
+      #  # => &pound;1234567890,50
+      #  number_to_currency(1234567890.50, :unit => "&pound;", :separator => ",", :delimiter => "", :format => "%n %u")
+      #  # => 1234567890,50 &pound;
+      def number_to_currency(number, options = {})
+        options.symbolize_keys!
+        defaults  = I18n.translate(:'number.format', :locale => options[:locale], :raise => true) rescue {}
+        currency  = I18n.translate(:'number.currency.format', :locale => options[:locale], :raise => true) rescue {}
+        defaults  = defaults.merge(currency)
+        precision = options[:precision] || defaults[:precision]
+        unit      = options[:unit]      || defaults[:unit]
+        separator = options[:separator] || defaults[:separator]
+        delimiter = options[:delimiter] || defaults[:delimiter]
+        format    = options[:format]    || defaults[:format]
+        separator = '' if precision == 0
+        begin
+          format.gsub(/%n/, number_with_precision(number,
+            :precision => precision,
+            :delimiter => delimiter,
+            :separator => separator)
+          ).gsub(/%u/, unit)
+        rescue
+          number
+        end
+      end
+      # Formats a +number+ as a percentage string (e.g., 65%). You can customize the
+      # format in the +options+ hash.
+      #
+      # ==== Options
+      # * <tt>:precision</tt>  - Sets the level of precision (defaults to 3).
+      # * <tt>:separator</tt>  - Sets the separator between the units (defaults to ".").
+      # * <tt>:delimiter</tt>  - Sets the thousands delimiter (defaults to "").
+      #
+      # ==== Examples
+      #  number_to_percentage(100)                                        # => 100.000%
+      #  number_to_percentage(100, :precision => 0)                       # => 100%
+      #  number_to_percentage(1000, :delimiter => '.', :separator => ',') # => 1.000,000%
+      #  number_to_percentage(302.24398923423, :precision => 5)           # => 302.24399%
+      def number_to_percentage(number, options = {})
+        options.symbolize_keys!
+        defaults   = I18n.translate(:'number.format', :locale => options[:locale], :raise => true) rescue {}
+        percentage = I18n.translate(:'number.percentage.format', :locale => options[:locale], :raise => true) rescue {}
+        defaults  = defaults.merge(percentage)
+        precision = options[:precision] || defaults[:precision]
+        separator = options[:separator] || defaults[:separator]
+        delimiter = options[:delimiter] || defaults[:delimiter]
+        begin
+          number_with_precision(number,
+            :precision => precision,
+            :separator => separator,
+            :delimiter => delimiter) + "%"
+        rescue
+          number
+        end
+      end
+      # Formats a +number+ with grouped thousands using +delimiter+ (e.g., 12,324). You can
+      # customize the format in the +options+ hash.
+      #
+      # ==== Options
+      # * <tt>:delimiter</tt>  - Sets the thousands delimiter (defaults to ",").
+      # * <tt>:separator</tt>  - Sets the separator between the units (defaults to ".").
+      #
+      # ==== Examples
+      #  number_with_delimiter(12345678)                        # => 12,345,678
+      #  number_with_delimiter(12345678.05)                     # => 12,345,678.05
+      #  number_with_delimiter(12345678, :delimiter => ".")     # => 12.345.678
+      #  number_with_delimiter(12345678, :separator => ",")     # => 12,345,678
+      #  number_with_delimiter(98765432.98, :delimiter => " ", :separator => ",")
+      #  # => 98 765 432,98
+      #
+      # You can still use <tt>number_with_delimiter</tt> with the old API that accepts the
+      # +delimiter+ as its optional second and the +separator+ as its
+      # optional third parameter:
+      #  number_with_delimiter(12345678, " ")                     # => 12 345.678
+      #  number_with_delimiter(12345678.05, ".", ",")             # => 12.345.678,05
+      def number_with_delimiter(number, *args)
+        options = args.extract_options!
+        options.symbolize_keys!
+        defaults = I18n.translate(:'number.format', :locale => options[:locale], :raise => true) rescue {}
+        unless args.empty?
+          ActiveSupport::Deprecation.warn('number_with_delimiter takes an option hash ' +
+            'instead of separate delimiter and precision arguments.', caller)
+          delimiter = args[0] || defaults[:delimiter]
+          separator = args[1] || defaults[:separator]
+        end
+        delimiter ||= (options[:delimiter] || defaults[:delimiter])
+        separator ||= (options[:separator] || defaults[:separator])
+        begin
+          parts = number.to_s.split('.')
+          parts[0].gsub!(/(\d)(?=(\d\d\d)+(?!\d))/, "\\1#{delimiter}")
+          parts.join(separator)
+        rescue
+          number
+        end
+      end
+      # Formats a +number+ with the specified level of <tt>:precision</tt> (e.g., 112.32 has a precision of 2).
+      # You can customize the format in the +options+ hash.
+      #
+      # ==== Options
+      # * <tt>:precision</tt>  - Sets the level of precision (defaults to 3).
+      # * <tt>:separator</tt>  - Sets the separator between the units (defaults to ".").
+      # * <tt>:delimiter</tt>  - Sets the thousands delimiter (defaults to "").
+      #
+      # ==== Examples
+      #  number_with_precision(111.2345)                    # => 111.235
+      #  number_with_precision(111.2345, :precision => 2)   # => 111.23
+      #  number_with_precision(13, :precision => 5)         # => 13.00000
+      #  number_with_precision(389.32314, :precision => 0)  # => 389
+      #  number_with_precision(1111.2345, :precision => 2, :separator => ',', :delimiter => '.')
+      #  # => 1.111,23
+      #
+      # You can still use <tt>number_with_precision</tt> with the old API that accepts the
+      # +precision+ as its optional second parameter:
+      #   number_with_precision(number_with_precision(111.2345, 2)   # => 111.23
+      def number_with_precision(number, *args)
+        options = args.extract_options!
+        options.symbolize_keys!
+        defaults           = I18n.translate(:'number.format', :locale => options[:locale], :raise => true) rescue {}
+        precision_defaults = I18n.translate(:'number.precision.format', :locale => options[:locale],
+                                                                        :raise => true) rescue {}
+        defaults           = defaults.merge(precision_defaults)
+        unless args.empty?
+          ActiveSupport::Deprecation.warn('number_with_precision takes an option hash ' +
+            'instead of a separate precision argument.', caller)
+          precision = args[0] || defaults[:precision]
+        end
+        precision ||= (options[:precision] || defaults[:precision])
+        separator ||= (options[:separator] || defaults[:separator])
+        delimiter ||= (options[:delimiter] || defaults[:delimiter])
+        begin
+          rounded_number = (Float(number) * (10 ** precision)).round.to_f / 10 ** precision
+          number_with_delimiter("%01.#{precision}f" % rounded_number,
+            :separator => separator,
+            :delimiter => delimiter)
+        rescue
+          number
+        end
+      end
+      STORAGE_UNITS = [:byte, :kb, :mb, :gb, :tb].freeze
+      # Formats the bytes in +size+ into a more understandable representation
+      # (e.g., giving it 1500 yields 1.5 KB). This method is useful for
+      # reporting file sizes to users. This method returns nil if
+      # +size+ cannot be converted into a number. You can customize the
+      # format in the +options+ hash.
+      #
+      # ==== Options
+      # * <tt>:precision</tt>  - Sets the level of precision (defaults to 1).
+      # * <tt>:separator</tt>  - Sets the separator between the units (defaults to ".").
+      # * <tt>:delimiter</tt>  - Sets the thousands delimiter (defaults to "").
+      #
+      # ==== Examples
+      #  number_to_human_size(123)                                          # => 123 Bytes
+      #  number_to_human_size(1234)                                         # => 1.2 KB
+      #  number_to_human_size(12345)                                        # => 12.1 KB
+      #  number_to_human_size(1234567)                                      # => 1.2 MB
+      #  number_to_human_size(1234567890)                                   # => 1.1 GB
+      #  number_to_human_size(1234567890123)                                # => 1.1 TB
+      #  number_to_human_size(1234567, :precision => 2)                     # => 1.18 MB
+      #  number_to_human_size(483989, :precision => 0)                      # => 473 KB
+      #  number_to_human_size(1234567, :precision => 2, :separator => ',')  # => 1,18 MB
+      #
+      # You can still use <tt>number_to_human_size</tt> with the old API that accepts the
+      # +precision+ as its optional second parameter:
+      #  number_to_human_size(1234567, 2)    # => 1.18 MB
+      #  number_to_human_size(483989, 0)     # => 473 KB
+      def number_to_human_size(number, *args)
+        return nil if number.nil?
+        options = args.extract_options!
+        options.symbolize_keys!
+        defaults = I18n.translate(:'number.format', :locale => options[:locale], :raise => true) rescue {}
+        human    = I18n.translate(:'number.human.format', :locale => options[:locale], :raise => true) rescue {}
+        defaults = defaults.merge(human)
+        unless args.empty?
+          ActiveSupport::Deprecation.warn('number_to_human_size takes an option hash ' +
+            'instead of a separate precision argument.', caller)
+          precision = args[0] || defaults[:precision]
+        end
+        precision ||= (options[:precision] || defaults[:precision])
+        separator ||= (options[:separator] || defaults[:separator])
+        delimiter ||= (options[:delimiter] || defaults[:delimiter])
+        storage_units_format = I18n.translate(:'number.human.storage_units.format', :locale => options[:locale], :raise => true)
+        if number.to_i < 1024
+          unit = I18n.translate(:'number.human.storage_units.units.byte', :locale => options[:locale], :count => number.to_i, :raise => true)
+          storage_units_format.gsub(/%n/, number.to_i.to_s).gsub(/%u/, unit)
+        else
+          max_exp  = STORAGE_UNITS.size - 1
+          number   = Float(number)
+          exponent = (Math.log(number) / Math.log(1024)).to_i # Convert to base 1024
+          exponent = max_exp if exponent > max_exp # we need this to avoid overflow for the highest unit
+          number  /= 1024 ** exponent
+          unit_key = STORAGE_UNITS[exponent]
+          unit = I18n.translate(:"number.human.storage_units.units.#{unit_key}", :locale => options[:locale], :count => number, :raise => true)
+          begin
+            escaped_separator = Regexp.escape(separator)
+            formatted_number = number_with_precision(number,
+              :precision => precision,
+              :separator => separator,
+              :delimiter => delimiter
+            ).sub(/(\d)(#{escaped_separator}[1-9]*)?0+\z/, '\1\2').sub(/#{escaped_separator}\z/, '')
+            storage_units_format.gsub(/%n/, formatted_number).gsub(/%u/, unit)
+          rescue
+            number
+          end
+        end
+      end
+    end
+  end
+end

data/lib/sequel/model_patch.rb CHANGED Viewed

@@ -1,5 +1,3 @@
-require File.join(RAILS_ROOT, 'lib', 'sequel', 'serializer', 'serializer.rb')
 class Sequel::Model
   include Sequel::Serialization # our own custom serializer
   include ActionView::Helpers::NumberHelper

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fossil
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Patrick Lardin, Daniel Sudol
@@ -25,6 +25,7 @@ files:
 - Rakefile
 - VERSION
 - fossil.gemspec
+- lib/fossil.rb
 - lib/models/ac_qualification.rb
 - lib/models/aircraft.rb
 - lib/models/aircraft_cost.rb
@@ -117,6 +118,7 @@ files:
 - lib/models/vendor.rb
 - lib/models/vendor_document.rb
 - lib/models/visa.rb
+- lib/number_helper.rb
 - lib/sequel/code_group.rb
 - lib/sequel/fos_dates.rb
 - lib/sequel/metaprogramming.rb