ecom_core 1.2.1 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9609bd123c55bdacd45126589991ad51231db85fc6b1a4ac30b5d39aee7fb625
-  data.tar.gz: e5e453462da7dcc7596c8e7b0274bdf448affa2bc02b8b4de6d50289d4e9bb08
+  metadata.gz: fa793b02a7d9a24882708250c891541910d0f2d4d97c8e713f0226a03da2c7b9
+  data.tar.gz: 102319f9e9313bac6294441dbb4218dc3ed61fd527b4e5fdc81fbf6e3f70032e
 SHA512:
-  metadata.gz: 8a5662a484563182b4b34099708a316ddd05408d5e3a9f3c891697bd1f681f93e16b9a42bf3598176cb7d5b161e8aa0a09c4402fae3cd7582bcf9170268cc24f
-  data.tar.gz: 61433c913b8c43962970806b9179c7b6ea9bb40626438cb5bf22e2e118ef45ed1f387489370802ff795b5b8fd2abb99b3b70e31cf0fdca740f72fda9a47f407e
+  metadata.gz: a80e478986df2a080fc9573565fcbe99bb75313c95a54946d74b731633c2f67877dc9371ddd014c9cbd6b358edeef1319b2e8c00b632a2c404b03479eb4e7c97
+  data.tar.gz: 3bcfcd09666b8847e6d61ae03908a799eb7ce02322fa97f42a78a2d4dbdac81a40aa22d4cf44967a0bd52ecea8587b8120f71248aaf7feb55e0ad6c0b5a5f809

data/app/models/ecom/core/attendance_sheet.rb

@@ -8,26 +8,30 @@ module Ecom
       validates :date, presence: true, uniqueness: true
       validates :status, inclusion: [OPEN, SUBMITTED, APPROVED]
 
+      belongs_to :project
+
       has_many :attendance_sheet_entries
+      has_many :crew_times, through: :attendance_sheet_entries
 
-      scope :open, -> { where(status: OPEN) }
-      scope :current, -> { where(date: Date.today) }
-      scope :current_open, -> { open.current }
+      scope :open, ->(id) { where(status: OPEN, project_id: id) }
+      scope :submitted, ->(id) { where(status: SUBMITTED, project_id: id) }
+      scope :current, ->(id) { where(date: Date.today, project_id: id) }
+      scope :current_open, ->(id) { where(date: Date.today, project_id: id, status: OPEN) }
 
-      def self.open_for_date(date)
-        AttendanceSheet.find_by(status: OPEN, date: date)
+      def self.open_for_date(date, project_id)
+        AttendanceSheet.find_by(status: OPEN, date: date, project_id: project_id)
       end
 
-      def self.open_exists?
-        AttendanceSheet.open.exists?
+      def self.open_exists?(project_id)
+        AttendanceSheet.open(project_id).exists?
       end
 
-      def self.exists_for_today?
-        AttendanceSheet.current.exists?
+      def self.exists_for_today?(project_id)
+        AttendanceSheet.current(project_id).exists?
       end
 
-      def self.open_exists_for_today?
-        AttendanceSheet.current_open.exists?
+      def self.open_exists_for_today?(project_id)
+        AttendanceSheet.current_open(project_id).exists?
       end
 
       # Attendance sheet should be created using the
@@ -35,16 +39,18 @@ module Ecom
       # check if there is an open attendance already,
       # and also that we have only one attendace sheet
       # per day.
-      def self.create_current
-        raise 'Attendance sheet already created for the day.' if AttendanceSheet.exists_for_today?
+      def self.create_current(project_id)
+        raise 'Attendance sheet already created for the day.' if AttendanceSheet.exists_for_today?(project_id)
 
-        raise 'There is an open attendance sheet which needs to be submitted before creating a new one.' if AttendanceSheet.open_exists?
+        if AttendanceSheet.open_exists?(project_id)
+          raise 'There is an open attendance sheet which needs to be submitted before creating a new one.'
+        end
 
-        AttendanceSheet.create(date: Date.today, opened_at: Time.now, status: OPEN)
+        AttendanceSheet.create(date: Date.today, opened_at: Time.now, status: OPEN, project_id: project_id)
       end
 
-      def self.submit_current
-        sheet = AttendanceSheet.find_by(date: Date.today, status: OPEN)
+      def self.submit_current(project_id)
+        sheet = AttendanceSheet.find_by(date: Date.today, status: OPEN, project_id: project_id)
 
         raise 'There is no open attendance sheet to submit.' if sheet.nil?
 
@@ -58,8 +64,8 @@ module Ecom
       # to submit the attendance sheet after the date has
       # passed. Normally, timekeepers need to open and close
       # an attendance sheet of a date on the specific date.
-      def self.submit(date)
-        sheet = AttendanceSheet.open_for_date(date)
+      def self.submit(date, project_id)
+        sheet = AttendanceSheet.open_for_date(date, project_id)
         raise 'There is no open attendance sheet to submit for the selected day.' unless sheet
 
         sheet.closed_at = Time.now

data/app/models/ecom/core/attendance_sheet_entry.rb

@@ -6,4 +6,4 @@ module Ecom
       has_many :crew_times
     end
   end
-end
+end

data/app/models/ecom/core/company.rb

@@ -0,0 +1,10 @@
+module Ecom
+  module Core
+    class Company < ApplicationRecord
+      has_many :projects
+
+      validates :code, :name, :address, :telephone, presence: true
+      validates :code, :name, uniqueness: true
+    end
+  end
+end

data/app/models/ecom/core/crew.rb

@@ -11,8 +11,6 @@ module Ecom
 
       validates :name, :qualification, presence: true
       validates :employment, inclusion: [PERMANENT, TEMPORARY]
-      #validates :wage, presence: true, if: ->(o) { o.employment == PERMANENT }
-      #validates :wage, absence: true, if: ->(o) { o.employment == TEMPORARY }
 
       def set_employment_date
         self.employment_date = Date.today

data/app/models/ecom/core/crew_overtime.rb

@@ -18,4 +18,4 @@ module Ecom
       end
     end
   end
-end
+end

data/app/models/ecom/core/crew_time.rb

@@ -20,9 +20,26 @@ module Ecom
       validates :checkin_time, presence: true, if: :checkout_time
 
       before_save :calculate_hours
+      after_save :calculate_total
 
       def calculate_hours
-        self.hours = checkout_time.nil? || checkin_time.nil? ? 0 : compute_hours
+        self.hours = if checkout_time.nil? || checkin_time.nil?
+                       0
+                     else
+                       compute_hours
+                     end
+      end
+
+      def calculate_total
+        compute_total_for_entry if saved_change_to_hours?
+      end
+
+      def compute_total_for_entry
+        attendance_sheet_entry.total_hours = Ecom::Core::CrewTime.where(
+          attendance_sheet_entry: attendance_sheet_entry,
+          revised: false
+        ).sum(:hours)
+        attendance_sheet_entry.save
       end
 
       # A method to check if checkin and checkout range falls in the morning,

data/app/models/ecom/core/overtime_sheet.rb

@@ -8,17 +8,20 @@ module Ecom
       validates :date, :opened_at, presence: true, uniqueness: true
       validates :status, inclusion: [OPEN, SUBMITTED, APPROVED]
 
+      belongs_to :project
+
       has_many :overtime_sheet_entries
+      has_many :crew_overtimes, through: :overtime_sheet_entries
 
-      scope :open, -> { where(status: OPEN) }
-      scope :for_date, ->(date) { where(date: date) }
+      scope :open, ->(id) { where(status: OPEN, project_id: id) }
+      scope :submitted, ->(id) { where(status: SUBMITTED, project_id: id) }
 
-      def self.open_exists?
-        OvertimeSheet.open.exists?
+      def self.open_exists?(project_id)
+        OvertimeSheet.open(project_id).exists?
       end
 
-      def self.open_for_date_exists?(date)
-        OvertimeSheet.open.for_date(date).exists?
+      def self.open_for_date_exists?(date, project_id)
+        OvertimeSheet.open(project_id).where(date: date).exists?
       end
 
       # Overtime sheet should be created using the
@@ -26,16 +29,16 @@ module Ecom
       # check if there is an open overtime already,
       # and also that we have only one open overtime
       # sheet at a time.
-      def self.create_new(date)
-        if OvertimeSheet.open_for_date_exists?(date)
+      def self.create_new(date, project_id)
+        if OvertimeSheet.open_for_date_exists?(date, project_id)
           raise 'There is already an open overtime sheet for the selected date.'
         end
 
-        if OvertimeSheet.open_exists?
+        if OvertimeSheet.open_exists?(project_id)
           raise 'There is already an open overtime sheet. It has to be submitted before creating a new one.'
         end
 
-        OvertimeSheet.create(date: date, opened_at: Time.now, status: OPEN)
+        OvertimeSheet.create(date: date, opened_at: Time.now, status: OPEN, project_id: project_id)
       end
     end
   end

data/app/models/ecom/core/payment_detail.rb

@@ -8,4 +8,4 @@ module Ecom
                 :advance, presence: true
     end
   end
-end
+end

data/app/models/ecom/core/payroll.rb

@@ -4,6 +4,7 @@ module Ecom
       validates :month, :year, presence: true
 
       has_many :payments, class_name: 'Ecom::Core::Payment'
+      belongs_to :project
     end
   end
 end

data/app/models/ecom/core/project.rb

@@ -7,7 +7,11 @@ module Ecom
       belongs_to :project_manager, class_name: 'Ecom::Core::Stakeholder'
       belongs_to :task_template
       belongs_to :currency
-  
+      belongs_to :company
+
+      has_many :project_crews
+      has_many :crews, through: :project_crews
+
       validates :name, :location, :contract_number, :date_contract_signed, :commencement_date, :completion_date,
                 :contract_amount, :advance_payment, :retention, presence: true
     end

data/app/models/ecom/core/project_crew.rb

@@ -0,0 +1,15 @@
+module Ecom
+  module Core
+    class ProjectCrew < ApplicationRecord
+      ACTIVE = 'Active'.freeze
+      INACTIVE = 'Inactive'.freeze
+      STATUSES = [ACTIVE, INACTIVE].freeze
+
+      belongs_to :project
+      belongs_to :crew
+
+      validates :start_date, :status, presence: true
+      validates :status, inclusion: STATUSES
+    end
+  end
+end

data/db/migrate/20190101085530_create_ecom_core_companies.rb

@@ -0,0 +1,14 @@
+class CreateEcomCoreCompanies < ActiveRecord::Migration[6.0]
+  def change
+    create_table :ecom_core_companies do |t|
+      t.string :code, null: false, unique: true
+      t.string :name, null: false, unique: true
+      t.string :address, null: false
+      t.string :telephone, null: false
+      t.string :email
+      t.json :settings
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20191119012030_create_ecom_core_task_templates.rb

@@ -4,12 +4,13 @@ class CreateEcomCoreTaskTemplates < ActiveRecord::Migration[6.0]
       t.string :code, null: false
       t.string :name, null: false
       t.string :description
-      t.references :task_template_type, index: { name: 'ttt_on_tt_indx' }
+      t.references :task_template_type,
+                   null: false,
+                   index: { name: 'tt_on_ttt_indx' },
+                   foreign_key: { to_table: :ecom_core_task_template_types }
       t.string :ancestry, index: true
 
       t.timestamps
     end
-
-    add_foreign_key :ecom_core_task_templates, :ecom_core_task_template_types, column: :task_template_type_id
   end
 end

data/db/migrate/20191119013236_create_ecom_core_work_product_templates.rb

@@ -5,11 +5,12 @@ class CreateEcomCoreWorkProductTemplates < ActiveRecord::Migration[6.0]
       t.string :name, null: false, unique: true
       t.string :description
       t.string :remark
-      t.references :task_template, index: { name: 'tt_on_wpt_indx' }
+      t.references :task_template,
+                   null: false,
+                   index: { name: 'tt_on_wpt_indx' },
+                   foreign_key: { to_table: :ecom_core_task_templates }
 
       t.timestamps
     end
-
-    add_foreign_key :ecom_core_work_product_templates, :ecom_core_task_templates, column: :task_template_id
   end
 end

data/db/migrate/20191119144618_create_ecom_core_stakeholders.rb

@@ -9,11 +9,12 @@ class CreateEcomCoreStakeholders < ActiveRecord::Migration[6.0]
       t.string :contact_name, null: false
       t.string :contact_phone, null: false
       t.string :contact_email, null: false
-      t.references :stakeholder_type, index: { name: 'em_stakeholders_on_type_indx' }
+      t.references :stakeholder_type,
+                   null: false,
+                   index: { name: 'stakeholders_on_st_indx' },
+                   foreign_key: { to_table: :ecom_core_stakeholder_types }
 
       t.timestamps
     end
-
-    add_foreign_key :ecom_core_stakeholders, :ecom_core_stakeholder_types, column: :stakeholder_type_id
   end
 end

data/db/migrate/20191201131341_create_ecom_core_product_types.rb

@@ -2,13 +2,15 @@ class CreateEcomCoreProductTypes < ActiveRecord::Migration[6.0]
   def change
     create_table :ecom_core_product_types do |t|
       t.string :name, null: false
-      t.references :work_product_template, index: { name: 'pt_on_wpt_indx' }
+      t.references :work_product_template,
+                   null: false,
+                   index: { name: 'pt_on_wpt_indx' },
+                   foreign_key: { to_table: :ecom_core_work_product_templates }
       t.json :dimension
 
       t.timestamps
     end
 
     add_index :ecom_core_product_types, %i[name work_product_template_id], unique: true, name: 'wpt_on_pt_name_indx'
-    add_foreign_key :ecom_core_product_types, :ecom_core_work_product_templates, column: :work_product_template_id
   end
 end

data/db/migrate/20191201134420_create_ecom_core_work_component_templates.rb

@@ -6,8 +6,14 @@ class CreateEcomCoreWorkComponentTemplates < ActiveRecord::Migration[6.0]
       t.string :description
       t.integer :relative_percentage
       t.json :dimension
-      t.references :work_product_template, index: { name: 'wct_on_wpt_indx' }
-      t.references :task_template, index: { name: 'wct_on_tt_indx' }
+      t.references :work_product_template,
+                   null: false,
+                   index: { name: 'wct_on_wpt_indx' },
+                   foreign_key: { to_table: :ecom_core_work_product_templates }
+      t.references :task_template,
+                   null: false,
+                   index: { name: 'wct_on_tt_indx' },
+                   foreign_key: { to_table: :ecom_core_task_templates }
 
       t.timestamps
     end
@@ -15,9 +21,5 @@ class CreateEcomCoreWorkComponentTemplates < ActiveRecord::Migration[6.0]
     add_index :ecom_core_work_component_templates, %i[code work_product_template_id task_template_id],
               unique: true,
               name: 'wct_on_code_wpt_id_tt_id_indx'
-    add_foreign_key :ecom_core_work_component_templates, :ecom_core_work_product_templates,
-                    column: :work_product_template_id
-    add_foreign_key :ecom_core_work_component_templates, :ecom_core_task_templates,
-                    column: :task_template_id
   end
 end

data/db/migrate/20191201145848_create_ecom_core_projects.rb

@@ -6,11 +6,26 @@ class CreateEcomCoreProjects < ActiveRecord::Migration[6.0]
       t.string :location, null: false
       t.string :objective
       t.string :project_scope
-      t.references :employer, index: { name: 'employer_on_projects_indx' }
-      t.references :contractor, index: { name: 'employer_on_contractor_indx' }
-      t.references :consultant, index: { name: 'employer_on_consultant_indx' }
-      t.references :project_manager, index: { name: 'employer_on_pm_indx' }
-      t.references :task_template, index: { name: 'employer_on_tt_indx' }
+      t.references :employer,
+                   null: false,
+                   index: { name: 'employer_on_projects_indx' },
+                   foreign_key: { to_table: :ecom_core_stakeholders }
+      t.references :contractor,
+                   null: false,
+                   index: { name: 'employer_on_contractor_indx' },
+                   foreign_key: { to_table: :ecom_core_stakeholders }
+      t.references :consultant,
+                   null: false,
+                   index: { name: 'employer_on_consultant_indx' },
+                   foreign_key: { to_table: :ecom_core_stakeholders }
+      t.references :project_manager,
+                   null: false,
+                   index: { name: 'employer_on_pm_indx' },
+                   foreign_key: { to_table: :ecom_core_stakeholders }
+      t.references :task_template,
+                   null: false,
+                   index: { name: 'employer_on_tt_indx' },
+                   foreign_key: { to_table: :ecom_core_task_templates }
       t.string :contract_number, null: false
       t.date :date_contract_signed, null: false
       t.date :commencement_date, null: false
@@ -19,16 +34,16 @@ class CreateEcomCoreProjects < ActiveRecord::Migration[6.0]
       t.float :advance_payment, null: false
       t.float :retention, null: false
       t.string :remark
-      t.references :currency, index: { name: 'employer_on_currency_indx' }
+      t.references :currency,
+                   null: false,
+                   index: { name: 'employer_on_currency_indx' },
+                   foreign_key: { to_table: :ecom_core_currencies }
+      t.references :company,
+                   null: false,
+                   index: { name: 'project_on_company_indx' },
+                   foreign_key: { to_table: :ecom_core_companies }
 
       t.timestamps
     end
-
-    add_foreign_key :ecom_core_projects, :ecom_core_stakeholders, column: :employer_id
-    add_foreign_key :ecom_core_projects, :ecom_core_stakeholders, column: :contractor_id
-    add_foreign_key :ecom_core_projects, :ecom_core_stakeholders, column: :consultant_id
-    add_foreign_key :ecom_core_projects, :ecom_core_stakeholders, column: :project_manager_id
-    add_foreign_key :ecom_core_projects, :ecom_core_task_templates, column: :task_template_id
-    add_foreign_key :ecom_core_projects, :ecom_core_currencies, column: :currency_id
   end
 end

data/db/migrate/20191202103735_create_ecom_core_tasks.rb

@@ -5,13 +5,16 @@ class CreateEcomCoreTasks < ActiveRecord::Migration[6.0]
       t.string :name, null: false
       t.string :description
       t.string :ancestry
-      t.references :project, index: { name: 'tasks_on_project_indx' }
-      t.references :task_template, index: { name: 'tt_on_project_indx' }
+      t.references :project,
+                   null: false,
+                   index: { name: 'tasks_on_project_indx' },
+                   foreign_key: { to_table: :ecom_core_projects }
+      t.references :task_template,
+                   null: false,
+                   index: { name: 'tt_on_project_indx' },
+                   foreign_key: { to_table: :ecom_core_task_templates }
 
       t.timestamps
     end
-
-    add_foreign_key :ecom_core_tasks, :ecom_core_projects, column: :project_id
-    add_foreign_key :ecom_core_tasks, :ecom_core_task_templates, column: :task_template_id
   end
 end

data/db/migrate/20191202105355_create_task_templates_resource_types.rb

@@ -1,16 +1,17 @@
 class CreateTaskTemplatesResourceTypes < ActiveRecord::Migration[6.0]
   def change
     create_table :ecom_core_task_templates_resource_types, id: false do |t|
-      t.references :task_template, index: false
-      t.references :resource_type, index: false
+      t.references :task_template,
+                   null: false,
+                   index: false,
+                   foreign_key: { to_table: :ecom_core_task_templates }
+      t.references :resource_type,
+                   null: false,
+                   index: false,
+                   foreign_key: { to_table: :ecom_core_resource_types }
     end
 
     add_index :ecom_core_task_templates_resource_types, %i[task_template_id resource_type_id],
               unique: true, name: 'ttr_on_tt_rt_indx'
-
-    add_foreign_key :ecom_core_task_templates_resource_types, :ecom_core_task_templates,
-                    column: :task_template_id
-    add_foreign_key :ecom_core_task_templates_resource_types, :ecom_core_resource_types,
-                    column: :resource_type_id
   end
 end