next_sgad 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2443dd89ebec47f878c38f414ef401ba42166c1
-  data.tar.gz: 4edd9c740b14e8b7b1806e1b1f6d3acc91910c5f
+  metadata.gz: ff5e669903d0b2888d8f1bae8aebcf8b5998edeb
+  data.tar.gz: c3d169d807700d36bc32618920460580419c5922
 SHA512:
-  metadata.gz: 33c7f54f9abde63999a3fd847b94e333a674748af7e79a78b9ceef98fb9cfb7675b44f26754786ec2b1e35dc583a681c604d5a1e6b6fed0d1814102a31ec8099
-  data.tar.gz: 865af0254e701e721e0f93ebce2aba75321348d4b66994933b16749484aea2b818bf4150c7a6a5947c6b92b39846372dc71ddfe35f41bfb8597a5a8f1e9cc193
+  metadata.gz: e9963b87142c0a3b9e4490379510d10045b09397c30a1bc9ee89f02d9d6c1a149396cf8e5b3d3493987ad4bec589afbc021cb62494c381297d45ca1db712874a
+  data.tar.gz: 8892965d4b17c1b40b69ec6dbc9527fd55f9cf93905ce7fbbcf46fc1c255d5ba60b885918308da30f96b693d573b48584f1a382898a4506c53a09d5867dec973

data/app/models/next_sgad/application_record.rb

@@ -1,6 +1,7 @@
 module NextSgad
   class ApplicationRecord < ::ApplicationRecord
     self.abstract_class = true
+    scope :filter, -> (column, data) {data = [data].flatten.compact.uniq; data.blank? || data.include?('all') ? all : where(column => data)}
 
     def create_number
       tipo = self.class.name

data/app/models/next_sgad/assessment.rb

@@ -6,6 +6,9 @@ module NextSgad
     has_many :employees_assessments, dependent: :destroy
     enum status: {draft: 0, active: 1, inactive: 2, closed: 3}
 
+    scope :year, -> (data) {data = [data].flatten.compact.uniq; data.blank? || data.include?('all') ? all : where(year: data)}
+    scope :status, -> (data) {data = [data].flatten.compact.uniq; data.blank? || data.include?('all') ? all : where(status: data)}
+
     validates_uniqueness_of :year
     validates_presence_of :status, :skills_percentage, :year
     validates :skills_percentage, :objectives_percentage, :attendance_percentage, numericality: {greater_than_or_equal_to: 0, less_than_or_equal_to: 100}

data/app/models/next_sgad/attendance.rb

@@ -7,6 +7,17 @@ module NextSgad
     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, disapproved: 2, in_progress: 3}
+
+    scope :department_id, -> (data) {data = [data].flatten.compact.uniq; data.blank? || data.include?('all') ? all : where(department_id: data)}
+    scope :year, -> (data) {data = [data].flatten.compact.uniq; data.blank? || data.include?('all') ? all : where_date(:date, year: data)}
+    scope :from_date, -> (data) {data = [data].flatten.compact.uniq; data.blank? || data.include?('all') ? all : where("date >= ?", data)}
+    scope :to_date, -> (data) {data = [data].flatten.compact.uniq; data.blank? || data.include?('all') ? all : where("date <= ?", data)}
+    #scope :from_to_date,   -> (data){nil.present? ? where(date: [data].flatten.compact.uniq.map{|f| f.split(',,,')}.flatten.uniq.split(' - ')[0]..data.split(' - ')[1])}
+    scope :employee_id, -> (data) {data = [data].flatten.compact.uniq; data.blank? || data.include?('all') ? all : where(employee_id: data)}
+    scope :position_id, -> (data) {data = [data].flatten.compact.uniq; data.blank? || data.include?('all') ? all : where(position_id: data)}
+    scope :assessment_id, -> (data) {data = [data].flatten.compact.uniq; data.blank? || data.include?('all') ? all : where(assessment_id: data)}
+    scope :justification_status, -> (data) {data = [data].flatten.compact.uniq; data.blank? || data.include?('all') ? all : where(justification_status: data)}
+    
     validates :status, :date ,:employee_id, presence: true
     validate :assessment_date
     before_create :check_employee_data

data/app/models/next_sgad/employee.rb

@@ -8,6 +8,12 @@ module NextSgad
     has_one :efective_position, class_name: NextSgad::Position.name, foreign_key: :efective_id
     has_many :employees_assessments, dependent: :destroy
 
+    scope :department_id, -> (data) {data = [data].flatten.compact.uniq; data.blank? || data.include?('all') ? all : where(id: NextSgad::Position.where(department_id: data).map(&:efective_id))}
+    scope :function_id, -> (data) {data = [data].flatten.compact.uniq; data.blank? || data.include?('all') ? all : where(id: NextSgad::Position.where(function_id: data).map(&:efective_id))}
+    scope :paygrade, -> (data) {data = [data].flatten.compact.uniq; data.blank? || data.include?('all') ? all : where(paygrade: data)}
+    scope :position_id, -> (data) {data = [data].flatten.compact.uniq; data.blank? || data.include?('all') ? all : where(id: NextSgad::Position.where(id: data).map(&:efective_id))}
+    scope :level, -> (data) {data = [data].flatten.compact.uniq; data.blank? || data.include?('all') ? all : where(level: data)}
+
     def full_name
       "#{first_name} #{middle_name} #{last_name}"
     end

data/app/models/next_sgad/employee_assessment.rb

@@ -5,6 +5,11 @@ module NextSgad
     enum self_assessment_status: {self_pending: 0, self_in_progress: 1, self_completed: 2}
     enum supervisor_assessment_status: {supervisor_pending: 0, supervisor_in_progress: 1, supervisor_completed: 2}
     enum final_assessment_status: {final_pending: 0, final_in_progress: 1, final_completed: 2}
+
+    scope :self_assessment_status, -> (data) {data = [data].flatten.compact.uniq; data.blank? || data.include?('all') ? all :  where(self_assessment_status: data)}
+    scope :supervisor_assessment_status, -> (data) {data = [data].flatten.compact.uniq; data.blank? || data.include?('all') ? all : where(supervisor_assessment_status: data)}
+    scope :final_assessment_status, -> (data) {data = [data].flatten.compact.uniq; data.blank? || data.include?('all') ? all :  where(final_assessment_status: data)}
+
     attr_accessor :has_assessments, :all_asssessments_incomplete
 
 

data/app/models/next_sgad/employee_goal.rb

@@ -10,6 +10,8 @@ module NextSgad
     enum goal_type: NextSgad::Goal.goal_types
     enum unit: NextSgad::Goal.units
     enum nature: NextSgad::Goal.natures
+    
+    scope :department_id, -> (data) {data = [data].flatten.compact.uniq; data.blank? || data.include?('all') ? all : where(employee_id: NextSgad::Position.where(department_id: data))}
 
     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}

data/app/models/next_sgad/employee_message.rb

@@ -7,6 +7,7 @@ module NextSgad
     validates_presence_of :employee_id, :message_id
     validates_uniqueness_of :employee_id, scope: [:message_id]
 
+    # marks a message as read and saves the date the message was read
     def mark_as_read(curr_employee = nil)
       return false unless curr_employee.class.name.eql?(NextSgad::Employee.name)
       return false if read?

data/app/models/next_sgad/goal.rb

@@ -10,6 +10,9 @@ module NextSgad
     enum unit: {contracts: 0, currency: 1, clients: 2}
     enum nature: {numeric: 0, objective_base: 1}
 
+    scope :goal_type, -> (data) {data = [data].flatten.compact.uniq; data.blank? || data.include?('all') ? all : where(goal_type: data)}
+    scope :assessment_id, -> (data) {data = [data].flatten.compact.uniq; data.blank? || data.include?('all') ? all : where(assessment_id: data)}
+
     validates_presence_of :name, :assessment_id, :status, :nature, :goal_type
     validates :target, numericality: {greater_than: 0, message: 'Deve ser Maior do que 0'}, if:->(goal){goal.numeric?}
     #validates :name, uniqueness: {scope: [:assessment_id]}

data/app/models/next_sgad/message.rb

@@ -2,11 +2,17 @@ module NextSgad
   class Message < NextSgad::ApplicationRecord
     has_many :employee_messages
     has_and_belongs_to_many :functions, association_foreign_key: :next_sgad_function_id, foreign_key: :next_sgad_message_id
+    has_and_belongs_to_many :positions, association_foreign_key: :next_sgad_position_id, foreign_key: :next_sgad_message_id
+    has_and_belongs_to_many :employees, association_foreign_key: :next_sgad_employee_id, foreign_key: :next_sgad_message_id
+    has_and_belongs_to_many :departments, association_foreign_key: :next_sgad_department_id, foreign_key: :next_sgad_message_id
     enum status: {draft: 0, sent: 1} 
 
     
     validates_presence_of :title, :body
-    validates_presence_of :functions, unless: -> (message){message.send_to_all}
+    validates_presence_of :functions, if: -> (f){!f.send_to_all && f.position_ids.blank? && f.employee_ids.blank? && f.department_ids.blank? && !f.draft?}
+    validates_presence_of :positions, if: -> (f){!f.send_to_all && f.employee_ids.blank? && f.department_ids.blank? && f.function_ids.blank? && !f.draft?}
+    validates_presence_of :departments, if: -> (f){!f.send_to_all && f.position_ids.blank? && f.employee_ids.blank? && f.function_ids.blank? && !f.draft?}
+    validates_presence_of :employees, if: -> (f){!f.send_to_all && f.position_ids.blank? && f.department_ids.blank? && f.function_ids.blank? && !f.draft?}
 
     after_save :create_messages
 
@@ -17,7 +23,10 @@ module NextSgad
       if send_to_all
         all_employees_ids = NextSgad::Employee.ids
       else
-        all_employees_ids = NextSgad::Position.where(function_id: functions.ids).map(&:efective_id)
+        all_employees_ids = NextSgad::Position.where(function_id: functions.ids).map(&:efective_id) +
+        NextSgad::Position.where(department_id: departments.ids).map(&:efective_id) +
+        positions.map(&:efective_id) +
+        employees.ids
       end
       all_employees_ids.each do |employee_id|
         duped_empl_message = empl_message.dup

data/app/models/next_sgad/position.rb

@@ -11,6 +11,10 @@ module NextSgad
     has_and_belongs_to_many :goals, association_foreign_key: :next_sgad_goal_id, foreign_key: :next_sgad_position_id
     has_and_belongs_to_many :employees, association_foreign_key: :next_sgad_employee_id, foreign_key: :next_sgad_position_id
 
+    scope :department_id, -> (data) {data = [data].flatten.compact.uniq; data.blank? || data.include?('all') ? all : where(department_id: data)}
+    scope :efective_id, -> (data) {data = [data].flatten.compact.uniq; data.blank? || data.include?('all') ? all : where(efective_id: data)}
+    scope :position_id, -> (data) {data = [data].flatten.compact.uniq; data.blank? || data.include?('all') ? all : where(position_id: data)}
+
     def self.ocupied
       self.where.not(efective_id: nil)
     end

data/db/migrate/20180107204755_create_join_table_message_department.rb

@@ -0,0 +1,8 @@
+class CreateJoinTableMessageDepartment < ActiveRecord::Migration[5.1]
+  def change
+    create_join_table :next_sgad_messages, :next_sgad_departments do |t|
+      t.index [:next_sgad_message_id, :next_sgad_department_id], name: 'idx_nt_sd_depents_meges_on_sgad_message_id_and_sgad_depent_id'
+      # t.index [:department_id, :message_id]
+    end
+  end
+end

data/db/migrate/20180107204810_create_join_table_message_position.rb

@@ -0,0 +1,8 @@
+class CreateJoinTableMessagePosition < ActiveRecord::Migration[5.1]
+  def change
+    create_join_table :next_sgad_messages, :next_sgad_positions do |t|
+      t.index [:next_sgad_message_id, :next_sgad_position_id], name: 'index_sgad_mees_poions_on_sgad_mege_id_and_sgad_poion_id'
+      # t.index [:position_id, :message_id]
+    end
+  end
+end

data/db/migrate/20180107204831_create_join_table_message_employee.rb

@@ -0,0 +1,8 @@
+class CreateJoinTableMessageEmployee < ActiveRecord::Migration[5.1]
+  def change
+    create_join_table :next_sgad_messages, :next_sgad_employees do |t|
+      t.index [:next_sgad_message_id, :next_sgad_employee_id], name: 'index_sgad_eoyees_messages_on_sgad_mage_id_and_sgad_eoyee_id'
+      # t.index [:employee_id, :message_id]
+    end
+  end
+end

data/lib/next_sgad/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: next_sgad
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Sergio Maziano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-06 00:00:00.000000000 Z
+date: 2018-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -261,6 +261,9 @@ files:
 - 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
+- db/migrate/20180107204755_create_join_table_message_department.rb
+- db/migrate/20180107204810_create_join_table_message_position.rb
+- db/migrate/20180107204831_create_join_table_message_employee.rb
 - lib/concerns/models/employee.rb
 - lib/generators/initializer/USAGE
 - lib/generators/initializer/initializer_generator.rb