projector_pws 0.1.13 → 0.1.14
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 +2 -2
- 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: 6412533eddc083b38fee8c7647bcf08a026a4f1d
|
|
4
|
+
data.tar.gz: 7d6445454acbc6693fdb9263a0be1c2ea30c4053
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 986779fb5b02e684b6dfb6ae28ee7f3953226389a159ca2c9d262e286d18631dcf7d87c49e28072643db1fe1291314d4bee5d35c83b30695323f5e45aaa67144
|
|
7
|
+
data.tar.gz: 521b3129e1bd2956588b858a61ac90a761268eb1da852a319e4efdc322bca443d9f9a73c54f85099f15ee385e65ffe6a672ad9932f65809ee1330a6c2085e54a
|
data/lib/projector_pws.rb
CHANGED
|
@@ -271,7 +271,7 @@ module ProjectorPWS
|
|
|
271
271
|
|
|
272
272
|
# Compute time off and holidays into active hours
|
|
273
273
|
active_hours = active_hours - scheduled_hours[:toff]
|
|
274
|
-
active_hours = active_hours - scheduled_hours[:hday]
|
|
274
|
+
active_hours = active_hours - (scheduled_hours[:hday] || 0)
|
|
275
275
|
|
|
276
276
|
# Compute free time (active unscheduled time)
|
|
277
277
|
active_hours - scheduled_hours[:work]
|
|
@@ -296,7 +296,7 @@ module ProjectorPWS
|
|
|
296
296
|
def self.get_resource_scheduled_hours c, ticket, resource, start_date = current_week_start, end_date = current_week_end
|
|
297
297
|
|
|
298
298
|
# Get schedule
|
|
299
|
-
sched = get_resource_schedule(c, ticket, resource[:resource_uid], start_date, end_date) rescue(return({ work: 0, toff: 0 }))
|
|
299
|
+
sched = get_resource_schedule(c, ticket, resource[:resource_uid], start_date, end_date) rescue(return({ work: 0, toff: 0, hday: 0 }))
|
|
300
300
|
|
|
301
301
|
# Extract scheduled work
|
|
302
302
|
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.14
|
|
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-03-01 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: bundler
|