toolhound-ruby 1.0.10 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7761f294852261ed89a157bcab5af11358aebffc
-  data.tar.gz: 4a26e851dfb390c4682e3c669eee190af2b21bcb
+  metadata.gz: f4b7320fb09cf1d6d020be8caab6ea0e0a06f7a1
+  data.tar.gz: 393645f776dd26590718bb020a3423e85f35ccc7
 SHA512:
-  metadata.gz: 1b74b5a02e68365aaf80d302f08a83cd9d1bf0d2bd41b3e6eeeb3956217e59345160b68ece60da74c9fc31901f8ac7d554720c1ce24ba2aae654349a4222945a
-  data.tar.gz: 51c8ede5ea2586ab053b75e4cb02e8a10976a7b51cab2bb726bdde07275cbc7497a48014321e084b96365449d895b86e4b6492c1745c647ec27d299e09428575
+  metadata.gz: 0ab2999cbc0846eb533a3227cefd245ba4ef9c46e3d21f00c7711d0bc44d7a8ecca298b424e897747665dd2e2b7ce352b4f6f509d359b1eb55d813d350ea1fa3
+  data.tar.gz: f9aa7ba6d92e068c678147806225d27c319a4ceab8e15e771884900883bb1db71fd0666e7c15cf7d02c7690fe8550956f8cb7acf513595e82d2b43b0b94293d1

data/lib/toolhound-ruby.rb

@@ -18,12 +18,14 @@ require "toolhound-ruby/client"
 require "toolhound-ruby/default"
 require "toolhound-ruby/base"
 
+require "toolhound-ruby/job"
 require "toolhound-ruby/project"
 require "toolhound-ruby/inventory"
 require "toolhound-ruby/inventory_item"
 require "toolhound-ruby/rental"
 require "toolhound-ruby/rental_item"
 require "toolhound-ruby/rental_charge"
+require "toolhound-ruby/transaction"
 
 require "toolhound-ruby/vendor"
 require "toolhound-ruby/manufacturer"

data/lib/toolhound-ruby/base.rb

@@ -87,6 +87,26 @@ module Toolhound
       results.first
     end
 
+    def procedure(procedure_name, variables = {})
+      # procedure_name = "Job_GetList"
+
+      # EXECUTE HumanResources.uspGetEmployees @FirstName = N'Pilar', @LastName = N'Ackerman';
+      vars = transform_procedure_variables(variables)
+      pairs = vars.map {|pair| pair.join(" = ")  }
+      vars_query = pairs.join(", ")
+
+      # EXECUTE HumanResources.uspGetEmployees @FirstName = N'Pilar', @LastName = N'Ackerman';
+
+      sql = "EXECUTE dbo.#{procedure_name} #{vars_query};"
+      results = connection.execute(sql)
+      # results = connection.execute(query)
+    end
+
+    def insert(table, variables)
+
+
+    end
+
     def merge_options(defaults, options = {})
       where   =  options.delete :where
       selects = options.delete :selects
@@ -209,7 +229,7 @@ module Toolhound
       arr = []
       case wheres.class.to_s
       when "String"
-        return wheres
+        arr << wheres
       when "Hash"
         wheres.each do |k, v|
           table, column = formatted_table_and_column(k)
@@ -269,7 +289,7 @@ module Toolhound
 
     end
 
-    def query(query, options)
+    def query(query, options = {})
       data    = []
       results = connection.execute(query)
       results.each(:cache_rows => false) do |row|
@@ -323,6 +343,24 @@ module Toolhound
       hash
     end
 
+    def transform_procedure_variables(variables)
+      vars = []
+      variables.each do |key, value|
+        vars << [transform_procedure_key(key), transform_procedure_value(value)]
+      end
+      vars
+    end
+
+    def transform_procedure_value(value)
+      "'#{value}'"
+    end
+
+    def transform_procedure_key(key)
+      key = key.to_s
+      key = camelize(key, true)
+      "@p_#{key}"
+    end
+
     def transform_attribute_key(key)
       renamed = self.class.renamed_attributes
       if renamed.include? key

data/lib/toolhound-ruby/client.rb

@@ -101,6 +101,14 @@ module Toolhound
       @connection = nil
     end
 
+    def job
+      @job ||= Toolhound::Job.new(self)
+    end
+
+    def transaction
+      @transaction ||= Toolhound::Transaction.new(self)
+    end
+    
     def inventory
       @inventory ||= Toolhound::Inventory.new(self)
     end

data/lib/toolhound-ruby/inventory_item.rb

@@ -38,7 +38,7 @@ module Toolhound
         ],
         inventory_item_text:  [:var_serial_number, :var_user_field1, :var_user_field2, :var_user_field3, :var_bin],
         inventory:            [:int_category_id, :int_sub_category_id],
-        inventory_text:       [:var_description, :var_part_no],
+        inventory_text:       [:var_description, :var_part_no, {varUserField1: "varGlRevenue"}, {varUserField2: "varGlCOGSCode"}, {varUserField3: "varPhaseCode"}],
         inventory_id:         ["intInventoryIdID", {varInventoryID: "inventory_idid"}]
       }
 
@@ -66,7 +66,7 @@ module Toolhound
 
     end
 
-    def charges_for_entity(entity_id)
+    def charges_for_entity(entity_id, job_id=nil)
       joins = default_joins
       joins << "INNER JOIN tblInventoryType ON tblInventoryType.intInventoryTypeID = tblInventoryItem.intInventoryTypeID AND tblInventoryType.bolSerialized = 1"
       joins << "INNER JOIN(
@@ -76,11 +76,33 @@ module Toolhound
                   INNER JOIN tblRental ON tblRental.intRentalID = tblRentalDetail.intRentalID AND tblRental.intEntityID = '#{entity_id}'
                   GROUP BY tblRentalItem.intInventoryIDID
        ) AS tblRentalQuery ON tblRentalQuery.intInventoryIDID = tblInventoryID.intInventoryIdID"
+      joins << "LEFT OUTER JOIN (
+                  SELECT rc.intInventoryIDID, MAX(rc.intRentalChargeID) AS latest_id
+                  FROM tblRentalCharge as rc
+                  WHERE rc.intEntityID = '#{entity_id}'
+                  GROUP BY rc.intInventoryIDID
+        ) AS tblLatestCharge ON tblLatestCharge.intInventoryIDID = tblInventoryID.intInventoryIdID"
+      joins << "LEFT OUTER JOIN  (
+                  SELECT tblRentalCharge.intJobID, tblRentalCharge.intRentalChargeID
+                  FROM tblRentalCharge
+                  WHERE intEntityID = '#{entity_id}'
+                ) AS tblJobCharge ON tblJobCharge.intRentalChargeID = tblLatestCharge.latest_id"
+      joins << "LEFT OUTER JOIN tblJobText on tblJobText.intJobID = tblJobCharge.intJobID AND tblJobText.varLocaleID = '#{locale}'"
 
       selects = default_selects
+      selects[:job_text] = [:int_job_id, :int_job_text_id, :var_job_number, :var_job]
       selects[:rental_query] = [:dec_total_rent]
 
-      build_and_query(selects: selects, where: [], joins: joins, order: "tblInventoryText.varPartNo")
+      # (tblInventoryItem.intQOH=@p_QOH  OR @p_QOH  IS NULL)
+      wheres = []
+      if job_id
+        if job_id == :null
+          wheres << "(tblJobText.intJobID IS NULL)"
+        else
+          wheres << "(tblJobText.intJobID = #{job_id})"
+        end
+      end
+      build_and_query(selects: selects, where: wheres, joins: joins, order: "tblInventoryText.varPartNo")
 
       # SELECT tblInventoryItem.*, subquery1.total_rent FROM tblInventoryItem
       # INNER JOIN tblInventoryID ON tblInventoryItem.intInventoryItemID = tblInventoryID.intInventoryItemID

data/lib/toolhound-ruby/rental_charge.rb

@@ -81,7 +81,6 @@ module Toolhound
     end
 
 
-
     # rename_attributes intLocationID: 'location_id'
 
   end

data/lib/toolhound-ruby/version.rb

@@ -1,3 +1,3 @@
 module Toolhound
-  VERSION = "1.0.10"
+  VERSION = "1.0.11"
 end

metadata

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