projector_pws 0.1.16 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 986faf579de0d70ae6cd123ce8cc2cf12ccf49f8
-  data.tar.gz: b2cc67b0ec4fe0f581a9a2620614912896851e53
+  metadata.gz: eba0be738cbe3290968fc280047b81329d14cebb
+  data.tar.gz: 7a7f36a7d3b1a12caf5b8c5cce2497d5c3371861
 SHA512:
-  metadata.gz: dda0256b55f2babca4695a7a03333840b8c0a062dcf790320374f0d64a5ba4fc56cce41ce4f39c11ce8b075fb1477e033ed74cb6a0400147522ccb1cb73471ba
-  data.tar.gz: 7499b280d6861e87a4bc2f86494f892070829ad721b5ba165c27c3073bf37314d7104c585ec73ee12d1f24d87343f4666c74a107eda8f2bd7f95760156b2ffdb
+  metadata.gz: 09a76186ed27f8bcb63978714fe1502e7bf4eeb345f3dd2f61b16ebfc24575192843b745e67da1e492e7c966fcd2c807d98bc6cc880df955417bd87c584e059d
+  data.tar.gz: 9678de18516e3afb01fb01e0e15bfb6cf7e7356607c5c9580152fb2ec324d3389d21ecdd4cafcf66115512e0e6feb4892b5fcb7be6cdce4cfbdf3604e75143c0

data/lib/projector_pws.rb

@@ -278,13 +278,13 @@ module ProjectorPWS
 	end
 
 	# Get Resource Free Hours
-	def self.get_resource_free_hours c, ticket, resource, start_date = current_week_start, end_date = current_week_end
+	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
+		scheduled_hours ||= get_resource_scheduled_hours c, ticket, resource, start_date, end_date
 
 		# Get active hours
-		active_hours = get_resource_active_hours c, ticket, resource, start_date, end_date
+		active_hours = get_resource_active_hours c, ticket, resource, start_date, end_date, wsched
 
 		# Compute time off and holidays into active hours
 		active_hours = active_hours - scheduled_hours[:toff]
@@ -295,10 +295,10 @@ module ProjectorPWS
 	end
 
 	# Get Resource Active Hours
-	def self.get_resource_active_hours c, ticket, resource, start_date = current_week_start, end_date = current_week_end
+	def self.get_resource_active_hours c, ticket, resource, start_date = current_week_start, end_date = current_week_end, wsched = nil
 
 		# Acquire working schedule for resource
-		wsched = ProjectorPWS.get_resource_working_schedule(c, ticket, resource[:resource_uid], start_date, end_date)[:pws_working_schedule_day] rescue(return(0))
+		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!
 
@@ -310,10 +310,10 @@ module ProjectorPWS
 	end
 
 	# Get Resource Scheduled Hours
-	def self.get_resource_scheduled_hours c, ticket, resource, start_date = current_week_start, end_date = current_week_end
+	def self.get_resource_scheduled_hours c, ticket, resource, start_date = current_week_start, end_date = current_week_end, sched = nil
 
 		# Get schedule
-		sched = get_resource_schedule(c, ticket, resource[:resource_uid], start_date, end_date) rescue(return({ work: 0, toff: 0, hday: 0 }))
+		sched ||= get_resource_schedule(c, ticket, resource[:resource_uid], start_date, end_date) rescue(return({ work: 0, toff: 0, hday: 0 }))
 
 		# Extract scheduled work
 		sched_work = sched[:roles][:pws_schedule_role] rescue []

data/lib/projector_pws/version.rb

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

metadata

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