toolhound-ruby 1.0.32 → 1.0.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c554bbb3b2f61ee999968cf8f330c5509437e96e
-  data.tar.gz: 7e637af12af27a34901f2cc22a880f05fff3002e
+  metadata.gz: a0a074d0a368c009ff282e578f2825a84aa1085d
+  data.tar.gz: fe00a3c1678033d581688b68514c93a2db0d58f5
 SHA512:
-  metadata.gz: f42674cfdf9780051371cff066ae7507d47929c000656126cc81c56a228eb66a2cf77f3d7c0dfeba255988d246f517ffc3522f484c1819dec55e222bc6be8081
-  data.tar.gz: 6f02e25cf1779f2f968b03316c828bae1b66ea1e71cdcbc04deefd07f2da228dcb6cc95c746bb0fd32b5b62524bb586962cd93a2bf1c60abd0e4cc1f7db38bee
+  metadata.gz: e9107c0798c16c6d7a7adb599192a3962cfbdad1c31be02b09825fd4eefe491173b95381d087a127b6dd9ee3938d97a5fbbe6beb11fcaa190e3901918c19ea00
+  data.tar.gz: 07326504bf65b87b3825a5ebe4af11f765c2b48ef7a678f33d995a72f7b6d2fc69d14fca6a660a9f65b8dcd1cdd04395f8f04a0b456971f221be44cea1921278

data/lib/toolhound-ruby/base.rb

@@ -231,6 +231,10 @@ module Toolhound
       arr.join(" AND ")
     end
 
+    def build_group(groups)
+      groups
+    end
+
     def _build_where(wheres)
       arr = []
       case wheres.class.to_s
@@ -299,8 +303,9 @@ module Toolhound
       data    = []
       begin
         results = connection.execute(query)
+        opts = {cache_rows: false}.merge(options || {})
 
-        results.each(:cache_rows => false) do |row|
+        results.each(opts) do |row|
           data << transform_attributes(row)
         end
         data
@@ -312,11 +317,72 @@ module Toolhound
       finish_statement_handle(results)
     end
 
+    def update_query(query, options)
+      begin
+        result = connection.execute(query)
+        result.do
+      rescue TinyTds::Error
+        client.reset_connection
+        retry
+      end
+    ensure
+      finish_statement_handle(result)
+    end
+
     def build_and_query(options, query_options = {})
       sql = build_sql(options)
       results = query(sql, query_options)
     end
 
+    def update(options, query_options = {})
+      sql = build_update_sql(options, query_options)
+
+      debug = query_options[:debug]
+
+      if sql && debug != true
+        update_query(sql, query_options)
+      end
+
+    end
+
+    def build_update_sql(options, query_options = {})
+      table    = options[:table]  ? formatted_table_name(options[:table]) : table_name
+      attributes  = build_update_attributes(options[:attributes])
+      sql         = nil
+      where       = build_where(options[:where])
+      if attributes.length > 0
+        attributes  = attributes.join(", ")
+
+        sql = "UPDATE #{table} SET #{attributes} WHERE #{where}"
+        puts sql
+      end
+
+      sql
+    #   update tblCountFinal set
+		# 	intQuantity = isnull(intQuantity,0) + isnull(@p_Quantity,0),
+		# 	intQOH = isnull(intQOH,0) + isnull(@p_QuantityOnHand,0)
+		# where intCountFinalID = @CountFinalID
+    end
+
+    def build_update_attributes(attributes)
+      arr = []
+      case attributes.class.to_s
+      when "String"
+        arr << attributes
+      when "Hash"
+        attributes.each do |k, v|
+          name = formmatted_column_name(k)
+          arr << "#{name} = '#{v}'"
+        end
+      when "Array"
+        attributes.each do |v|
+          arr += build_update_attributes(v)
+        end
+      end
+      arr
+
+    end
+
 
     def build_sql(obj)
       limit   = obj[:limit]
@@ -325,14 +391,16 @@ module Toolhound
       from    = obj[:from]  ? formatted_table_name(obj[:from]) : table_name
       where   = obj[:where] ? build_where(obj[:where]) : nil
       order   = obj[:order]
+      group   = obj[:group] ? build_group(obj[:group]) : nil
 
       selects = "*" if selects.strip.length == 0
 
       limit_str   = limit ? "TOP(#{limit})" : ""
-      where_str   = where.length > 0 ? "WHERE #{where}"    : ""
+      where_str   = where && where.length > 0 ? "WHERE #{where}"    : ""
       order_str   = order ? "ORDER BY #{order}" : ""
+      group_str   = group ? "GROUP BY #{group}" : ""
 
-      sql = "SELECT #{limit_str} #{selects} FROM #{from} #{joins} #{where_str} #{order_str}"
+      sql = "SELECT #{limit_str} #{selects} FROM #{from} #{joins} #{where_str} #{order_str} #{group_str}"
       puts sql
       sql
     end

data/lib/toolhound-ruby/inventory_item.rb

@@ -66,13 +66,53 @@ module Toolhound
 
     end
 
+    def count(options = {})
+
+      entity_id = options[:entity_id]
+
+      selects = {
+        job_text: [:int_job_id],
+        inventory_item: [{ int_inventory_item_id: {as: :tool_count, agg: :count} }] #[{"count(*)" => {raw: true, as: :tools_assigned}}]
+      }
+      joins = []
+      joins << "INNER JOIN tblInventory ON (tblInventory.intInventoryID = tblInventoryItem.intInventoryID AND tblInventory.bolDeleted = 0)"
+      joins << "INNER JOIN tblInventoryID ON tblInventoryID.intInventoryItemID = tblInventoryItem.intInventoryItemID"
+      joins << "INNER JOIN tblInventoryType ON tblInventoryType.intInventoryTypeID = tblInventoryItem.intInventoryTypeID AND tblInventoryType.bolSerialized = 1"
+      joins << "INNER JOIN(
+        SELECT tblRentalItem.intInventoryIDID FROM tblRentalItem
+        INNER JOIN tblRentalDetail ON tblRentalDetail.intRentalDetailID = tblRentalItem.intRentalDetailID
+        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 intJobID, intRentalChargeID, intRentalItemID
+                  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}'"
+
+      build_and_query(selects: selects, joins: joins, group: "tblJobText.intJobID")
+
+      # GROUP BY tblJobText.intJobID
+
+    end
+
     def charges(options = {})
       options = (options || {}).dup
 
       job_id      = options[:job_id]
       entity_id   = options[:entity_id]
       order       = options[:order] || "tblInventoryText.varPartNo"
-
+      # 249
 
       joins                 = default_joins
       entity_query          = ""
@@ -130,7 +170,35 @@ module Toolhound
 
     end
 
+    def reassign(options)
+      options         = (options || {}).dup
+      entity_id       = options[:entity_id]
+      inventory_id_id = options[:inventory_id_id]
+      job_id          = options[:job_id]
+
+      query_opts      = {}
+      query_opts[:debug] = options.delete(:debug) if options[:debug]
 
+      raise ArgumentError.new(:entity_id)       unless entity_id
+      raise ArgumentError.new(:inventory_id_id) unless inventory_id_id
+      raise ArgumentError.new(:job_id)          unless job_id
 
+      sql = build_sql(from: "job", where: [{"job.int_job_id" => job_id}], limit: 1)
+      result = query(sql, first: true)
+
+      raise ArgumentError.new(:no_job) if result.length == 0
+
+
+      sql = "SELECT * FROM tblRentalCharge WHERE intInventoryIDID = '#{inventory_id_id}' AND intEntityID = '#{entity_id}' "
+      result = query(sql, first: true)
+
+      raise ArgumentError.new(:no_charge) if result.length == 0
+
+      id = result.first[:rental_charge_id]
+      update({attributes: {
+        int_job_id: job_id
+      }, table: "rental_charge", where: [{"rental_charge.int_rental_charge_id" => id}]}, query_opts)
+
+    end
   end
 end

data/lib/toolhound-ruby/version.rb

@@ -1,3 +1,3 @@
 module Toolhound
-  VERSION = "1.0.32"
+  VERSION = "1.0.33"
 end

metadata

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