toolhound-ruby 1.0.30 → 1.0.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d9ecf8fff9bb7cfebea4141a5592d9ede9a8f4f
-  data.tar.gz: 4cc0a0cfb46b5381405b148ad51be853a86a1eab
+  metadata.gz: 88d1eafcdd7dee322458ac1af56517b52b361aef
+  data.tar.gz: 95f1b337472c23821da5c9e04cb896618e67c3d0
 SHA512:
-  metadata.gz: 26925ecc1c1b2fb6dab87fab8f1d6e1248fb98ce68c2e51c139de89bf35a15053cfb3be8d23eb516973c614d75a2de4fc553d1b8645f0f041394f34d9eedfc84
-  data.tar.gz: f9e415d8d005e4efcfec7953df3881f49ac78a5ffd654863cefe9bf9f4d63d475d16d66d875c2e18863b88406f2dc4162f3460c2fd215c0aa52e5667c1c69ba3
+  metadata.gz: d2a8fce6598ea148533c9785d9849024ab8abf386fc3134e7c5478aee2c24b7c2ed2a1ca15ac1f076490c56e6bc2bb38b95816de9edb3c90172c6f661807f8d7
+  data.tar.gz: dbdfb8cc992c7cf85b956eb8d2525915ca8acb095bea1c9f9e86034f1c6041ac4741d269ca896d7910c6bd9140b017810b0705d46b0992dfb18dcecb8634c01a

data/lib/toolhound-ruby/base.rb

@@ -6,7 +6,7 @@ module Toolhound
     DATE_TIME_FORMAT = "%Y-%m-%d %H:%M:%S".freeze
 
     include Toolhound::Util
-    attr_accessor :connection
+    attr_accessor :connection, :client
 
     def self.table_name
       @@table_name[self.name]
@@ -297,11 +297,17 @@ module Toolhound
 
     def query(query, options = {})
       data    = []
-      results = connection.execute(query)
-      results.each(:cache_rows => false) do |row|
-        data << transform_attributes(row)
+      begin
+        results = connection.execute(query)
+
+        results.each(:cache_rows => false) do |row|
+          data << transform_attributes(row)
+        end
+        data
+      rescue TinyTds::Error
+        client.reset_connection
+        retry
       end
-      data
     ensure
       finish_statement_handle(results)
     end
@@ -320,6 +326,8 @@ module Toolhound
       where   = obj[:where] ? build_where(obj[:where]) : nil
       order   = obj[:order]
 
+      selects = "*" if selects.strip.length == 0
+
       limit_str   = limit ? "TOP(#{limit})" : ""
       where_str   = where.length > 0 ? "WHERE #{where}"    : ""
       order_str   = order ? "ORDER BY #{order}" : ""

data/lib/toolhound-ruby/client.rb

@@ -74,9 +74,8 @@ module Toolhound
     end
 
     def connection
-      if @connection && @connection.dead?
-        sign_in
-      end
+      sign_in if !@connection || @connection.dead?
+
       @connection
     end
 

data/lib/toolhound-ruby/job.rb

@@ -20,12 +20,43 @@ module Toolhound
 
     def default_joins
       arr = []
-      # arr << "INNER JOIN tblManufacturerText ON (tblManufacturerText.intManufacturerID = tblManufacturer.intManufacturerID AND varLocaleID = '#{locale}')"
+      arr << "INNER JOIN tblJobText ON (tblJobText.intJobID = tblJob.intJobID AND varLocaleID = '#{locale}')"
       # arr << "INNER JOIN tblRentalDetail ON (tblRentalDetail.intRentalDetailID = tblRentalItem.intRentalDetailID)"
 
       arr
     end
 
+    def default_wheres
+      [
+        {"job.bol_active" => true}
+      ]
+    end
+
+
+    def all(options = {})
+      entity_id = options[:entity_id]
+
+      wheres  = default_wheres
+      selects = default_selects
+      joins   = default_joins
+
+      joins << "
+        INNER JOIN (
+          SELECT DISTINCT intJobID FROM tblRentalCharge WHERE tblRentalCharge.intEntityID = '#{entity_id}' AND tblRentalCharge.intJobID is NOT NULL
+        ) AS tblAssignees ON tblAssignees.intJobID = tblJob.intJobID" if entity_id
+
+
+      build_and_query(
+        joins: joins,
+        selects: selects,
+        where: wheres
+      )
+
+      # joins << "INNER JOIN tblRentalCharge ON tblRentalCharge.intEntityID = '#{entity_id}' AND tblRentalCharge.intJobID is NOT NULL" if entity_id
+      # SELECT DISTINCT intJobID FROM tblRentalCharge WHERE tblRentalCharge.intEntityID = '100044' AND tblRentalCharge.intJobID is NOT NULL;
+
+    end
+
     def insert(variables = {})
       vars = {created_user_id: 1, modified_user_id: 1, active: true, job: nil, created_date: nil, modified_date: nil}
       # procedure("Job_Insert", vars)

data/lib/toolhound-ruby/rental_charge.rb

@@ -52,6 +52,7 @@ module Toolhound
       entity_id     = options.delete :entity_id
       from          = options.delete :from
       to            = options.delete :to
+      job_id        = options.delete :job_id
 
       joins = []
       joins << "LEFT OUTER JOIN tblRentalItem ON tblRentalItem.intRentalItemID = tblRentalCharge.intRentalItemID"
@@ -68,12 +69,14 @@ module Toolhound
               ) as taxQuery ON taxQuery.intLocationID = tblLocation.intLocationID"
       joins << "LEFT OUTER JOIN tblTax ON tblTax.intLocationID = taxQuery.intLocationID AND tblTax.dteCreatedDate = taxQuery.max_date"
       joins << "LEFT OUTER JOIN tblTaxText ON tblTaxText.intTaxID = tblTax.intTaxID AND tblTaxText.varLocaleID = '#{locale}'"
+      joins << "LEFT OUTER JOIN tblJobText ON tblJobText.intJobID = tblRentalCharge.intJobID AND tblJobText.varLocaleID = '#{locale}'"
       wheres = [
         {"inventory.bol_deleted"        => 0},
         {"inventory.bol_is_active"      => 1},
         {"inventory_text.var_locale_id" => locale},
       ]
 
+      wheres << {"rental_charge.int_job_id" => job_id} if job_id
       wheres << {"rental_charge.int_entity_id" => entity_id}  if entity_id
       wheres << {dte_end_date: {value: [parse_time(from), parse_time(to)], op: :between} } if from && to
 
@@ -83,7 +86,7 @@ module Toolhound
           :int_rental_charge_id, :int_entity_id, :int_qty, :dec_total, :var_type, :int_inventory_id_id,
           :dec_days, :dec_daily, :dec_weeks, :dec_weekly, :dec_months, :dec_monthly,
           # {var_work_order: :var_work_order_no},
-          :dte_start_date, :dte_end_date
+          :dte_start_date, :dte_end_date, :int_job_id
         ],
         inventory_id:     [{var_inventory_id: :inventory_id_no}, :int_inventory_id],
         inventory:        [:int_category_id, :int_sub_category_id, :int_inventory_type_id],
@@ -91,6 +94,7 @@ module Toolhound
           :var_part_no, :var_description, {var_user_field1: :gl_revenue}, {var_user_field2: :gl_cogs_code},
           {var_user_field3: :phase_code}
         ],
+        job_text:       [:var_job, :var_job_number],
         transaction:    [{var_work_order: :var_work_order_no}, :var_transaction_no],
         tax:            [{dec_tax1_rate: :tax_rate}],
         tax_text:       [{var_tax1_description: :tax_label}],

data/lib/toolhound-ruby/version.rb

@@ -1,3 +1,3 @@
 module Toolhound
-  VERSION = "1.0.30"
+  VERSION = "1.0.31"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toolhound-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.30
+  version: 1.0.31
 platform: ruby
 authors:
 - Markus Klooth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-08 00:00:00.000000000 Z
+date: 2016-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tiny_tds