next_sgad 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d9a4153fce1533ccc2d1af9442cbb687999d050
-  data.tar.gz: d2fb219a4a0dd4b2890d2ee7e177a7d3e38f8dab
+  metadata.gz: 2b1378122095a5945d9c9af38759594a20673bde
+  data.tar.gz: f8414ec87ece56c23f0c5103aa5fb9abfc36b768
 SHA512:
-  metadata.gz: 3d4cacf9156e218f6e0c74cf068675a54a302cbe007c81d5e3809569b4174ab3e763e64430930227edf00b4cace6782804ea7aaeaf2b883001f219a291534f7a
-  data.tar.gz: 8d27f251009877de799a0736380c24b5151181e8ad1e3ada64f68230e56f0e224eefe3077c4b6b5ada4cebcd960858267abc3b36f8eb09e9b548cb0a4a08863d
+  metadata.gz: 44835b93d7185177e39b7ce45e4931a228e5d81ce645e7beb2dd5e5424c1618b03869df8faf44e7309f40008d3686e5eff5428a1f7e928738ef42fce4ca6d12c
+  data.tar.gz: d7afac49b5c96ef47a851671c4e2da0f0ad29c27a7f9ae906da8417c1ec8f0570f30eeef74a631929db49d55b53e8fa64e6516a974b8e9861dbeb9f4d8d763c3

data/app/models/next_sgad/assessment.rb

@@ -18,6 +18,15 @@ module NextSgad
     
     after_create :create_employees_assessments
 
+    # get the assessment from the #{year} or the last active or from the last year
+    def self.get_assessment(year = nil)
+      if year.present?
+        where(year: year).last
+      else
+        active.last || where(year: Time.now.year).last
+      end
+    end
+
     # get the last years assessment
     def get_last_assessment
       NextSgad::Assessment.find_by(year: year - 1)
@@ -139,9 +148,27 @@ module NextSgad
       return data
     end
 
+    # 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
 
     private
+    # check if the sum of all percentages is equal to 100
     def percentages_values
       return if skills_percentage.nil? || objectives_percentage.nil? || attendance_percentage.nil?
       if skills_percentage + objectives_percentage + attendance_percentage != 100
@@ -151,6 +178,7 @@ module NextSgad
       end
     end
 
+    # create employee assessments for all amployees tha can be assessed
     def create_employees_assessments
       begin
         emplos = NextSgad::Employee.can_be_assessed.map{|e| {employee_id: e.id}}

data/app/models/next_sgad/department.rb

@@ -18,5 +18,49 @@ module NextSgad
         errors.add(:department_id, :no_department_found_with_this_number.ts)
       end
     end
+
+    def name_and_number
+      "#{number} - #{name}"
+    end
+
+    # creates filter data
+    def self.map_for_select
+      all.map {|f| [f.name_and_number, f.id]}
+    end
+
+    # creates filter data
+    def self.map_for_filter
+      [[I18n.t(:everything), :all]] + all.map {|f| [f.name_and_number, f.id]}
+    end
+
+    # return a hash like {DepartmentObject => [EmployeeObject]}
+    # groups employee by hash
+    def self.employees_by_dep
+      pos_ind_by_emp = NextSgad::Position.all.index_by(&:efective_id)
+      emp_by_dep_id = all.index_by(&:id)
+      NextSgad::Employee.all.group_by {|e| emp_by_dep_id[pos_ind_by_emp[e.id]&.department_id]}
+    end
+
+    def all_employees_of_dep
+      positions = NextSgad::Position.where(department_id: self.id).map(&:efective_id)#all.index_by(&:efective_id)
+      NextSgad::Employee.all.where(id: positions) #all.group_by {|e| emp_by_dep_id[pos_ind_by_emp[e.id]&.department_id]}
+    end
+
+
+    # return a hash like {DepartmentObject => [EmployeeAssessmentObject]}
+    # groups employee by hash
+    def self.employees_assessments_by_dep(employees_assessments)
+      pos_ind_by_emp = NextSgad::Position.all.index_by(&:efective_id)
+      emp_by_dep_id = all.index_by(&:id)
+      employees_assessments.group_by {|e| emp_by_dep_id[pos_ind_by_emp[e.employee_id]&.department_id]}
+    end
+
+
+    # def self.dep_employee_goals
+    #   dep_positions = NextSgad::Position.all.index_by(&:efective_id)
+    #   dep_employees = NextSgad::Employee.all.index_by(&:id)
+    #   dep_employee_goals = NextSgad::EmployeeGoal.all.group_by{|employee_goal| dep_positions[employee_goal&.employee_id]&.department_id}
+    #   all.map{|dep| dep_employee_goals[dep.id]}
+    # end
   end
 end

data/app/models/next_sgad/employee.rb

@@ -30,6 +30,22 @@ module NextSgad
       "#{number} - #{first_name} #{last_name}"
     end
 
+    def self.map_for_select
+      all.map {|f| [f.name_and_number, f.id]}
+    end
+
+    def self.map_for_filter
+      [[I18n.t(:everything), :all]] + all.map {|f| [f.name_and_number, f.id]}
+    end
+
+    def self.map_paygrade_for_filter
+      [[I18n.t(:everything), :all]] + all.order(paygrade: :asc).map {|f| [f.paygrade, f.paygrade]}.uniq
+    end
+
+    def self.map_level_for_filter
+      [[I18n.t(:everything), :all]] + all.order(level: :asc).map {|f| [f.level, f.level]}.uniq
+    end
+
     def unread_messages
       employee_messages.unread
     end
@@ -55,20 +71,16 @@ module NextSgad
     after_save :remove_assessment_data_if_employee_not_assessed
     validates_presence_of :first_name, :last_name
     after_create :create_employees_assessments
+    validates_uniqueness_of :number, if: -> (employee) {employee.number.present?}
 
     private
+    # create employee assessment for the current employee
     def create_employees_assessments
-      begin
-        assessmens = NextSgad::Assessment.all.map{|e| {assessment_id: e.id}}
-        # Creates an array like [{employee_id: 1}, {employee_id: 3}]
-        NextSgad::EmployeeAssessment.create(assessmens) do |f|
-          f.employee_id = id
-        end
-      rescue
-        p $!.bactrace
-      end
+      assessmens = NextSgad::Assessment.active.map{|e| {assessment_id: e.id, employee_id: id}}
+      # Creates an array like [{employee_id: 1}, {employee_id: 3}]
+      NextSgad::EmployeeAssessment.create(assessmens)
     end
-
+    # remove all assessments if the employee can_be_assessed == false
     def remove_assessment_data_if_employee_not_assessed
       if is_not_assessed?
         active_assessment = NextSgad::Assessment.active.last

data/app/models/next_sgad/employee_assessment.rb

@@ -20,11 +20,32 @@ module NextSgad
       NextSgad::EmployeeGoal.where(assessment_id: assessment_id, employee_id: employee_id)
     end
 
-    private
+    def status
+      if self_completed? && supervisor_completed? && final_completed?
+        :completed
+      elsif self_pending? && supervisor_pending? && final_pending?
+        :pending
+      else
+        :in_progress
+      end
+    end
+
+    def completed?
+      self_completed? && supervisor_completed? && final_completed?
+    end
+
+    def self.completed
+      all.where(self_assessment_status: 2, supervisor_assessment_status: 2, final_assessment_status: 2)
+    end
+
+    def self.not_completed
+      all.where.not(self_assessment_status: 2, supervisor_assessment_status: 2, final_assessment_status: 2)
+    end
+
     def update_statuses
       goals = employee_goals()
       hash = {}
-      
+
       if goals.where(self_assessment: 0).size == goals.size
         hash[:self_assessment_status] = 0
         # pending
@@ -35,7 +56,7 @@ module NextSgad
         hash[:self_assessment_status] = 2
         # completed
       end
-      
+
       if goals.where(supervisor_assessment: 0).size == goals.size
         hash[:supervisor_assessment_status] = 0
         # pending
@@ -46,7 +67,7 @@ module NextSgad
         hash[:supervisor_assessment_status] = 2
         # completed
       end
-      
+
       if goals.where(final_assessment: 0).size == goals.size
         hash[:final_assessment_status] = 0
         # pending
@@ -60,5 +81,8 @@ module NextSgad
 
       update_columns(hash)
     end
+
+    private
+
   end
 end

data/app/models/next_sgad/employee_goal.rb

@@ -15,6 +15,7 @@ module NextSgad
 
     validates :goal_id, uniqueness: {scope: [:employee_id]}
     validates :self_assessment, :supervisor_assessment, :final_assessment, numericality: {greater_than_or_equal_to: 0, less_than_or_equal_to: 5}
+    after_save :update_or_create_employee_assessment
 
     before_save :calcular_self_assessment
 
@@ -33,5 +34,50 @@ module NextSgad
       calcular_self_assessment
       save
     end
+
+    def self.self_assessment_count
+      return 0 if self.count <= 0
+      self.where.not(self_assessment: 0).count
+    end
+
+    def self.supervisor_assessment_count
+      return 0 if self.count <= 0
+      self.where.not(supervisor_assessment: 0).count
+    end
+
+    def self.final_assessment_count
+      return 0 if self.count <= 0
+      self.where.not(final_assessment: 0).count
+    end
+
+    def self.assessment_completion_percentage_self
+      employees_goals_size = self.count
+      return 0 if employees_goals_size <= 0
+      completed_employee_goals_size = self.where.not(self_assessment: 0).count
+      100.to_f*(completed_employee_goals_size.to_f/employees_goals_size.to_f).round(2)
+    end
+
+    def self.assessment_completion_percentage_supervisor
+      employees_goals_size = self.count
+      return 0 if employees_goals_size <= 0
+      completed_employee_goals_size = self.where.not(supervisor_assessment: 0).count
+      100.to_f*(completed_employee_goals_size.to_f/employees_goals_size.to_f).round(2)
+    end
+
+    def self.assessment_completion_percentage_final
+      employees_goals_size = self.count
+      return 0 if employees_goals_size <= 0
+      completed_employee_goals_size = self.where.not(final_assessment: 0).count
+      100.to_f*(completed_employee_goals_size.to_f/employees_goals_size.to_f).round(2)
+    end
+  
+    def update_or_create_employee_assessment
+      employee_assessment = NextSgad::EmployeeAssessment.where(employee_id: employee_id, assessment_id: assessment_id).last
+      if employee_assessment.present?
+        employee_assessment.save
+      else
+        NextSgad::EmployeeAssessment.create(employee_id: employee_id, assessment_id: assessment_id)
+      end
+    end
   end
 end

data/app/models/next_sgad/employee_message.rb

@@ -2,8 +2,14 @@ module NextSgad
   class EmployeeMessage < NextSgad::ApplicationRecord
     belongs_to :message
     belongs_to :employee
-    enum status: {unread: 0, read: 1, removed: 2}
-    # recall message read and unread
+    enum status: {unread: 0, read: 1, removed: 2, unread_and_retracted: 3, read_and_retracted: 4}
+    # unread :not yet read by the employee
+    # read :read by the employee
+    # removed :read and removed by the employee
+    # unread_and_retracted :message retracted before the employee could read  it
+    # read_and_retracted :message retracted afterthe employee could read it
+
+   # recall message read and unread
     validates_presence_of :employee_id, :message_id
     validates_uniqueness_of :employee_id, scope: [:message_id]
 

data/app/models/next_sgad/function.rb

@@ -6,5 +6,19 @@ module NextSgad
     before_save :create_number, on: :create
     has_and_belongs_to_many :goals, association_foreign_key: :next_sgad_goal_id, foreign_key: :next_sgad_function_id
     has_and_belongs_to_many :messages, association_foreign_key: :next_sgad_message_id, foreign_key: :next_sgad_function_id
+
+    def name_and_number
+      "#{number} - #{name}"
+    end
+
+    # creates filter data
+    def self.map_for_select
+      all.map {|f| [f.name_and_number, f.id]}
+    end
+
+    # creates filter data
+    def self.map_for_filter
+      [[I18n.t(:everything), :all]] + all.map {|f| [f.name_and_number, f.id]}
+    end
   end
 end

data/app/models/next_sgad/goal.rb

@@ -20,58 +20,37 @@ module NextSgad
 
 
     def create_employee_goals
-      # Update existing
-      employee_goals.each do |employee_goal|
-        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.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.can_be_assessed.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
 
+      # checks the positions who should have this Goal
+      # if the employee goal is for everyone
+      positions_to = if for_everyone
+        NextSgad::Position.where.not(efective_id: nil).can_be_assessed
+      # if its a skill
+      elsif skill?
+        NextSgad::Position.where(function_id: function_ids).where.not(efective_id: nil).can_be_assessed
+      # if its an objective
       elsif objective?
-        positions_to = for_everyone ? NextSgad::Position.all.where.not(efective_id: nil) : positions
-        positions_to.can_be_assessed.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
+        positions.where.not(efective_id: nil).can_be_assessed
       end
 
-    end
+      positions_ids = positions_to.map(&:id)
+      # Update existing employee goals
+      employee_goals_to_update = employee_goals.where(position_id: positions_ids).to_a
+      employee_goals_to_update.each do |employee_goal|
+        employee_goal.update(status: status, goal_type: goal_type, name: name, unit: unit, nature: nature, target: target, assessment_id: assessment_id, goal_id: id)
+      end
 
+      # Destroy employee_goals deselected from the list
+      employee_goals.where.not(position_id: positions_ids).each(&:destroy)
+      
+      # create new employee goals for the remainder
+      eg = NextSgad::EmployeeGoal.new(status: status, goal_type: goal_type, name: name, unit: unit, nature: nature, target: target, assessment_id: assessment_id, goal_id: id)
+      positions_to.where.not(id: employee_goals.map(&:position_id)).each do |position|
+        dupped_eg = eg.dup
+        dupped_eg.employee_id = position.efective_id
+        dupped_eg.position_id = position.id
+        dupped_eg.save
+      end
+    end
   end
 end

data/app/models/next_sgad/position.rb

@@ -23,6 +23,16 @@ module NextSgad
       "#{number} - #{name}"
     end
 
+    # creates filter data
+    def self.map_for_select
+      all.map {|f| [f.name_and_number, f.id]}
+    end
+
+    # creates filter data
+    def self.map_for_filter
+      [[I18n.t(:everything), :all]] + all.map {|f| [f.name_and_number, f.id]}
+    end
+
     INITIAL_LETTER = "P"
 
     #validates_uniqueness_of :efective_id, if: -> (f) {f.efective_id.present?}, on: :create
@@ -31,6 +41,10 @@ module NextSgad
     #after_create :create_goals_after_create
     validates_uniqueness_of :number, if: -> (f) {f.number.present?}, on: :create
 
+    after_create :create_goals_after_create
+    # validates_presence_of :function_id, on: :update
+    # validates_uniqueness_of :number, if: -> (f) {f.number.present?}, on: :create
+
     private
     def saves_employees
       return if self.employees_id == nil
@@ -38,32 +52,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? || efective.is_not_assessed?
-      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
-
+    # queries the positions belonging to employees tha cannot be assessed
     def self.can_be_assessed
       where(efective_id: [NextSgad::Employee.can_be_assessed.ids, nil])
     end
 
+    # queries the positions belonging to employees tha can be assessed
     def self.cannot_be_assessed
       where(efective_id: NextSgad::Employee.cannot_be_assessed.ids)
     end
 
+    # create employee goal after creating an position
+    def create_goals_after_create
+      assessm = NextSgad::Assessment.active.last
+      return if assessm.nil? || function_id.nil? || efective_id.nil?
+
+      employee_goal_data = assessm.goals.map{|g| {status: g.status, goal_type: g.goal_type, name: g.name, unit: g.unit, nature: g.nature, target: g.target, goal_id: g.id, employee_id: efective_id, position_id: id, assessment_id: assessm.id}}
+      NextSgad::EmployeeGoal.create(employee_goal_data)
+    end
+
   end
 end

data/lib/next_sgad/version.rb

@@ -1,3 +1,3 @@
 module NextSgad
-  VERSION = '0.3.5'
+  VERSION = '0.3.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: next_sgad
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Sergio Maziano