dcidev_approval 0.0.2 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b89d5bed50149b2067004980c70e15f4a4dd63eb4af17c18bbcb1f9a40fe592e
-  data.tar.gz: 4fd39a2c3f38e2635c40035d4d2dcd07f524e74a742f3ca4018153edab7cb4cb
+  metadata.gz: dccc3da34c00aa8f2981d62d7ebe9bfe06a504cd4a641931e06ea77cc704bbde
+  data.tar.gz: 1434f3cb37dba0c6777654d3fac368d04954acb3d490aa72fdedde00a9222c38
 SHA512:
-  metadata.gz: a4f1bf7253a23ed2b65a839d3f572f148430fc561c1eec01496cf83ec05d0f2056310c470bbd56fdd044faefe8c263b8704377ffc9be84c431140f7be24abf0c
-  data.tar.gz: f9d5add77f39eb625a564eddf8c33a6a9977ed2ec3f913fa7712527fe9f051c74bafbbaa5b76e266850b076fb6f95e1a98e50bcedb3d1ff8042553f11b573d7a
+  metadata.gz: ccc058f85395914fe3e224e6779e53fdc6574e044e51187a401d1c77828aa99792cca8d7d20e7bcf697827390489025537c5dd91c1a6839553381152cac1b1c9
+  data.tar.gz: a6acf538b14fc54816eb0c0a33e7f0ca177e6395625757cc23a4623dc43603ee874bf32635ed9c41ba11ff36d5d4c854c79290ff6139fa0458712cf0b9636e14

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)}])" : nil,
+        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,12 +61,12 @@ 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
 
-    def approve_changes(params, agent, request)
+    def approve_changes
 
       if self.change_status.nil? && %w[waiting rejected].include?(self.status)
         raise self.errors.full_messages.join(", ") unless self.update(status: :approved, data_changes: nil, change_status: nil)
@@ -89,13 +89,13 @@ module DcidevApproval
       end
     end
 
-    def delete_changes(params, agent, request)
+    def delete_changes
       # return unless %w[pending_update pending_delete].include? self.change_status
       raise self.errors.full_messages.join(", ") unless self.update(data_changes: nil, change_status: nil, status: self.status == "waiting" ? :rejected : :approved)
       # ActivityLog.write("Reject changes to #{self.class.to_s}", request, agent, menu, self) if params.log
     end
 
-    def edit_data(params, agent, request, bypass = true, &block)
+    def edit_data(params, agent, bypass = true)
       raise "data still waiting for approval" if self.waiting_approval?
       if bypass
         raise self.errors.full_messages.join(", ") unless self.update_by_params(params, false)
@@ -112,16 +112,16 @@ module DcidevApproval
       yield true
     end
 
-    def approval(params, agent, request)
+    def approval(params)
       if params.status == "approved"
-        self.approve_changes(params, agent, request)
+        self.approve_changes
       elsif params.status == "rejected"
-        self.delete_changes(params, agent, request)
+        self.delete_changes
       end
       yield true
     end
 
-    def delete_data(params, agent, request, bypass = true)
+    def delete_data(agent, bypass = true)
       raise "data still waiting for approval" if self.waiting_approval?
       if bypass || agent.is_admin?
         ActiveRecord::Base.transaction do
@@ -137,7 +137,7 @@ module DcidevApproval
   end
 
   module ClassMethods
-    def create_data(params, agent, request, bypass = true)
+    def create_data(params, agent, bypass = true)
       if bypass
         ActiveRecord::Base.transaction do
           data = params.merge!({ status: :approved })

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dcidev_approval
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.6
 platform: ruby
 authors:
 - Punto Damar P
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-24 00:00:00.000000000 Z
+date: 2022-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dcidev_active_record
@@ -33,10 +33,10 @@ extra_rdoc_files: []
 files:
 - README.md
 - lib/dcidev_approval.rb
-homepage:
+homepage: 
 licenses: []
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -51,8 +51,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key:
+rubygems_version: 3.0.3.1
+signing_key: 
 specification_version: 4
 summary: Logic for implementing record changes approval
 test_files: []