fossil 0.5.41 → 0.5.42

data/VERSION

@@ -1 +1 @@
-0.5.41
+0.5.42

data/fossil.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fossil}
-  s.version = "0.5.41"
+  s.version = "0.5.42"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Daniel Sudol", "Patrick Lardin"]

data/lib/models/flight_log_expense.rb

@@ -156,12 +156,21 @@ class FlightLogExpense < Sequel::Model(:'flight log expenses')
     0.0
   end
 
-  def calculate_fuel_data
-    expense_type = expense_type_string
-    tl = trip_leg
+  def fuel_passdown_hash
+    expense_type = type_string
+    tl           = trip_leg
+    p expense_type
+    p tl
+    p vendor_id
+    p tl.send("#{expense_type}_fuel_vendor")
+    p tl.dep_fuel_vendor
+    p tl.arr_fuel_vendor
     vendor       = tl.send("#{expense_type}_fuel_vendor__company_2")
+    p vendor
     vendor       = tl.send("#{expense_type}_fuel_vendor__company_1") if !vendor or vendor == ""
+    p vendor
     vendor       = tl.send("#{expense_type}_fuel_vendor__vendor_id") if !vendor or vendor == ""
+    p vendor
     airport      = tl.send("#{expense_type}_icao_val")
     fbo          = tl.send("#{expense_type}_fbo__name")
     aircraft     = (tl.aircraft ? tl.tail_number : tl.aircraft_id)
@@ -175,9 +184,9 @@ class FlightLogExpense < Sequel::Model(:'flight log expenses')
       :airport       => airport,
       :fbo           => fbo,
       :vendor        => vendor,
-      :fuel_rate     => expense.fuel_rate,
-      :fuel_quantity => expense.quantity,
-      :fuel_cost     => expense.fuel_cost
+      :fuel_rate     => fuel_rate,
+      :fuel_quantity => quantity,
+      :fuel_cost     => fuel_cost
     }
   end
 end

data/lib/models/trip_leg.rb

@@ -958,11 +958,10 @@ class TripLeg < Sequel::Model(:'trip legs')
       trip_legs.each do |leg|
         leg.fuel_expenses.each do |expense|
 
-          expense_type = expense_type_string( expense )
-          fbo_name = leg.send( "#{expense_type}_fbo__name" )
-          p fbo_name
+          fbo_name = leg.send( "#{expense.type_string}_fbo__name" )
+
           if fbo_keys.include?(fbo_name) then # is this an fbo we are looking for?
-            expense_hash = calculate_expense( expense, leg )
+            expense_hash = expense.fuel_passdown_hash
 
             if data.has_key?(fbo_name)
               data[fbo_name].push(expense_hash)

data/lib/support/core_extensions.rb

@@ -22,6 +22,10 @@ class Integer
   def in_hundredths
     self.to_f.in_hundredths
   end
+
+  def to_currency
+    self.to_f.to_currency
+  end
 end
 
 class Float
@@ -34,6 +38,12 @@ class Float
     val = "#{self/60.0}.#{((100.0*(self.modulo(60.0)))/60.0).to_s.rjust(2, '0')}"
     BigDecimal.new(val, 2).round(2).to_f
   end
+
+  def to_currency
+    int, frac = self.round(2).to_s.split('.')
+    num = int.gsub(/(\d)(?=(\d\d\d)+(\d))/, '\\1,')
+    "$#{num}.#{frac}"
+  end
 end
 
 class Range

data/spec/silly_spec.rb

@@ -2,24 +2,30 @@ require_relative '../lib/fossil'
 require 'logger'
 require 'pp'
 
-class Sequel::Model::Associations::OneToManyAssociationReflection
-  # one_to_many associations can only have associated objects if none of
-  # the :keys options have a nil value.
-  def can_have_associated_objects?(obj)
-    !self[:primary_keys].any?{|k| obj.send(k).nil?}
-  end
-end
+#class Sequel::Model::Associations::OneToManyAssociationReflection
+#  # one_to_many associations can only have associated objects if none of
+#  # the :keys options have a nil value.
+#  def can_have_associated_objects?(obj)
+#    !self[:primary_keys].any?{|k| obj.send(k).nil?}
+#  end
+#end
 
 #DB = Sequel.fos('fosprod', :loggers=>[Logger.new($stdout)])
-DB = Sequel.fos('fos', :loggers=>[Logger.new($stdout)])
+#DB = Sequel.fos('fos', :loggers=>[Logger.new($stdout)])
 #DB = Sequel.fos('demo_company_fos_db')#, :loggers=>[Logger.new($stdout)])
-#DB = Sequel.fos('flyos')#, :loggers=>[Logger.new($stdout)])
-[CityPair,CityCost].each {|model| model.db = DB}
-p CityPair.first.city_costs
+DB = Sequel.fos('flyos', :loggers=>[Logger.new($stdout)])
+#[CityPair,CityCost].each {|model| model.db = DB}
+#p CityPair.first.city_costs
 #p CityPair.first.send('kid - user')
-#[TripLeg,FlightLogExpense].each {|model| model.db = DB}
+#[TripLeg].each {|model| model.db = DB}
+p DB.run("UPDATE \"TRIP LEGS\" SET \"NOTE\" = 'hi rob' WHERE (\"TRIP NUMBER\" = 45) AND (\"LEG NUMBER\" = 1)")
+#p TripLeg.filter(:trip_number=>45,:leg_number=>1).first.note
+#tl = TripLeg.filter(:trip_number=>45,:leg_number=>1).first
+#tl.note = "hi tob"
+#tl.save
 #[Vendor].each {|model| model.db = DB}
-#p Aircraft.first.type_id
+#Aircraft.db = DB
+#p Aircraft.first
 #p [AirportFuel.min(:kid_date),AirportFuel.max(:kid_date)]
 #p [TripLeg.min(:dept_date_gmt),TripLeg.max(:dept_date_gmt)]
 #p [Date.from_fos_days(TripLeg.min(:dept_date_gmt)).to_s,Date.from_fos_days(TripLeg.max(:dept_date_gmt)).to_s]

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 41
-  version: 0.5.41
+  - 42
+  version: 0.5.42
 platform: ruby
 authors: 
 - Daniel Sudol