ecom_core 1.2.20 → 1.2.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57de1b5bb610121618f09d6623d8f83e5c38e4d0f91415264c0c90008c4aca92
-  data.tar.gz: 2d1c048ac5692e8675a86a3fd769f5a3200be47d7790fd7df1ac25a7f1e6b045
+  metadata.gz: 76cfd20fab207f93e180437a06181c5a72c682b358918d9187d37a7e63639eb4
+  data.tar.gz: 1013344fd51d5226101fa61b7517c3e69eb05d9e05b38f6984b6cf29684810a4
 SHA512:
-  metadata.gz: 5d32fb2ceea452a4327a86d3b0521ba719ed45bbf1392c754270686aeca4fb406bba683bb4ce7a60748ddcbd74f7fe1f955701eea507d5077b10ab6dfa23ac0c
-  data.tar.gz: 2a89d665d5ca5899193ce27d423ada50b36bf03a5a728c803b7839e0d15bab8a875eebd43152d66fbe7e378fdfd7522ac80cc4763f0903cfc7c1bcc195dbb4ec
+  metadata.gz: bfb8306c686dcfdae803be799e979d072de88abec6a81dda73e2db6916e444826947b7b7d7bf9868bccc950698b8a8d5b29eab2dfe30876ca7036b71250cb10b
+  data.tar.gz: 889d5da78b1bc946007b65fd923272106f79d9839f94673a78967d5a9815bc5becec7288ad56c9306504a67808f3f3ca74d99d78afedf801e439901dd89dd88a

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/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 = payroll.month + 1
+        y = payroll.year
+        if m > 12
+          m = 1
+          y += 1
+        end
+        Payroll.create(month: m, year: y)
+      end
     end
   end
 end

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.21'.freeze
   end
 end

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/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 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecom_core
 version: !ruby/object:Gem::Version
-  version: 1.2.20
+  version: 1.2.21
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-25 00:00:00.000000000 Z
+date: 2020-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm