next_sgad 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95ad6519114181004c4f7ab8761a082014ec3616
-  data.tar.gz: 157a9e5d56543377848ef818b818ec9d4318f762
+  metadata.gz: e2443dd89ebec47f878c38f414ef401ba42166c1
+  data.tar.gz: 4edd9c740b14e8b7b1806e1b1f6d3acc91910c5f
 SHA512:
-  metadata.gz: 6ac58a24bcc8239c5b062e279f07b29e01e34a0d795a92719789398bcff709d4cf9029b8f33c022999c8973fdc6b9ede9dfa6b358b7191d14f03f4b363c0069b
-  data.tar.gz: c7ddcc81d2d63234f2e500dd9daec823cd1dc2cee155c88637e1ef1e27e73b54d6ad1e0ec365e0ebc5659b41eca4d5bda51ef40f3bddb65d68e1c786fcf06f3d
+  metadata.gz: 33c7f54f9abde63999a3fd847b94e333a674748af7e79a78b9ceef98fb9cfb7675b44f26754786ec2b1e35dc583a681c604d5a1e6b6fed0d1814102a31ec8099
+  data.tar.gz: 865af0254e701e721e0f93ebce2aba75321348d4b66994933b16749484aea2b818bf4150c7a6a5947c6b92b39846372dc71ddfe35f41bfb8597a5a8f1e9cc193

data/app/models/next_sgad/assessment.rb

@@ -150,7 +150,7 @@ module NextSgad
 
     def create_employees_assessments
       begin
-        emplos = NextSgad::Employee.all.map{|e| {employee_id: e.id}}
+        emplos = NextSgad::Employee.can_be_assessed.map{|e| {employee_id: e.id}}
         # Creates an array like [{employee_id: 1}, {employee_id: 3}]
         NextSgad::EmployeeAssessment.create(emplos) do |f|
           f.assessment_id = id

data/app/models/next_sgad/department.rb

@@ -4,6 +4,7 @@ module NextSgad
     has_many :departments
     has_many :attendances
     has_many :justifications
+    has_many :positions
 
     INITIAL_LETTER = "D"
     validates_presence_of :name

data/app/models/next_sgad/employee.rb

@@ -3,6 +3,7 @@ module NextSgad
     # belongs_to :position
     has_many :employee_goals, dependent: :destroy
     has_many :employee_messages, dependent: :destroy
+    has_many :attendances, dependent: :destroy
     has_and_belongs_to_many :positions, association_foreign_key: :next_sgad_position_id, foreign_key: :next_sgad_employee_id
     has_one :efective_position, class_name: NextSgad::Position.name, foreign_key: :efective_id
     has_many :employees_assessments, dependent: :destroy
@@ -27,8 +28,25 @@ module NextSgad
       employee_messages.unread
     end
 
+    def self.can_be_assessed
+      where(can_be_assessed: true)
+    end
+
+    def self.cannot_be_assessed
+      where(can_be_assessed: false)
+    end
+
+    def is_assessed?
+      can_be_assessed
+    end
+
+    def is_not_assessed?
+      !is_assessed?
+    end
+
     INITIAL_LETTER = "E"
     before_save :create_number, on: :create
+    after_save :remove_assessment_data_if_employee_not_assessed
     validates_presence_of :first_name, :last_name
     after_create :create_employees_assessments
 
@@ -44,5 +62,16 @@ module NextSgad
         p $!.bactrace
       end
     end
+
+    def remove_assessment_data_if_employee_not_assessed
+      if is_not_assessed?
+        active_assessment = NextSgad::Assessment.active.last
+        if active_assessment.present?
+          employee_goals.where(assessment_id: active_assessment.id).delete_all
+          attendances.where("extract(year from date) = ?", active_assessment.year).delete_all
+          employees_assessments.where(assessment_id: active_assessment.id).delete_all
+        end
+      end
+    end
   end
 end

data/app/models/next_sgad/goal.rb

@@ -33,7 +33,7 @@ module NextSgad
       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|
+        positions_to.can_be_assessed.each do |position|
           next if position.efective_id.nil?
           eg = NextSgad::EmployeeGoal.new
           eg.status = status
@@ -51,7 +51,7 @@ module NextSgad
 
       elsif objective?
         positions_to = for_everyone ? NextSgad::Position.all.where.not(efective_id: nil) : positions
-        positions_to.each do |position|
+        positions_to.can_be_assessed.each do |position|
           next if position.efective_id.nil?
           eg = NextSgad::EmployeeGoal.new
           eg.status = status

data/app/models/next_sgad/position.rb

@@ -36,7 +36,7 @@ module NextSgad
 
     def create_goals_after_create
       assessm = NextSgad::Assessment.active.last
-      return if assessm.nil? || function_id.nil? || efective_id.nil?
+      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
@@ -53,5 +53,13 @@ module NextSgad
       end
     end
 
+    def self.can_be_assessed
+      where(efective_id: [NextSgad::Employee.can_be_assessed.ids, nil])
+    end
+
+    def self.cannot_be_assessed
+      where(efective_id: NextSgad::Employee.cannot_be_assessed.ids)
+    end
+
   end
 end

data/db/migrate/20180106144337_add_can_be_assessed_to_next_sgad_employees.rb

@@ -0,0 +1,5 @@
+class AddCanBeAssessedToNextSgadEmployees < ActiveRecord::Migration[5.1]
+  def change
+    add_column :next_sgad_employees, :can_be_assessed, :boolean, default: true, null: false
+  end
+end

data/lib/next_sgad/version.rb

@@ -1,3 +1,3 @@
 module NextSgad
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: next_sgad
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Sergio Maziano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-04 00:00:00.000000000 Z
+date: 2018-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -260,6 +260,7 @@ files:
 - db/migrate/20180103084324_create_join_table_message_function.rb
 - db/migrate/20180103085525_create_next_sgad_employee_messages.rb
 - db/migrate/20180103123801_add_read_date_to_next_sgad_employee_messages.rb
+- db/migrate/20180106144337_add_can_be_assessed_to_next_sgad_employees.rb
 - lib/concerns/models/employee.rb
 - lib/generators/initializer/USAGE
 - lib/generators/initializer/initializer_generator.rb