projector_pws 0.1.16 → 0.1.17
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/projector_pws.rb +7 -7
- data/lib/projector_pws/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: eba0be738cbe3290968fc280047b81329d14cebb
|
4
|
+
data.tar.gz: 7a7f36a7d3b1a12caf5b8c5cce2497d5c3371861
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 09a76186ed27f8bcb63978714fe1502e7bf4eeb345f3dd2f61b16ebfc24575192843b745e67da1e492e7c966fcd2c807d98bc6cc880df955417bd87c584e059d
|
7
|
+
data.tar.gz: 9678de18516e3afb01fb01e0e15bfb6cf7e7356607c5c9580152fb2ec324d3389d21ecdd4cafcf66115512e0e6feb4892b5fcb7be6cdce4cfbdf3604e75143c0
|
data/lib/projector_pws.rb
CHANGED
@@ -278,13 +278,13 @@ module ProjectorPWS
|
|
278
278
|
end
|
279
279
|
|
280
280
|
# Get Resource Free Hours
|
281
|
-
def self.get_resource_free_hours c, ticket, resource, start_date = current_week_start, end_date = current_week_end
|
281
|
+
def self.get_resource_free_hours c, ticket, resource, start_date = current_week_start, end_date = current_week_end, scheduled_hours = nil, wsched = nil
|
282
282
|
|
283
283
|
# Get scheduled hours
|
284
|
-
scheduled_hours
|
284
|
+
scheduled_hours ||= get_resource_scheduled_hours c, ticket, resource, start_date, end_date
|
285
285
|
|
286
286
|
# Get active hours
|
287
|
-
active_hours = get_resource_active_hours c, ticket, resource, start_date, end_date
|
287
|
+
active_hours = get_resource_active_hours c, ticket, resource, start_date, end_date, wsched
|
288
288
|
|
289
289
|
# Compute time off and holidays into active hours
|
290
290
|
active_hours = active_hours - scheduled_hours[:toff]
|
@@ -295,10 +295,10 @@ module ProjectorPWS
|
|
295
295
|
end
|
296
296
|
|
297
297
|
# Get Resource Active Hours
|
298
|
-
def self.get_resource_active_hours c, ticket, resource, start_date = current_week_start, end_date = current_week_end
|
298
|
+
def self.get_resource_active_hours c, ticket, resource, start_date = current_week_start, end_date = current_week_end, wsched = nil
|
299
299
|
|
300
300
|
# Acquire working schedule for resource
|
301
|
-
wsched
|
301
|
+
wsched ||= ProjectorPWS.get_resource_working_schedule(c, ticket, resource[:resource_uid], start_date, end_date)[:pws_working_schedule_day] rescue(return(0))
|
302
302
|
wsched = [wsched] unless wsched.is_a? Array
|
303
303
|
wsched.compact!
|
304
304
|
|
@@ -310,10 +310,10 @@ module ProjectorPWS
|
|
310
310
|
end
|
311
311
|
|
312
312
|
# Get Resource Scheduled Hours
|
313
|
-
def self.get_resource_scheduled_hours c, ticket, resource, start_date = current_week_start, end_date = current_week_end
|
313
|
+
def self.get_resource_scheduled_hours c, ticket, resource, start_date = current_week_start, end_date = current_week_end, sched = nil
|
314
314
|
|
315
315
|
# Get schedule
|
316
|
-
sched
|
316
|
+
sched ||= get_resource_schedule(c, ticket, resource[:resource_uid], start_date, end_date) rescue(return({ work: 0, toff: 0, hday: 0 }))
|
317
317
|
|
318
318
|
# Extract scheduled work
|
319
319
|
sched_work = sched[:roles][:pws_schedule_role] rescue []
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: projector_pws
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.1.
|
4
|
+
version: 0.1.17
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Paul DUNCAN
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2018-
|
11
|
+
date: 2018-08-02 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|