your_ai_insight 1.0.9 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d87c237089e57905bc9d515c0794f85aa8e398bb37d45395fe20b7350193f51d
-  data.tar.gz: 52567467c46c142f6e5e23e27473a0c5dc67679130863513fdff295b77b6fbed
+  metadata.gz: 3241c83b9d80f1cffabef64df8128eb4d765b1c31667e256815257040bfb8861
+  data.tar.gz: 0ebe08ba0157fa78175d2f1188f57d62d97fee0c384fcf627bd20d897eb4e460
 SHA512:
-  metadata.gz: a5b17824ec83493d6323b9afba879fd95184ceaec6a4928183ff87fe12f42cbea21deec59b5433d5bd360fc0940a502378047b79c95d1eb08bc276637fc94378
-  data.tar.gz: f0fc882bd61d7741b3bc1bbda2504ee975a4bb5e5bd3a207a3af50c6c09f50d7be88060277d1e702d7056efec93fa68f499bcbc3a51b46db11495307b775e531
+  metadata.gz: 17e3e5509660d296e10855c05f3ac4df938ae9fc64974dc538c023d4b7e85d9d1ba994b7b205e7d157e88736559e6b6ef57e8b1f2fd66ef4580aba1d78fecada
+  data.tar.gz: 94b4d799978ea42d41354b7d57089972243866ce4e2d2fb0a059dafb1f33159c657fe033d61cdbdbc31588781598ff1c033befa0f91717c4bc45dbf1df8e2c96

data/app/services/your_ai_insight/facility_data_service.rb

@@ -80,15 +80,17 @@ module YourAiInsight
     end
 
     def jobs_by_status
-      rows = exec_query("SELECT #{@c.jobs_status_col}, COUNT(*) as cnt FROM #{j} #{job_where} GROUP BY #{@c.jobs_status_col}")
+      col  = @c.jobs_status_col
+      rows = exec_query("SELECT #{col}, COUNT(*) as cnt FROM #{j} #{job_where} GROUP BY #{col}")
       labels = { 0 => "new", 1 => "assigned", 2 => "active", 3 => "work_complete", 4 => "all_tasks_complete", 5 => "finaled" }
-      rows.each_with_object({}) { |r, h| h[labels[r["status"].to_i] || r["status"].to_s] = r["cnt"].to_i }
+      rows.each_with_object({}) { |r, h| h[labels[r[col].to_i] || r[col].to_s] = r["cnt"].to_i }
     rescue StandardError; {}
     end
 
     def jobs_by_priority
-      rows = exec_query("SELECT #{@c.jobs_priority_col}, COUNT(*) as cnt FROM #{j} #{job_where} AND #{@c.jobs_priority_col} IS NOT NULL GROUP BY #{@c.jobs_priority_col}")
-      rows.each_with_object({}) { |r, h| h[r["priority"]] = r["cnt"].to_i }
+      col  = @c.jobs_priority_col
+      rows = exec_query("SELECT #{col}, COUNT(*) as cnt FROM #{j} #{job_where} AND #{col} IS NOT NULL GROUP BY #{col}")
+      rows.each_with_object({}) { |r, h| h[r[col]] = r["cnt"].to_i }
     rescue StandardError; {}
     end
 
@@ -103,28 +105,28 @@ module YourAiInsight
 
     def jobs_on_hold_detail
       exec_query(<<~SQL)
-        SELECT j.id, j.name, j.#{@c.jobs_priority_col}, j.#{@c.jobs_status_col},
-               j.created_at, l.name as location_name, c.name as customer_name
+        SELECT #{j}.id, #{j}.name, #{j}.#{@c.jobs_priority_col}, #{j}.#{@c.jobs_status_col},
+               #{j}.created_at, l.name as location_name, c.name as customer_name
         FROM #{j}
-        LEFT JOIN #{loc} l ON l.id = j.#{@c.jobs_location_id_col}
-        LEFT JOIN #{cust} c ON c.id = j.#{@c.jobs_customer_id_col}
-        #{job_where} AND j.#{@c.jobs_hold_col} = true
-        ORDER BY j.created_at ASC LIMIT 25
+        LEFT JOIN #{loc} l ON l.id = #{j}.#{@c.jobs_location_id_col}
+        LEFT JOIN #{cust} c ON c.id = #{j}.#{@c.jobs_customer_id_col}
+        #{job_where} AND #{j}.#{@c.jobs_hold_col} = true
+        ORDER BY #{j}.created_at ASC LIMIT 25
       SQL
     rescue StandardError; []
     end
 
     def over_budget_jobs_detail
       exec_query(<<~SQL)
-        SELECT j.id, j.name,
+        SELECT #{j}.id, #{j}.name,
                COALESCE(SUM(e.#{@c.expenses_actual_col}),0) as total_actual,
                COALESCE(SUM(e.#{@c.expenses_budget_col}),0) as total_budget,
                l.name as location_name
         FROM #{j}
-        LEFT JOIN #{exp} e ON e.#{@c.expenses_job_id_col} = j.id
-        LEFT JOIN #{loc} l ON l.id = j.#{@c.jobs_location_id_col}
+        LEFT JOIN #{exp} e ON e.#{@c.expenses_job_id_col} = #{j}.id
+        LEFT JOIN #{loc} l ON l.id = #{j}.#{@c.jobs_location_id_col}
         #{job_where}
-        GROUP BY j.id, j.name, l.name
+        GROUP BY #{j}.id, #{j}.name, l.name
         HAVING COALESCE(SUM(e.#{@c.expenses_actual_col}),0) > COALESCE(SUM(e.#{@c.expenses_budget_col}),0)
         ORDER BY (COALESCE(SUM(e.#{@c.expenses_actual_col}),0) - COALESCE(SUM(e.#{@c.expenses_budget_col}),0)) DESC
         LIMIT 15
@@ -140,7 +142,7 @@ module YourAiInsight
       exec_query(<<~SQL)
         SELECT l.name, COUNT(j.id) as job_count
         FROM #{loc} l
-        LEFT JOIN #{j} ON j.#{@c.jobs_location_id_col} = l.id
+        LEFT JOIN #{j} j ON j.#{@c.jobs_location_id_col} = l.id
         #{location_join_where("l")}
         GROUP BY l.name ORDER BY job_count DESC LIMIT 10
       SQL
@@ -151,7 +153,7 @@ module YourAiInsight
       exec_query(<<~SQL)
         SELECT c.name, COUNT(j.id) as job_count
         FROM #{cust} c
-        LEFT JOIN #{j} ON j.#{@c.jobs_customer_id_col} = c.id
+        LEFT JOIN #{j} j ON j.#{@c.jobs_customer_id_col} = c.id
         #{customer_join_where("c")}
         GROUP BY c.name ORDER BY job_count DESC LIMIT 10
       SQL
@@ -191,15 +193,15 @@ module YourAiInsight
 
     def overdue_tasks_detail
       exec_query(<<~SQL)
-        SELECT t.id, t.name, t.#{@c.tasks_complete_col}, t.#{@c.tasks_budget_col},
-               t.#{@c.tasks_actual_col}, j.name as job_name, l.name as location_name
+        SELECT #{t}.id, #{t}.name, #{t}.#{@c.tasks_complete_col}, #{t}.#{@c.tasks_budget_col},
+               #{t}.#{@c.tasks_actual_col}, j.name as job_name, l.name as location_name
         FROM #{t}
-        LEFT JOIN #{j} ON j.id = t.#{@c.tasks_job_id_col}
+        LEFT JOIN #{j} j ON j.id = #{t}.#{@c.tasks_job_id_col}
         LEFT JOIN #{loc} l ON l.id = j.#{@c.jobs_location_id_col}
         #{task_where}
-        AND t.#{@c.tasks_complete_col} < CURRENT_DATE
-        AND t.#{@c.tasks_status_col} != 2
-        ORDER BY t.#{@c.tasks_complete_col} ASC LIMIT 20
+        AND #{t}.#{@c.tasks_complete_col} < CURRENT_DATE
+        AND #{t}.#{@c.tasks_status_col} != 2
+        ORDER BY #{t}.#{@c.tasks_complete_col} ASC LIMIT 20
       SQL
     rescue StandardError; []
     end
@@ -227,9 +229,9 @@ module YourAiInsight
       exec_query(<<~SQL)
         SELECT b.id, b.#{@c.bids_amount_col}, b.received, b.notes,
                t.name as task_name, j.name as job_name, v.name as vendor_name
-        FROM #{b}
-        LEFT JOIN #{t} ON #{t}.id = b.#{@c.bids_task_id_col}
-        LEFT JOIN #{j} ON #{j}.id = #{t}.#{@c.tasks_job_id_col}
+        FROM #{b} b
+        LEFT JOIN #{t} t ON t.id = b.#{@c.bids_task_id_col}
+        LEFT JOIN #{j} j ON j.id = t.#{@c.tasks_job_id_col}
         LEFT JOIN vendors v ON v.id = b.vendor_id
         WHERE (b.#{@c.bids_status_col} IS NULL OR b.#{@c.bids_status_col} NOT IN ('accepted','rejected'))
         AND b.created_at BETWEEN #{range_sql}
@@ -365,7 +367,7 @@ module YourAiInsight
     def br  = @c.budget_requests_table
 
     def range_sql
-      "'#{@date_range.first.to_s(:db)}' AND '#{@date_range.last.to_s(:db)}'"
+      "'#{@date_range.first.strftime('%Y-%m-%d %H:%M:%S')}' AND '#{@date_range.last.strftime('%Y-%m-%d %H:%M:%S')}'"
     end
 
     def range_label

data/lib/your_ai_insight/version.rb

@@ -1,3 +1,3 @@
 module YourAiInsight
-  VERSION = "1.0.9"
+  VERSION = "1.0.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: your_ai_insight
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.10
 platform: ruby
 authors:
 - AllPro IFM