dcidev_approval 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: acf499a815402aa955b457d3fa2db0a97a6018135c1c8814ecad4c4894eeaf62
-  data.tar.gz: 12c8dffb9dea52b6d335e0a38194344f780dbf9e7d13259d4c92892d92dbdc60
+  metadata.gz: ceacb6241a269f4b1c40dc7f83d1fb245619456759e9814514cbdb694365b757
+  data.tar.gz: d3fe771c426cd90a58d1f8bb83658652d42081f1fdda5e53a1f767196d9346b0
 SHA512:
-  metadata.gz: 1cd2869a8e8709375a4b82fde759ab37a7e43a41f1ceedbdf1f563e68a6ac58976c950b8b1088ca8bd7c50ee81e42a8d744bd207d5a5819d23d967fa6be8f242
-  data.tar.gz: 844432fe9092b9918d238ce1ff730dd4028993c087665f26c8361518f49d7c5a189362a7a987c2fc3a92fcb81ecd94cadcd651d3311649fa62e4a79357718e80
+  metadata.gz: 1a85f826b582a4e27af4c43136024b7c033fbaf89a6f97fa93b459fde6de38c08fbfba026a96d48d80e5b5a8b0baef675af25a52a1baa411dbc432bde14a7ad0
+  data.tar.gz: 0a2a2d68986cd8285614bad0531030c064e759139da4180929c08b39ff23515505f3a87254e80c2f7e897f96ba54e890773ad2a8a9728b267a1566b1485e3528

data/README.md

@@ -4,8 +4,11 @@
 ```ruby
 class AddStatusToProduk < ActiveRecord::Migration[6.0]
     def change 
-        add_column :produk, :status, :string
-        add_column :produk, :change_status, :string
+        change_column :model do |t|
+            t.string :status
+            t.string :change_status
+            t.json :data_changes
+        end
     end
 end
 ```
@@ -18,8 +21,6 @@ CHANGE_STATUS = %w(pending_delete pending_update).freeze
 enum change_status: CHANGE_STATUS.zip(CHANGE_STATUS).to_h, _prefix: true
 ```
 
-
-
 ##### 2. Format your `Agent` and `Role` with one-many relationship.
 ##### 3.  Declare instance method `is_admin?` to `Agent` to find out whether an agent is an admin or not
 
@@ -56,8 +57,23 @@ Explanation
 * `current_user`: the agent responsible for the changes
 * `bypass`: boolean value to toogle the approval system. If not sent, the default value is `true`
 
-To track changes peformed to a record, call 
+To track changes peformed to a record, call `instance_model.audit_trails`
+
+# Approval
+To approve / reject changes, call `approval(params)`.
+You MUST use `status` as the param name otherwise it wont work.
+```ruby
+        params do
+            requires :status, type: String, values: %w[approved rejected]
+        end
+        post "/approval/:id" do
+            @produk.approval(params, current_user)
+            present :produk, @produk
+        end
+```
+
 # Callbacks
+
 To execute code before/after the CRUD, include module `DcidevApproval` in `ApplicationRecord` and peform overide and or overload on it's child model.
 
 `app/models/application_record.rb`

data/lib/dcidev_approval.rb

@@ -64,8 +64,8 @@ module DcidevApproval
         end
         
         def last_approved_by
-            last_approve = audit_trails.where(activity_type: :approve).limit(1).try(:first)
-            last_entry = audit_trails.limit(1).order(created_at: :desc).try(:first)
+            last_approve = audit_trails.where(approval: true).limit(1).try(:first)
+            last_entry = audit_trails.limit(1).try(:first)
             {
                 approved_by: last_approve.try(:id) == last_entry.try(:id) ? last_approve.try(:agent).try(:name).to_s + " (#{last_approve.try(:agent_role).try(:name)})" : nil,
                 approved_at: last_approve.try(:id) == last_entry.try(:id) ? last_approve.try(:created_at) : nil
@@ -97,7 +97,7 @@ module DcidevApproval
                 raise errors.full_messages.join(', ') unless update_by_params(params, false)
             elsif changes_present?(params)
                 ActiveRecord::Base.transaction do
-                    data = agent.is_admin? || status == 'waiting' ? params : { change_status: :pending_update, data_changes: agent.is_admin? ? nil : params }
+                    data = agent.is_admin? || status == 'waiting' ? params :{ change_status: :pending_update, data_changes: agent.is_admin? ? nil : params }
                     raise errors.full_messages.join(', ') unless update_by_params(data, false)
                 end
             end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dcidev_approval
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Punto Damar P