projector_pws 0.1.17 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eba0be738cbe3290968fc280047b81329d14cebb
-  data.tar.gz: 7a7f36a7d3b1a12caf5b8c5cce2497d5c3371861
+  metadata.gz: fe9345d3a835dd4be1fef4da59181fa8002a303e
+  data.tar.gz: 47f837cdbc2dd97fcd3007eeefda5c14729cb516
 SHA512:
-  metadata.gz: 09a76186ed27f8bcb63978714fe1502e7bf4eeb345f3dd2f61b16ebfc24575192843b745e67da1e492e7c966fcd2c807d98bc6cc880df955417bd87c584e059d
-  data.tar.gz: 9678de18516e3afb01fb01e0e15bfb6cf7e7356607c5c9580152fb2ec324d3389d21ecdd4cafcf66115512e0e6feb4892b5fcb7be6cdce4cfbdf3604e75143c0
+  metadata.gz: 09d6d7d1ab1dba0048197874c2e7d7776d4e0c5e8b1221c65b64eeb266209fba29db01ab116e3065b6977ea693515112fe83f27d127734a5f0163d0b295444a2
+  data.tar.gz: ccd88edbc8a8583a7ed00721e256ebd01628ab2cc403fdb1918cdd83111da94c9dcbf4f58b0467eb53b36db63123d0fa7e3405327eeb52ec29e4258a480c9443

data/lib/projector_pws/version.rb

@@ -5,5 +5,5 @@
 module ProjectorPWS
 
 	# Version
-	VERSION = '0.1.17'
+	VERSION = '0.1.18'
 end

data/lib/projector_pws.rb

@@ -277,11 +277,18 @@ module ProjectorPWS
 		} }.select { |x| x[:free_hours] > 0 }
 	end
 
-	# Get Resource Free Hours
-	def self.get_resource_free_hours c, ticket, resource, start_date = current_week_start, end_date = current_week_end, scheduled_hours = nil, wsched = nil
+	# Compute Resource Active Hours
+	def self.compute_resource_active_hours wsched
 
-		# Get scheduled hours
-		scheduled_hours ||= get_resource_scheduled_hours c, ticket, resource, start_date, end_date
+		# Extract Working Minutes
+		work = wsched.inject(0) { |a, e| a + e[:working_minutes].to_i }
+
+		# Determine Active Hours
+		work.to_f / MINUTES_PER_HOUR.to_f
+	end
+
+	# Compute Resource Free Hours
+	def self.compute_resource_free_hours scheduled_hours, wsched
 
 		# Get active hours
 		active_hours = get_resource_active_hours c, ticket, resource, start_date, end_date, wsched
@@ -294,6 +301,14 @@ module ProjectorPWS
 		active_hours - scheduled_hours[:work]
 	end
 
+	# Get Resource Free Hours
+	def self.get_resource_free_hours c, ticket, resource, start_date = current_week_start, end_date = current_week_end, scheduled_hours = nil, wsched = nil
+
+		# Get scheduled hours
+		scheduled_hours ||= get_resource_scheduled_hours c, ticket, resource, start_date, end_date
+		compute_resource_free_hours scheduled_hours, wsched
+	end
+
 	# Get Resource Active Hours
 	def self.get_resource_active_hours c, ticket, resource, start_date = current_week_start, end_date = current_week_end, wsched = nil
 
@@ -301,12 +316,7 @@ module ProjectorPWS
 		wsched ||= ProjectorPWS.get_resource_working_schedule(c, ticket, resource[:resource_uid], start_date, end_date)[:pws_working_schedule_day] rescue(return(0))
 		wsched = [wsched] unless wsched.is_a? Array
 		wsched.compact!
-
-		# Extract Working Minutes
-		work = wsched.inject(0) { |a, e| a + e[:working_minutes].to_i }
-
-		# Determine Active Hours
-		work.to_f / MINUTES_PER_HOUR.to_f
+		compute_resource_active_hours wsched
 	end
 
 	# Get Resource Scheduled Hours

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: projector_pws
 version: !ruby/object:Gem::Version
-  version: 0.1.17
+  version: 0.1.18
 platform: ruby
 authors:
 - Paul DUNCAN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-02 00:00:00.000000000 Z
+date: 2018-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler