next_sgad 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2705eaa4da6207dcd93fb63d8bfc2ec97f71056a
-  data.tar.gz: e1674367fa691b33748d7d60cd5b22fedf166396
+  metadata.gz: 8696abf88369d8545e21b3b7c2da8670f796b615
+  data.tar.gz: 88fb5d46e63f86adb4a53afe02ea4175ea9d4a12
 SHA512:
-  metadata.gz: 3a0b1507e610ae64a45c3a43395a82a6722453502c8a05eb9a5dc672abc287a2eaa86e2496a5bdb0c2d09d5fc7be3b96211be7496ddde999dd1e7328ff369352
-  data.tar.gz: b097cc14d2555faf166412de763762cd7efee3e6747989974bfcf6fd8312b02729954e6fc326ebb8cb5db7cf32b3fe88bbee11e2e07e736566d7a18c708d50c0
+  metadata.gz: a3342688775504d4a1020213675f1e6ed7cd29db6bf1b2f8d930f0a713f52f96bb58404f0161ca6588902dd4a53d96ccc72849e50b6c9d84ff4b6a5f5874523a
+  data.tar.gz: e5aaeb113fe5eabb200fdd8f34007de3aa02c0ac9dbfd2556808ee58c618e0aa37f19f8ced5338f03503a8f1b4923763ef202d103d62786a201229401d241f2a

data/app/models/next_sgad/activity.rb

@@ -1,4 +1,19 @@
 module NextSgad
   class Activity < ApplicationRecord
+    def self.notification_result_validate(current_user, result)
+      NextSgad::Activity.create(created_by: "#{current_user.first_name} #{current_user.last_name}", description: "Validou resultado")
+    end
+
+    def self.notification_result_invalidate(current_user, result)
+      NextSgad::Activity.create(created_by: "#{current_user.first_name} #{current_user.last_name}", description: "Invalidou resultado")
+    end
+
+    def self.notification_new_result(current_user, result)
+      NextSgad::Activity.create(created_by: "#{current_user.first_name} #{current_user.last_name}", description: "Adicionou novo resultado")
+    end
+
+    def self.notification_destroy_result(current_user, result)
+      NextSgad::Activity.create(created_by: "#{current_user.first_name} #{current_user.last_name}", description: "Removido resultado")
+    end
   end
 end

data/app/models/next_sgad/assessment.rb

@@ -15,6 +15,25 @@ module NextSgad
     
     after_create :create_employees_assessments
 
+    # get the last years assessment
+    def get_last_assessment
+      NextSgad::Assessment.find_by(year: year - 1)
+    end
+
+    # check if last year assessments can be copied
+    def can_copy_last_years_skills?
+      last_years_skills= get_last_assessment
+      return false if last_years_skills.nil?
+      last_years_skills.goals.skill.where.not(name: goals.skill.map(&:name)).exists?
+    end
+
+    # get last years skills
+    def dup_last_year_skills
+      last_years_skills= get_last_assessment
+      return NextSgad::Goal.none if last_years_skills.nil?
+      last_years_skills.goals.skill.where.not(name: goals.skill.map(&:name)).map {|g| d = g.dup; d.function_ids = g.function_ids; d}
+    end
+
     def employee_assessment(employee)
       (skills_assessment(employee) + objectives_assessment(employee) + attendance_assessment(employee)).round(1)
     end
@@ -114,7 +133,6 @@ module NextSgad
 
         data[month] = [attendances_array_by_month.size, attendances_array_by_month.select(&:has_justification?).size, (attendance_percentage/100) * attendance_assessment_value]
       end
-      p data
       return data
     end
 

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, approved: 1, disaproved: 2, in_progress: 3}
+    enum justification_status: {unjustified: -1, pending: 0, approved: 1, disapproved: 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? || approved? || disaproved? || in_progress?
+      pending? || approved? || disapproved? || in_progress?
     end
 
     def justification

data/app/models/next_sgad/department.rb

@@ -8,6 +8,7 @@ module NextSgad
     INITIAL_LETTER = "D"
     validates_presence_of :name
     validates_uniqueness_of :name
+    validates_uniqueness_of :number, if: -> (f) {f.number.present?}, on: :create
     validate :parent_department
     before_save :create_number, on: :create
 

data/app/models/next_sgad/employee_assessment.rb

@@ -15,7 +15,7 @@ module NextSgad
       NextSgad::EmployeeGoal.where(assessment_id: assessment_id, employee_id: employee_id)
     end
 
-    #private
+    private
     def update_statuses
       goals = employee_goals()
       hash = {}
@@ -24,10 +24,10 @@ module NextSgad
         hash[:self_assessment_status] = 0
         # pending
       elsif goals.where(self_assessment: 0).exists?
-        hash[:self_assessment] = 1
+        hash[:self_assessment_status] = 1
         # in_progress
       else
-        hash[:self_assessment] = 2
+        hash[:self_assessment_status] = 2
         # completed
       end
       
@@ -35,10 +35,10 @@ module NextSgad
         hash[:supervisor_assessment_status] = 0
         # pending
       elsif goals.where(supervisor_assessment: 0).exists?
-        hash[:supervisor_assessment] = 1
+        hash[:supervisor_assessment_status] = 1
         # in_progress
       else
-        hash[:supervisor_assessment] = 2
+        hash[:supervisor_assessment_status] = 2
         # completed
       end
       
@@ -46,10 +46,10 @@ module NextSgad
         hash[:final_assessment_status] = 0
         # pending
       elsif goals.where(final_assessment: 0).exists?
-        hash[:final_assessment] = 1
+        hash[:final_assessment_status] = 1
         # in_progress
       else
-        hash[:final_assessment] = 2
+        hash[:final_assessment_status] = 2
         # completed
       end
 

data/app/models/next_sgad/goal.rb

@@ -15,10 +15,10 @@ module NextSgad
     #validates :name, uniqueness: {scope: [:assessment_id]}
     after_save :create_employee_goals
 
-    private
+
     def create_employee_goals
-      positions.each do |position|
-        next if position.efective_id.nil?
+      # Update existing
+      employee_goals.each do |employee_goal|
         eg = NextSgad::EmployeeGoal.new
         eg.status = status
         eg.goal_type = goal_type
@@ -28,10 +28,46 @@ module NextSgad
         eg.target = target
         eg.assessment_id = assessment_id
         eg.goal_id = id
-        eg.employee_id = position.efective_id
-        eg.position_id = position.id
         eg.save
       end
+      if skill?
+        # create new
+        positions_to = for_everyone ? NextSgad::Position.all.where.not(efective_id: nil) : NextSgad::Position.where(function_id: function_ids).where.not(efective_id: nil)
+        positions_to.each do |position|
+          next if position.efective_id.nil?
+          eg = NextSgad::EmployeeGoal.new
+          eg.status = status
+          eg.goal_type = goal_type
+          eg.name = name
+          eg.unit = unit
+          eg.nature = nature
+          eg.target = target
+          eg.assessment_id = assessment_id
+          eg.goal_id = id
+          eg.employee_id = position.efective_id
+          eg.position_id = position.id
+          eg.save
+        end
+
+      elsif objective?
+        positions_to = for_everyone ? NextSgad::Position.all.where.not(efective_id: nil) : positions
+        positions_to.each do |position|
+          next if position.efective_id.nil?
+          eg = NextSgad::EmployeeGoal.new
+          eg.status = status
+          eg.goal_type = goal_type
+          eg.name = name
+          eg.unit = unit
+          eg.nature = nature
+          eg.target = target
+          eg.assessment_id = assessment_id
+          eg.goal_id = id
+          eg.employee_id = position.efective_id
+          eg.position_id = position.id
+          eg.save
+        end
+      end
+
     end
 
   end

data/app/models/next_sgad/justification.rb

@@ -6,14 +6,39 @@ module NextSgad
     # 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, 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}
+    enum first_approval_status: {pending: 0, approved: 1, disapproved: 2}, _prefix: :first
+    enum second_approval_status: {pending: 0, approved: 1, disapproved: 2}, _prefix: :second
     # disapproved if both disapproved
     # approved if both approved
     # pending if both pending
     # in_progress if not first, second nor third
     attr_accessor :dates
 
+    # gives first approval
+    def first_approve
+      update(first_approval_status: 1)
+    end
+
+    # gives second approval
+    def second_approve
+      update(second_approval_status: 1)
+    end
+
+    # gives first approval
+    def first_disapprove
+      update(first_approval_status: 2)
+    end
+
+    # gives second disapproval
+    def second_disapprove
+      update(second_approval_status: 2)
+    end
+
+    # Return an arrays of dates associated to this justification
+    def days
+      attendances.order(date: :asc).map(&:date)
+    end
+
     validates_presence_of :employee_id, :attendance_ids
     validate :validate_attendances_uniqueness, on: :create
     before_destroy :change_attendances_status_before_destroy
@@ -46,9 +71,9 @@ module NextSgad
 
       else
         update_columns(status: 3)
-        
+
       end
-      attendances.where.not(justification_status: status).update_all(justification_status: status)
+      attendances.where.not(justification_status: status).update_all(justification_status: NextSgad::Justification.statuses[status])
     end
   end
 end

data/app/models/next_sgad/position.rb

@@ -25,6 +25,9 @@ module NextSgad
     validates_uniqueness_of :efective_id
     before_save :create_number, on: :create
     before_save :saves_employees
+    after_create :create_goals_after_create
+    validates_presence_of :function_id
+    validates_uniqueness_of :number, if: -> (f) {f.number.present?}, on: :create
 
     private
     def saves_employees
@@ -32,5 +35,24 @@ module NextSgad
       self.employee_ids = self.employee_ids.compact.uniq
     end
 
+    def create_goals_after_create
+      assessm = NextSgad::Assessment.active.last
+      return if assessm.nil? || function_id.nil? || efective_id.nil?
+      function.goals.where(assessment_id: assessm.id).each do |goal|
+        eg = NextSgad::EmployeeGoal.new
+        eg.status = goal.status
+        eg.goal_type = goal.goal_type
+        eg.name = goal.name
+        eg.unit = goal.unit
+        eg.nature = goal.nature
+        eg.target = goal.target
+        eg.assessment_id = goal.assessment_id
+        eg.goal_id = goal.id
+        eg.employee_id = efective_id
+        eg.position_id = id
+        eg.save
+      end
+    end
+
   end
 end

data/lib/next_sgad/version.rb

@@ -1,3 +1,3 @@
 module NextSgad
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: next_sgad
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Sergio Maziano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-29 00:00:00.000000000 Z
+date: 2017-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -266,7 +266,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: SGAD