next_sgad 0.1.9 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 696a0ac704e76390a40ec494b842a611768cf906
-  data.tar.gz: 7413f66353d05a77aaa4e275f1e4086c4d5da1e1
+  metadata.gz: 050bec2ed2ca3a8f135e5614983eb925f702320e
+  data.tar.gz: ad3428de43ae1ed39b2123cc9c2ac4597bc5de3c
 SHA512:
-  metadata.gz: e80fb3583054bc4f15e1b0371f5566e73e7b5626327dfb946c0ed06ca47b386e56ace03251c9cc0cc62625148d559e12ff80500882dcdbd7053d1bb5b3657c81
-  data.tar.gz: f857a62afb325631c1c15526f80dde1023f250d39b76e638491e2136ef5718910054314394c720e453bd61d8fafa552bd38c4dace7b161a36c537bfe34606fcf
+  metadata.gz: 43b5825ced92095011d4b4a4e8aaa962b02ef77a4f8a2299ac22635d9d184c58b3a186b76bc7db0acef329f347863eda79c428776e3f5fc3fe2b47d03f2aa345
+  data.tar.gz: 4dcefc85db33601f622c556c1c7e1a5db499ef3c41edd566222bc1153b77409d86d0c823373847a68a43f187df78637f03fd60df2134620a29d5454d448b2830

data/app/models/next_sgad/assessment.rb

@@ -115,6 +115,8 @@ module NextSgad
       return data
     end
 
+
+
     private
     def percentages_values
       return if skills_percentage.nil? || objectives_percentage.nil? || attendance_percentage.nil?

data/app/models/next_sgad/attendance.rb

@@ -6,7 +6,7 @@ module NextSgad
     belongs_to :department, optional: true
     has_and_belongs_to_many :justifications, association_foreign_key: :next_sgad_justification_id, foreign_key: :next_sgad_attendance_id
     enum status: {four_hours_late: -4, three_hours_late: -3, two_hours_late: -2, one_hour_late: -1,  presence: 0, absence: 1, vacation: 2, authorized_leave: 3}
-    enum justification_status: {unjustified: -1, pending: 0, accepted: 1, denied: 2}
+    enum justification_status: {unjustified: -1, pending: 0, approved: 1, disaproved: 2, in_progress: 3}
     validates :status, :date ,:employee_id, presence: true
     validate :assessment_date
     before_create :check_employee_data
@@ -27,7 +27,7 @@ module NextSgad
 
     # true if an attendace has justification
     def has_justification?
-      pending? || accepted? || denied?
+      pending? || approved? || disaproved? || in_progress?
     end
 
     def justification

data/app/models/next_sgad/justification.rb

@@ -5,21 +5,15 @@ module NextSgad
     belongs_to :employee
     # belongs_to :department
     has_and_belongs_to_many :attendances, association_foreign_key: :next_sgad_attendance_id, foreign_key: :next_sgad_justification_id
-    enum status: {pending: 0, accepted: 1, denied: 2}
+    enum status: {pending: 0, approved: 1, disapproved: 2, in_progress: 3}
+    enum first_approval_status: {first_pending: 0, first_approved: 1, first_disapproved: 2}
+    enum second_approval_status: {second_pending: 0, second_approved: 1, second_disapproved: 2}
+    # disapproved if both disapproved
+    # approved if both approved
+    # pending if both pending
+    # in_progress if not first, second nor third
     attr_accessor :dates
 
-    # Aproves the justification
-    def aprove
-      # 1 stands for aproved therefore justified
-      update(status: 1)
-    end
-
-    # Disaproves the justification
-    def disaprove
-      # 2 stands for unjustified or disaproved
-      update(status: 2)
-    end
-
     validates_presence_of :employee_id, :attendance_ids
     validate :validate_attendances_uniqueness, on: :create
     before_destroy :change_attendances_status_before_destroy
@@ -41,6 +35,19 @@ module NextSgad
     end
 
     def after_save_update_justifications
+      if first_pending? && second_pending?
+        update_columns(status: 0)
+
+      elsif first_approved? && second_approved?
+        update_columns(status: 1)
+
+      elsif first_disapproved? && second_disapproved?
+        update_columns(status: 2)
+
+      else
+        update_columns(status: 3)
+        
+      end
       attendances.where.not(justification_status: status).update_all(justification_status: status)
     end
   end

data/db/migrate/20171125001559_add_aproved_by_supervisor_to_next_sgad_justifications.rb

@@ -0,0 +1,7 @@
+class AddAprovedBySupervisorToNextSgadJustifications < ActiveRecord::Migration[5.1]
+  def change
+    add_column :next_sgad_justifications, :first_approval_status, :integer, default: 0, null: false
+    add_column :next_sgad_justifications, :second_approval_status, :integer, default: 0, null: false
+    add_column :next_sgad_employees, :can_approve_justifications, :boolean, default: false, null: false
+  end
+end

data/lib/next_sgad/version.rb

@@ -1,3 +1,3 @@
 module NextSgad
-  VERSION = '0.1.9'
+  VERSION = '0.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: next_sgad
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.1
 platform: ruby
 authors:
 - Sergio Maziano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-19 00:00:00.000000000 Z
+date: 2017-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -232,6 +232,7 @@ files:
 - db/migrate/20171115161157_migrate_fill_justification_columns.rb
 - db/migrate/20171119122339_add_for_everyone_to_next_sgad_goals.rb
 - db/migrate/20171119152032_create_join_table_goal_function.rb
+- db/migrate/20171125001559_add_aproved_by_supervisor_to_next_sgad_justifications.rb
 - lib/concerns/models/employee.rb
 - lib/generators/initializer/USAGE
 - lib/generators/initializer/initializer_generator.rb