ecom_core 1.2.4 → 1.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09b8fa70ec63b31c289bacc382fb945336e8e6a3e6930e54d415ed6ba79ec5aa'
-  data.tar.gz: d8cbbc31eb4718a6b4af1808810a3defa163b4b0743d235756e618e1bb37fb10
+  metadata.gz: 2de520c3c443ad4a66801803d93805335bc40375187899958bbb448c7e15d38e
+  data.tar.gz: b9f4f9977b97175fc0cb2ee3bc46e50a8b136ad9ace5410eb35d134a3da2f813
 SHA512:
-  metadata.gz: 7ba2a9547ffcb1d3085b893e44bee505639abb61caa3cdc28df3cbf56f883910ac1bea7b9645d0577b0bb006dd81a4b5df661cac74f54323a224b8b1b3d7cbc8
-  data.tar.gz: c0eb28eb93b466d7da5dcdf05876351c721e8a541e33cd0d23a26627cf5e0f1934e1e94283f35636111e949c8095e93c58c69f8a39f648c72f622898e15a5b19
+  metadata.gz: c331269793e3eb5ff70c2d0e7061ca5d8aa9c8260e26dbe28e854e518b3a6448845e587b9b5d85ea3f2c94cb5afe7a92e59feaa37fb1a7d87be882d6682b8f6d
+  data.tar.gz: 38912a987b162fa8739458f37d2161e33f0064cc3bf953028dae39bd478edd4df6d8fd5d332a9e078deaa87122d66b0a755a26b50e82d006a5a8024543220297

data/app/constants/ecom/core/status_constants.rb

@@ -0,0 +1,11 @@
+module Ecom
+  module Core
+    class StatusConstants
+      OPEN = 'Open'.freeze
+      SUBMITTED = 'Submitted'.freeze
+      APPROVED = 'Approved'.freeze
+
+      STATUSES = [OPEN, SUBMITTED, APPROVED].freeze
+    end
+  end
+end

data/app/controllers/ecom/core/access_controller.rb

@@ -18,7 +18,7 @@ module Ecom
               return
             end
 
-            payload = { id: user.id, email: user.email, name: user.full_name, roles: roles }
+            payload = { id: user.id, email: user.email, name: user.full_name, roles: roles, projects: user.projects }
             jwt = TokenAuthService.issue(payload)
             render json: { token: jwt, user: payload, error: nil }
           else

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

@@ -1,34 +1,43 @@
 module Ecom
   module Core
     class AttendanceSheet < ApplicationRecord
-      OPEN = 'Open'.freeze
-      SUBMITTED = 'Submitted'.freeze
-      APPROVED = 'Approved'.freeze
+      validates :date, presence: true, uniqueness: { scope: :project_id }
+      validates :status, inclusion: StatusConstants::STATUSES
 
-      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 :by_project, ->(id) { where(project_id: id) }
+      scope :by_date, ->(date) { where(date: date) }
+      scope :by_status, ->(status) { where(status: status) }
+      scope :by_date_between, ->(from, to) { where('date BETWEEN ? AND ?', from, to) }
 
-      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: StatusConstants::OPEN, date: date, project_id: project_id)
       end
 
-      def self.open_exists?
-        AttendanceSheet.open.exists?
+      def self.open_exists?(project_id)
+        AttendanceSheet
+          .by_project(project_id)
+          .by_status(StatusConstants::OPEN)
+          .exists?
       end
 
-      def self.exists_for_today?
-        AttendanceSheet.current.exists?
+      def self.exists_for_today?(project_id)
+        AttendanceSheet
+          .by_project(project_id)
+          .by_date(Date.today)
+          .exists?
       end
 
-      def self.open_exists_for_today?
-        AttendanceSheet.current_open.exists?
+      def self.open_exists_for_today?(project_id)
+        AttendanceSheet
+          .by_project(project_id)
+          .by_date(Date.today)
+          .by_status(StatusConstants::OPEN)
+          .exists?
       end
 
       # Attendance sheet should be created using the
@@ -36,21 +45,23 @@ 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: StatusConstants::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: StatusConstants::OPEN, project_id: project_id)
 
         raise 'There is no open attendance sheet to submit.' if sheet.nil?
 
         sheet.closed_at = Time.now
-        sheet.status = SUBMITTED
+        sheet.status = StatusConstants::SUBMITTED
         sheet.save
         sheet
       end
@@ -59,12 +70,12 @@ 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
-        sheet.status = SUBMITTED
+        sheet.status = StatusConstants::SUBMITTED
         sheet.save
         sheet
       end

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

@@ -2,17 +2,17 @@ module Ecom
   module Core
     class Crew < ApplicationRecord
       PERMANENT = 'Permanent'.freeze
+      SUPERVISOR = 'Supervisor'.freeze
       TEMPORARY = 'Temporary'.freeze
+      EMPLOYMENT_TYPES = [PERMANENT, SUPERVISOR, TEMPORARY].freeze
 
       before_save :set_employment_date,
                   if: proc { |c| c.employment_date.nil? }
 
       belongs_to :crew_type
 
-      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 }
+      validates :name, :address, :qualification, :employment, :wage, :wage_in_words, presence: true
+      validates :employment, inclusion: EMPLOYMENT_TYPES
 
       def set_employment_date
         self.employment_date = Date.today

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

@@ -10,6 +10,11 @@ module Ecom
 
       validates :hours, :raw_hours, presence: true
 
+      scope :by_overtime, lambda { |id|
+        joins(:overtime_sheet_entry).where(ecom_core_overtime_sheet_entries: { overtime_sheet_id: id })
+      }
+      scope :revised, ->(revised) { where(revised: revised) }
+
       before_save :calculate_hours
 
       def calculate_hours
@@ -18,4 +23,4 @@ module Ecom
       end
     end
   end
-end
+end

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

@@ -7,8 +7,8 @@ module Ecom
       BOTH = 'Both'.freeze
 
       TIME_RANGE = {
-        MORNING => {start: Time.zone.parse('5:00 AM'), end: Time.zone.parse('9:00 AM')},
-        AFTERNOON => {start: Time.zone.parse('10:00 AM'), end: Time.zone.parse('2:00 PM')},
+        MORNING => { start: Time.zone.parse('5:00 AM'), end: Time.zone.parse('9:00 AM') },
+        AFTERNOON => { start: Time.zone.parse('10:00 AM'), end: Time.zone.parse('2:00 PM') },
         BOTH => {start: Time.zone.parse('5:00 AM'), end: Time.zone.parse('2:00 PM')}
       }.freeze
 
@@ -19,6 +19,11 @@ module Ecom
 
       validates :checkin_time, presence: true, if: :checkout_time
 
+      scope :by_attendance, lambda { |id|
+        joins(:attendance_sheet_entry).where(ecom_core_attendance_sheet_entries: { attendance_sheet_id: id })
+      }
+      scope :revised, ->(revised) { where(revised: revised) }
+
       before_save :calculate_hours
       after_save :calculate_total
 

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

@@ -1,24 +1,27 @@
 module Ecom
   module Core
     class OvertimeSheet < ApplicationRecord
-      OPEN = 'Open'.freeze
-      SUBMITTED = 'Submitted'.freeze
-      APPROVED = 'Approved'.freeze
+      validates :date, :opened_at, presence: true, uniqueness: { scope: :project_id }
+      validates :status, inclusion: StatusConstants::STATUSES
 
-      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 :by_project, ->(id) { where(project_id: id) }
+      scope :by_date, ->(date) { where(date: date) }
+      scope :by_status, ->(status) { where(status: status) }
+      scope :by_date_between, ->(from, to) { where('date BETWEEN ? AND ?', from, to) }
+      scope :open, ->(id) { where(status: StatusConstants::OPEN, project_id: id) }
+      scope :submitted, ->(id) { where(status: StatusConstants::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: StatusConstants::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,11 @@ module Ecom
       validates :month, :year, presence: true
 
       has_many :payments, class_name: 'Ecom::Core::Payment'
+      belongs_to :project
+
+      scope :by_project, ->(id) { where(project_id: id) }
+      scope :by_month, ->(month) { where(month: month) }
+      scope :by_year, ->(year) { where(year: year) }
     end
   end
 end

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

@@ -7,6 +7,10 @@ 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

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/config/database.ci.yml

@@ -4,6 +4,7 @@ default: &default
   pool: 5
   timeout: 5000
   host: <%= ENV['DB_HOST'] %>
+  port: <%= ENV['DB_PORT'] %>
   username: <%= ENV['POSTGRES_USER'] %>
   password: <%= ENV['POSTGRES_PASSWORD'] %>
   database: <%= ENV['POSTGRES_DB'] %>

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