dcidev_approval 0.0.3 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a68030ef24f3a7e3ef969c1aad28d6f73eb5d3ee51ae483cd6278524b89c5c6b
-  data.tar.gz: 191f42224f68dcb99f5ae3efae7f2ed2967b9405feeba9dee4335367884342d0
+  metadata.gz: b0f4b607b87d0a4885cb7eed7fa8a669e82e9e6b2fb79f9af7fdf79410b1fcff
+  data.tar.gz: 24ce7542734d119282afc7241a14125c64e1f90000474986b79ea5321f308f66
 SHA512:
-  metadata.gz: 571a57ad5daa96bcb61f36db973c8f35126c70ca6c229128a329273f8aeb3985000de6efeb588bbe4075b3d4a41b3fd118bfca5042bf78b896c651d3ed4c191b
-  data.tar.gz: 889b71359e05516fe125ea4422424e07026ac0df5c5ae5ff1adff09a525c078ea98c3053fd30c7d5f1b900db2cfcbf385b3f9df76c1c952131a9362bd7e1a44a
+  metadata.gz: 3ea5cf3de84456bb54c7452e61f871829aa6717325815dd6d153e030ee31a5e2c63db09cc93a9f5783b0630057b86af04bd6cf8dfad4e0165fd0a9f875e15bec
+  data.tar.gz: e5bee4b7d43226dad75d04ac0ba0b4fd6380d6b8d3bc1fd3f27ff8c98c4e951af61fab0f5725fabda1200eea61edf88c260b3811535b3f21f8b5a49f69700f19

data/lib/dcidev_approval.rb

@@ -44,7 +44,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
@@ -52,7 +52,7 @@ module DcidevApproval
     def created_by
       log = self.activity_logs.try(:first)
       {
-        created_by: log.present? && log.try(:agent).try(:name).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",
+        created_by: log.present? && log.try(:agent).try(:name).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",
         created_at: self.try(:created_at) || log.try(:created_at)
       }
     end
@@ -61,7 +61,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) : 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
@@ -109,7 +109,7 @@ module DcidevApproval
           # ActivityLog.write("#{agent.is_admin? ? nil : "Request "}Edit #{self.class.to_s}", request, agent, menu, self) if params.log
         end
       end
-      yield true
+      yield self
     end
 
     def approval(params)
@@ -118,7 +118,7 @@ module DcidevApproval
       elsif params.status == "rejected"
         self.delete_changes
       end
-      yield true
+      yield self
     end
 
     def delete_data(agent, bypass = true)
@@ -143,15 +143,15 @@ module DcidevApproval
           data = params.merge!({ status: :approved })
           d = self.new_from_params(data)
           raise d.errors.full_messages.join(", ") unless d.save
+          yield d
           # ActivityLog.write("#{agent.is_admin? ? nil : "Request "} Add #{self.to_s}", request, agent, menu, d) if params.log
         end
       else
         d = self.new_from_params(params)
         d.status = agent.is_admin? ? :approved : :waiting
         raise d.errors.full_messages.join(", ") unless d.save
-        # ActivityLog.write("Add #{self.to_s}", request, agent, menu, d) if params.log
+        yield d
       end
-      yield d
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dcidev_approval
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.7
 platform: ruby
 authors:
 - Punto Damar P
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-25 00:00:00.000000000 Z
+date: 2022-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dcidev_active_record
@@ -51,7 +51,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.0.6
 signing_key:
 specification_version: 4
 summary: Logic for implementing record changes approval