projector_pws 0.1.12 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4824e8aba39fbc0d0ea303f332e2d6f827f1e27
-  data.tar.gz: d6cafd9787296f98eca31a0a479f9a7448da7796
+  metadata.gz: 6a71a8759a76f14373d291c3fd0c9e74ef3c46f4
+  data.tar.gz: a261e7110d7b3cb975cddfca78ae1a694a91710b
 SHA512:
-  metadata.gz: 86ddb97ea78fbf71adb34743386c691229dbf6b17fcd863283525629f7f175fd9068ab1291d2b473bda6d51861254bd4da2669e927fd7b585d345630a4ee563d
-  data.tar.gz: f835aceb04fef3b12abf6d596c0fa22351d89e29c3c5aa94fa8a590447bc2ff04741859d5c986f7d1489eaacf0fe721a3a0d631446be729d92a4e5abcdcd5499
+  metadata.gz: 24ea19fb4d9189d41a97ef9cb99a327f80f75fe3c4f921b5863808ded0dce5130931703a03e30b23365da1a791e3207ae2633fbed453e028d42c527fc88d32ae
+  data.tar.gz: e15a9ea7a6027a982d506f78342f46033c76b92e487b7a1ba7d23f44d63059fe69b03fadf90b07128564943c61f354b670c3319f02476c67664bde6cb3c04306

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2017 Paul Duncan
+Copyright (c) 2018 Paul Duncan
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/lib/projector_pws/version.rb

@@ -5,5 +5,5 @@
 module ProjectorPWS
 
 	# Version
-	VERSION = '0.1.12'
+	VERSION = '0.1.13'
 end

data/lib/projector_pws.rb

@@ -269,8 +269,9 @@ module ProjectorPWS
 		# Get active hours
 		active_hours = get_resource_active_hours c, ticket, resource, start_date, end_date
 
-		# Compute time off into active hours
+		# Compute time off and holidays into active hours
 		active_hours = active_hours - scheduled_hours[:toff]
+		active_hours = active_hours - scheduled_hours[:hday]
 
 		# Compute free time (active unscheduled time)
 		active_hours - scheduled_hours[:work]
@@ -307,6 +308,11 @@ module ProjectorPWS
 		time_off = [time_off] unless time_off.is_a? Array
 		time_off.compact!
 
+		# Extract Holidays
+		holidays = sched[:holidays][:pws_schedule_holiday] rescue []
+		holidays = [holidays] unless holidays.is_a? Array
+		holidays.compact!
+
 		# Run through time off { collect total minutes }
 		time_off_minutes = time_off.inject(0) do |a, e|
 
@@ -319,6 +325,9 @@ module ProjectorPWS
 			a + dates.inject(0) { |da, de| da + time_off_minutes(de[:time_off_minutes].to_i) }
 		end
 
+		# Run through Holidays { collect total minutes }
+		holiday_minutes = holidays.reject { |e| e[:date] < start_date || e[:date] > end_date || e[:date].saturday? || e[:date].sunday? }.inject(0) { |a, e| a + time_off_minutes(e[:time_off_minutes].to_i) }
+
 		# Run through schedule { collect total minutes }
 		scheduled_minutes = sched_work.inject(0) do |a, e|
 
@@ -333,7 +342,8 @@ module ProjectorPWS
 
 		{
 			work: scheduled_minutes.to_f / MINUTES_PER_HOUR.to_f,
-		    toff: time_off_minutes.to_f / MINUTES_PER_HOUR.to_f
+		    toff: time_off_minutes.to_f / MINUTES_PER_HOUR.to_f,
+		    hday: holiday_minutes.to_f / MINUTES_PER_HOUR.to_f
 		}
 	end
 

data/projector_pws.gemspec

@@ -6,8 +6,8 @@ require 'projector_pws/version'
 Gem::Specification.new do |spec|
 	spec.name = 'projector_pws'
 	spec.version = ProjectorPWS::VERSION
-	spec.authors = ['Eresse']
-	spec.email = ['eresse@eresse.net']
+	spec.authors = ['Paul DUNCAN']
+	spec.email = ['pduncan@openwt.com']
 
 	spec.summary = 'Projector PWS Client Library'
 	spec.description = 'Provides access to Projector PSA\'s Web Services (PWS)'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: projector_pws
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.13
 platform: ruby
 authors:
-- Eresse
+- Paul DUNCAN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-21 00:00:00.000000000 Z
+date: 2018-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -82,7 +82,7 @@ dependencies:
         version: '0'
 description: Provides access to Projector PSA's Web Services (PWS)
 email:
-- eresse@eresse.net
+- pduncan@openwt.com
 executables: []
 extensions: []
 extra_rdoc_files: []