bpm_manager 0.9.6 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d8294133359fe4d3f79b7d8df035fae01f9013f
-  data.tar.gz: 804193e23a7f56559ad8e72c930d26a277919142
+  metadata.gz: 32df44da9683da124d48f2e91ddc01a29a063879
+  data.tar.gz: 0db0e19a356e36f03f1cc8a2ee43d600a32f6d18
 SHA512:
-  metadata.gz: d956f349b2608cb98465a343f44aebd0389e83a8bde7ae85bf1d49131a69e883369dd7f7f5b3d91e22889f2d84a35d68d5b8bdb6bee3756436ea0f46a2e2d417
-  data.tar.gz: bfee484819d942bde6b09e6cbcbe3cc6d8803487de5e86aa735e824cb1aeca00cc5b7bcfd3123eacdccf38dfca18268e9468bd25c620de8f8de10ae0f482ae21
+  metadata.gz: 5650cdb0ebf13ac4b5bfb05cf12ddf03f442561f7f9572bd51cc0b5786aaf4c95590772de799312226b49b721504de229b48e5bfe1f1fd875295e6be498cd6e9
+  data.tar.gz: e876beb1fcf85e101a119cb986ef5b1f4e9d6c6c7fa9081462f660ed0430333965f35f81142f130a20efd6ce35a74d92eaf8053b05e64baef5e847198fac6466

data/lib/bpm_manager/red_hat.rb

@@ -146,22 +146,21 @@ module BpmManager
     end
     
     # Private class methods
-    def self.calculate_sla(start, sla_hours=0, offset=20)
-      unless sla_hours > 0
-        (start.to_f + ((sla_hours.to_f * 7*24*60*60))*((100-offset)/100)) <= Time.now.utc.to_f ? 0 : ((start.to_f + (sla_hours.to_f * 7*24*60*60) <= Time.now.utc.to_f) ? 1 : 2)
-      else
-        0
-      end
+    def self.calculate_sla(start, sla_hours = 0.0, offset = 20)
+      sla_hours = sla_hours.to_f * 3600   # converts to seconds
+
+      sla_hours > 0 ? (start.to_f + sla_hours) * ((100 - offset) / 100) <= Time.now.utc.to_f ? 0 : (start.to_f + sla_hours <= Time.now.utc.to_f ? 1 : 2) : 0
     end
     private_class_method :calculate_sla
     
     def self.calculate_sla_percent(start, sla_hours=0, offset=20)
+      sla_hours = sla_hours.to_f * 3600   # converts to seconds
       percent = OpenStruct.new
       total = Time.now.utc.to_f - start.to_f
       
-      percent.green = sla_hours > 0 ? (start.to_f + ((sla_hours.to_f * 7*24*60*60)) * ((100-offset)/100)) / total * 100 : 100
-      percent.yellow = sla_hours > 0 ? (start.to_f + ((sla_hours.to_f * 7*24*60*60)) / total * 100) - percent.green : 0
-      percent.red = sla_hours > 0 ? 100 - percent.yellow - percent.green : 0
+      percent.green  = sla_hours > 0 ? ((start.to_f + sla_hours) * (100 - offset) / 100) * 100 / total : 100
+      percent.yellow = sla_hours > 0 ? ((start.to_f + sla_hours) * 100 / total) - percent.green : 0
+      percent.red    = sla_hours > 0 ? 100 - percent.yellow - percent.green : 0
       
       return percent
     end

data/lib/bpm_manager/version.rb

@@ -1,3 +1,3 @@
 module BpmManager
-  VERSION = "0.9.6"
+  VERSION = "0.9.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bpm_manager
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors:
 - Ariel Presa