dcidev_approval 0.0.4 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20f66e60b4649eaa1fd5dac521750139be8ea81509dea70b84853545ed3cee77
-  data.tar.gz: 60490cb5777e4774311d10402e1a0ef5e746cbe43e9146d6109e558fdd185a1b
+  metadata.gz: 113b68a6c6cc3aa09902b2ede950d44deaa4a3f9cfe8a72c4ab4e1a9051e5ca7
+  data.tar.gz: 489f1c91e45864e4d88ab12bd32dd34f9eafc1c1e381d9d8be92884703e7f316
 SHA512:
-  metadata.gz: 8e6b9be5f4875dbbfaf11ee80d8b36da30fb1981b1ef764c5de2e7ba93826e5b12844dc08510937f8b329329c49f3324a44acb49612a6131b9a2fffdf4ba189c
-  data.tar.gz: 95e8dcca531fc23e1c00a6ad611d1bd5c3bcba02c7cb3749f1263af8c108b86364987f2fe6b2e005a4c7f0b17f5d7c3e334fe2f3e5bce61b29f98267aea9b4ad
+  metadata.gz: 6b59254605c479585ecd5289dfd6e1f41c15aa4cde5888a4c1f834633a1f56e13d04fe1570762507adf249411d11234e0aaf102bd13e150e9f2dfbe98c40aa98
+  data.tar.gz: c1af9bc61fb9ae9fc0ce9da4daef4b1c9dc44975f04a4a68ca07371f4109ea7c3569f508243ed8fd799c0cb0b354aa2b3e106f27083973ff9875b307bb5becd5

data/lib/dcidev_approval.rb

@@ -36,6 +36,18 @@ module DcidevApproval
       self.change_status == "pending_delete"
     end
 
+    def approved?
+      self.status == "approved"
+    end
+
+    def rejected?
+        self.status == "rejected"
+    end
+
+    def waiting?
+        self.status == "waiting"
+    end
+
     def last_modified_by
       # p self.audit_trail
       if self.try(:change_status).present? && self.try(:change_status) == 'pending_delete'
@@ -44,7 +56,7 @@ module DcidevApproval
         log = self.activity_logs.where("activity LIKE '%edit%'").limit(1).order(created_at: :desc).try(:first)
       end
       {
-        modified_by: log.present? ? log.try(:agent).try(:name).to_s + " (#{log.try(:agent).try(:username).to_s}[#{log.try(:agent).try(:roles).try(:first).try(:name)}])" : "System",
+        modified_by: log.present? ? log.try(:agent).try(:name).to_s + " (#{log.try(:agent).try(:username).to_s} | #{log.try(:agent).try(:roles).try(:first).try(:name)})" : "System",
         modified_at: log.present? ? log.try(:created_at) || self.try(:updated_at) || self.try(:created_at) : nil
       }
     end
@@ -61,7 +73,7 @@ module DcidevApproval
       last_approve = self.activity_logs.where("activity LIKE '%approv%'").limit(1).order(created_at: :desc).try(:first)
       last_entry = self.activity_logs.last
       {
-        approved_by: last_approve.try(:id) == last_entry.try(:id) ? last_approve.try(:agent).try(:name).to_s + " (#{log.try(:agent).try(:username).to_s} | #{log.try(:agent).try(:roles).try(:first).try(:name)})"  : nil,
+        approved_by: last_approve.try(:id) == last_entry.try(:id) ? last_approve.try(:agent).try(:name).to_s + " (#{last_approve.try(:agent).try(:username).to_s} | #{last_approve.try(:agent).try(:roles).try(:first).try(:name)})"  : nil,
         approved_at: last_approve.try(:id) == last_entry.try(:id) ? last_approve.try(:created_at) : nil
       }
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dcidev_approval
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.8
 platform: ruby
 authors:
 - Punto Damar P
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-31 00:00:00.000000000 Z
+date: 2022-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dcidev_active_record