ecom_core 1.2.20 → 1.2.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57de1b5bb610121618f09d6623d8f83e5c38e4d0f91415264c0c90008c4aca92
-  data.tar.gz: 2d1c048ac5692e8675a86a3fd769f5a3200be47d7790fd7df1ac25a7f1e6b045
+  metadata.gz: 55981c8967b5bc6d73d2ee78c31f2b0cdab1fbe48a43151ac23364b4b49c3a2e
+  data.tar.gz: c92cf858178d5225c806b0f65faf21bb67d819d2397fe564c0306866a950a34b
 SHA512:
-  metadata.gz: 5d32fb2ceea452a4327a86d3b0521ba719ed45bbf1392c754270686aeca4fb406bba683bb4ce7a60748ddcbd74f7fe1f955701eea507d5077b10ab6dfa23ac0c
-  data.tar.gz: 2a89d665d5ca5899193ce27d423ada50b36bf03a5a728c803b7839e0d15bab8a875eebd43152d66fbe7e378fdfd7522ac80cc4763f0903cfc7c1bcc195dbb4ec
+  metadata.gz: 1f79dd43c005604fed22a80bf4b071f1e07f5cddc8c6de368f96b7e0d06413d15edad31a73792ba353c31b8d7e9dc7c0553fe0a414bf9c065bcdb127f60dba7a
+  data.tar.gz: 4c4944902306db1e7317deb45cbcd5cdb91c0aa8ef9b12184ef2c9f25fcf1814fbebe6c1b6db6a63c48977e7484ae67fb6b73b2d2a503f30f2cfcaefcf26c1b7

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

@@ -61,7 +61,7 @@ module Ecom
 
         raise 'There is no open attendance sheet to submit.' if sheet.nil?
 
-        sheet.closed_at = Time.now
+        sheet.submitted_at = DateTime.now
         sheet.status = StatusConstants::SUBMITTED
         sheet.save
         sheet
@@ -75,11 +75,27 @@ module Ecom
         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.submitted_at = DateTime.now
         sheet.status = StatusConstants::SUBMITTED
         sheet.save
         sheet
       end
+
+      def submit
+        raise 'Attendance sheet is not open and cannot be submitted' if status != StatusConstants::OPEN
+
+        self.submitted_at = DateTime.now
+        self.status = StatusConstants::SUBMITTED
+        save
+      end
+
+      def approve
+        raise 'Attendance sheet is not submitted and cannot be approved' unless status == StatusConstants::SUBMITTED
+
+        self.status = StatusConstants::APPROVED
+        self.approved_at = DateTime.now
+        save
+      end
     end
   end
 end

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

@@ -1,6 +1,7 @@
 module Ecom
   module Core
     class Crew < ApplicationRecord
+      mount_base64_uploader :photo, PhotoUploader
       PERMANENT = 'Permanent'.freeze
       SUPERVISOR = 'Supervisor'.freeze
       TEMPORARY = 'Temporary'.freeze

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

@@ -44,6 +44,22 @@ module Ecom
 
         OvertimeSheet.create(date: date, opened_at: Time.now, status: StatusConstants::OPEN, project_id: project_id)
       end
+
+      def submit
+        raise 'Overtime sheet is not open and cannot be submitted' if status != StatusConstants::OPEN
+
+        self.submitted_at = DateTime.now
+        self.status = StatusConstants::SUBMITTED
+        save
+      end
+
+      def approve
+        raise 'Overtime sheet is not submitted and cannot be approved' unless status == StatusConstants::SUBMITTED
+
+        self.status = StatusConstants::APPROVED
+        self.approved_at = DateTime.now
+        save
+      end
     end
   end
 end

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

@@ -7,6 +7,8 @@ module Ecom
 
       before_validation :set_payment_order
 
+      scope :by_status, ->(status) { where(approved: status) }
+
       def set_payment_order
         unless payroll
           self.payment_order = 1

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

@@ -9,6 +9,16 @@ module Ecom
       scope :by_project, ->(id) { where(project_id: id) }
       scope :by_month, ->(month) { where(month: month) }
       scope :by_year, ->(year) { where(year: year) }
+
+      def create_next
+        m = month + 1
+        y = year
+        if m > 12
+          m = 1
+          y += 1
+        end
+        Payroll.create(month: m, year: y, project_id: project_id)
+      end
     end
   end
 end

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

@@ -7,7 +7,6 @@ module Ecom
 
       belongs_to :work_product
       belongs_to :task_template
-      belongs_to :work_package, optional: true
       belongs_to :performer, class_name: 'Ecom::Core::User', optional: true
       belongs_to :approver, class_name: 'Ecom::Core::User', optional: true
       belongs_to :supervisor, class_name: 'Ecom::Core::User', optional: true

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

@@ -6,7 +6,7 @@ module Ecom
       validates :code, :name, presence: true
       validates :code, uniqueness: true
 
-      has_many :tasks
+      has_many :work_products
     end
   end
 end

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

@@ -26,6 +26,7 @@ module Ecom
       belongs_to :work_product_template
       belongs_to :project
       belongs_to :product_group, optional: true
+      belongs_to :work_package, optional: true
       belongs_to :approver, class_name: 'Ecom::Core::User', optional: true
       belongs_to :supervisor, class_name: 'Ecom::Core::User', optional: true
       belongs_to :quality_controller, class_name: 'Ecom::Core::User', optional: true

data/app/uploaders/ecom/core/photo_uploader.rb

@@ -0,0 +1,15 @@
+module Ecom
+  module Core
+    class PhotoUploader < CarrierWave::Uploader::Base
+      storage :file
+
+      def store_dir
+        "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
+      end
+
+      def extension_whitelist
+        %w[jpg jpeg gif png]
+      end
+    end
+  end
+end

data/db/migrate/20191202235434_create_ecom_core_work_products.rb

@@ -9,6 +9,10 @@ class CreateEcomCoreWorkProducts < ActiveRecord::Migration[6.0]
                    null: true,
                    index: { name: 'wp_on_pg_indx' },
                    foreign_key: { to_table: :ecom_core_product_groups }
+      t.references :work_package,
+                   null: true,
+                   index: { name: 'wp_on_wp_indx' },
+                   foreign_key: { to_table: :ecom_core_work_packages } 
       t.references :work_product_template,
                    null: false,
                    index: { name: 'wpt_on_wp_indx' },

data/db/migrate/20191207103735_create_ecom_core_tasks.rb

@@ -10,10 +10,6 @@ class CreateEcomCoreTasks < ActiveRecord::Migration[6.0]
       t.string :status, null: false, default: :new
       t.integer :percent_completed, null: false, default: 0
       t.string :remark
-      t.references :work_package,
-                   null: true,
-                   index: { name: 'wp_on_wp_indx' },
-                   foreign_key: { to_table: :ecom_core_work_packages }
       t.references :performer,
                    null: true,
                    index: { name: 'tasks_on_performer_indx' },

data/db/migrate/20191225100054_create_ecom_core_crews.rb

@@ -12,6 +12,7 @@ class CreateEcomCoreCrews < ActiveRecord::Migration[6.0]
       t.string :wage_in_words, null: false
       t.date :employment_date
       t.boolean :sub_contracted, null: false, default: false
+      t.string :photo
       t.string :guarantor_name
       t.string :guarantor_phone
       t.boolean :active, null: false, default: true

data/db/migrate/20191225140433_create_ecom_core_attendance_sheets.rb

@@ -2,8 +2,9 @@ class CreateEcomCoreAttendanceSheets < ActiveRecord::Migration[6.0]
   def change
     create_table :ecom_core_attendance_sheets do |t|
       t.date :date, null: false
-      t.time :opened_at, null: false
-      t.time :closed_at
+      t.datetime :opened_at, null: false
+      t.datetime :submitted_at
+      t.datetime :approved_at
       t.string :remark
       t.string :status, null: false, default: 'Open'
       t.references :project,

data/db/migrate/20200410090701_create_ecom_core_overtime_sheets.rb

@@ -2,8 +2,9 @@ class CreateEcomCoreOvertimeSheets < ActiveRecord::Migration[6.0]
   def change
     create_table :ecom_core_overtime_sheets do |t|
       t.date :date, null: false
-      t.time :opened_at, null: false
-      t.time :submitted_at
+      t.datetime :opened_at, null: false
+      t.datetime :submitted_at
+      t.datetime :approved_at
       t.string :remark
       t.string :status, null: false, default: 'Open'
       t.references :project,

data/lib/ecom/core/version.rb

@@ -1,5 +1,5 @@
 module Ecom
   module Core
-    VERSION = '1.2.20'.freeze
+    VERSION = '1.2.25'.freeze
   end
 end

data/lib/ecom_core.rb

@@ -3,3 +3,5 @@ require 'ecom/core/engine'
 require 'ancestry'
 require 'aasm'
 require 'active_model_serializers'
+require 'carrierwave'
+require 'carrierwave/base64'

data/spec/factories/ecom/core/application_modules.rb

@@ -3,6 +3,8 @@ FactoryBot.define do
     sequence :code do |n|
       "AMCode#{n}"
     end
-    name { FFaker::Name.name }
+    sequence :name do |n|
+      "AMName#{n}"
+    end
   end
 end

data/spec/factories/ecom/core/attendance_sheets.rb

@@ -1,8 +1,9 @@
 FactoryBot.define do
   factory :attendance_sheet, class: Ecom::Core::AttendanceSheet do
     date { Date.today }
-    opened_at { Time.now }
-    closed_at { nil }
+    opened_at { DateTime.now }
+    submitted_at { nil }
+    approved_at { nil }
     remark { FFaker::Name.name }
     status { Ecom::Core::StatusConstants::OPEN }
     association :project

data/spec/factories/ecom/core/companies.rb

@@ -3,7 +3,9 @@ FactoryBot.define do
     sequence :code do |n|
       "CCode#{n}"
     end
-    name { FFaker::Name.name }
+    sequence :name do |n|
+      "CName#{n}"
+    end
     address { FFaker::Address.street_address }
     telephone { FFaker::PhoneNumber.phone_number }
     email { FFaker::Internet.email }

data/spec/factories/ecom/core/crews.rb

@@ -10,6 +10,7 @@ FactoryBot.define do
     wage_in_words { FFaker::Name.name }
     employment_date { Date.today - 1 }
     sub_contracted { false }
+    photo { FFaker::Name.name }
     guarantor_name { FFaker::Name.name }
     guarantor_phone { FFaker::Name.name }
     active { true }

data/spec/factories/ecom/core/currencies.rb

@@ -1,6 +1,10 @@
 FactoryBot.define do
   factory :currency, class: Ecom::Core::Currency do
-    code { FFaker::Currency.code }
-    name { FFaker::Currency.name }
+    sequence :code do |n|
+      "CCode#{n}"
+    end
+    sequence :name do |n|
+      "CName#{n}"
+    end
   end
 end

data/spec/factories/ecom/core/equipment.rb

@@ -1,6 +1,8 @@
 FactoryBot.define do
   factory :equipment, class: Ecom::Core::Equipment do
-    name { FFaker::Name.name }
+    sequence :name do |n|
+      "EQName#{n}"
+    end
     description { FFaker::Name.name }
     minimum_acquisition_time { 10 }
     brands { ['Brand I', 'Brand II', 'Brand III'] }

data/spec/factories/ecom/core/equipment_categories.rb

@@ -1,6 +1,8 @@
 FactoryBot.define do
   factory :equipment_category, class: Ecom::Core::EquipmentCategory do
-    name { FFaker::Name.name }
+    sequence :name do |n|
+      "ECName#{n}"
+    end
     description { FFaker::Name.name }
     association :equipment_type
   end

data/spec/factories/ecom/core/equipment_locations.rb

@@ -1,6 +1,8 @@
 FactoryBot.define do
   factory :equipment_location, class: Ecom::Core::EquipmentLocation do
-    name { FFaker::Name.name }
+    sequence :name do |n|
+      "ELName#{n}"
+    end
     description { FFaker::Name.name }
     address { FFaker::Name.name }
     association :location_type

data/spec/factories/ecom/core/lookups.rb

@@ -1,6 +1,8 @@
 FactoryBot.define do
   factory :lookup, class: Ecom::Core::Lookup do
-    name { FFaker::Name.name }
+    sequence :name do |n|
+      "LName#{n}"
+    end
     type { 'Ecom::Core::Lookup' }
   end
 end

data/spec/factories/ecom/core/overtime_sheets.rb

@@ -1,8 +1,9 @@
 FactoryBot.define do
   factory :overtime_sheet, class: Ecom::Core::OvertimeSheet do
     date { Date.today }
-    opened_at { Time.now }
-    submitted_at { Time.now + 1.day }
+    opened_at { DateTime.now }
+    submitted_at { nil }
+    approved_at { nil }
     status { Ecom::Core::StatusConstants::OPEN }
     association :project
   end

data/spec/factories/ecom/core/overtime_types.rb

@@ -1,6 +1,8 @@
 FactoryBot.define do
   factory :overtime_type, class: Ecom::Core::OvertimeType do
-    name { FFaker::Name.name }
+    sequence :name do |n|
+      "OTName#{n}"
+    end
     from { '07:00 AM' }
     to { '08:00 AM' }
     rate { 1.5 }

data/spec/factories/ecom/core/product_groups.rb

@@ -1,6 +1,8 @@
 FactoryBot.define do
   factory :product_group, class: Ecom::Core::ProductGroup do
-    name { FFaker::Name.name }
+    sequence :name do |n|
+      "PGName#{n}"
+    end
     association :project
   end
 end

data/spec/factories/ecom/core/product_types.rb

@@ -1,6 +1,8 @@
 FactoryBot.define do
   factory :product_type, class: Ecom::Core::ProductType do
-    name { FFaker::Name.name }
+    sequence :name do |n|
+      "PTname#{n}"
+    end
     association :work_product_template
     dimension { [{ name: 'length', label: 'length' }, { name: 'width', label: 'width' }] }
   end

data/spec/factories/ecom/core/resource_types.rb

@@ -3,7 +3,9 @@ FactoryBot.define do
     sequence :code do |n|
       "RTCode#{n}"
     end
-    name { FFaker::Name.name }
+    sequence :name do |n|
+      "RTName#{n}"
+    end
     base_unit { FFaker::Name.name }
     type { 'Ecom::Core::CrewType' }
   end

data/spec/factories/ecom/core/stakeholder_types.rb

@@ -1,5 +1,7 @@
 FactoryBot.define do
   factory :stakeholder_type, class: Ecom::Core::StakeholderType do
-    name { FFaker::Name.name }
+    sequence :name do |n|
+      "STName#{n}"
+    end
   end
 end

data/spec/factories/ecom/core/stakeholders.rb

@@ -1,6 +1,8 @@
 FactoryBot.define do
   factory :stakeholder, class: Ecom::Core::Stakeholder do
-    name { FFaker::Name.unique.name }
+    sequence :name do |n|
+      "Stakeholder #{n}"
+    end
     type_of_business { FFaker::Name.name }
     address { FFaker::Name.name }
     license_no { FFaker::Name.name }

data/spec/factories/ecom/core/tasks.rb

@@ -16,6 +16,5 @@ FactoryBot.define do
     association :quality_controller, factory: :user
     association :task_template
     association :work_product
-    association :work_package
   end
 end

data/spec/factories/ecom/core/work_products.rb

@@ -5,6 +5,7 @@ FactoryBot.define do
     design_reference_no { FFaker::Guid.guid }
     dimension { [{ label: 'Length', name: 'length', value: 12 }] }
     association :product_group
+    association :work_package
     association :work_product_template
     association :project
     status { Ecom::Core::WorkProduct::NEW }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecom_core
 version: !ruby/object:Gem::Version
-  version: 1.2.20
+  version: 1.2.25
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-25 00:00:00.000000000 Z
+date: 2020-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -38,6 +38,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.0
+- !ruby/object:Gem::Dependency
+  name: after_commit_everywhere
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.5
 - !ruby/object:Gem::Dependency
   name: ancestry
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +86,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: carrierwave
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: carrierwave-base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement
@@ -258,6 +306,7 @@ files:
 - app/serializers/ecom/core/user_serializer.rb
 - app/services/ecom/core/menu_service.rb
 - app/services/ecom/core/token_auth_service.rb
+- app/uploaders/ecom/core/photo_uploader.rb
 - app/validators/ecom/core/date_range_validator.rb
 - config/database.ci.yml
 - config/routes.rb