ecom_core 1.2.7 → 1.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8604bb41df95be804fb66c2ac48f3e1b55b8f776de07f2dee665c4704350858
-  data.tar.gz: 30decab7dc7997c9c4a22bc2a90548c0b72a67b6648e894b6f1234c785739166
+  metadata.gz: 7ec4b0205003456f436aa5ec2ffc99f73d9f9dae97b5038f95b598fa259b6c66
+  data.tar.gz: 818efd4bff74c94646dd9fc96f99ee60f2e932e42183fbbdf240e277d9beacac
 SHA512:
-  metadata.gz: ac72d68e86a4ff54ee5bf33d3068cf57eb44ab5038873481be623cf1eb1c461c8c65749385536e973a9909c8269e5e06a1125562ff7c14a8c9dba322257fe500
-  data.tar.gz: 44c1ff6ddcbb054bd262ef9a0a75ab2fb6f42d4558a74afe7866c0ee451b45c577003f8c988a60e4a3e8341212451864cb4f633ffa4a6bf5d95bce1615ac7065
+  metadata.gz: 98e9f053543924c0b852c263d6185f5e09e8e7d5557a17835fc7e99b3d3b5f33eb26e2f4f1a4b01bad8195da0d950db9e924bb9ad4899e258c8a9393dac4fd73
+  data.tar.gz: ab3f72029a9386058701711220ac5884eb093385c292596d6cd4c0f34d31d71e5431b06e93df294e7e97de53db68afea0896032c0fd10ba8632d194b98532ea3

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/models/ecom/core/attendance_sheet.rb

@@ -1,37 +1,43 @@
 module Ecom
   module Core
     class AttendanceSheet < ApplicationRecord
-      OPEN = 'Open'.freeze
-      SUBMITTED = 'Submitted'.freeze
-      APPROVED = 'Approved'.freeze
-
-      validates :date, presence: true, uniqueness: true
-      validates :status, inclusion: [OPEN, SUBMITTED, APPROVED]
+      validates :date, presence: true, uniqueness: { scope: :project_id }
+      validates :status, inclusion: StatusConstants::STATUSES
 
       belongs_to :project
 
       has_many :attendance_sheet_entries
       has_many :crew_times, through: :attendance_sheet_entries
 
-      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) }
+      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, project_id)
-        AttendanceSheet.find_by(status: OPEN, date: date, project_id: project_id)
+        AttendanceSheet.find_by(status: StatusConstants::OPEN, date: date, project_id: project_id)
       end
 
       def self.open_exists?(project_id)
-        AttendanceSheet.open(project_id).exists?
+        AttendanceSheet
+          .by_project(project_id)
+          .by_status(StatusConstants::OPEN)
+          .exists?
       end
 
       def self.exists_for_today?(project_id)
-        AttendanceSheet.current(project_id).exists?
+        AttendanceSheet
+          .by_project(project_id)
+          .by_date(Date.today)
+          .exists?
       end
 
       def self.open_exists_for_today?(project_id)
-        AttendanceSheet.current_open(project_id).exists?
+        AttendanceSheet
+          .by_project(project_id)
+          .by_date(Date.today)
+          .by_status(StatusConstants::OPEN)
+          .exists?
       end
 
       # Attendance sheet should be created using the
@@ -46,16 +52,16 @@ module Ecom
           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, project_id: project_id)
+        AttendanceSheet.create(date: Date.today, opened_at: Time.now, status: StatusConstants::OPEN, project_id: project_id)
       end
 
       def self.submit_current(project_id)
-        sheet = AttendanceSheet.find_by(date: Date.today, status: OPEN, project_id: 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
@@ -69,7 +75,7 @@ module Ecom
         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/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

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,20 +1,20 @@
 module Ecom
   module Core
     class OvertimeSheet < ApplicationRecord
-      OPEN = 'Open'.freeze
-      SUBMITTED = 'Submitted'.freeze
-      APPROVED = 'Approved'.freeze
-
-      validates :date, :opened_at, presence: true, uniqueness: true
-      validates :status, inclusion: [OPEN, SUBMITTED, APPROVED]
+      validates :date, :opened_at, presence: true, uniqueness: { scope: :project_id }
+      validates :status, inclusion: StatusConstants::STATUSES
 
       belongs_to :project
 
       has_many :overtime_sheet_entries
       has_many :crew_overtimes, through: :overtime_sheet_entries
 
-      scope :open, ->(id) { where(status: OPEN, project_id: id) }
-      scope :submitted, ->(id) { where(status: SUBMITTED, project_id: id) }
+      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?(project_id)
         OvertimeSheet.open(project_id).exists?
@@ -38,7 +38,7 @@ module Ecom
           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, project_id: project_id)
+        OvertimeSheet.create(date: date, opened_at: Time.now, status: StatusConstants::OPEN, project_id: project_id)
       end
     end
   end

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

@@ -5,6 +5,10 @@ module Ecom
 
       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/db/migrate/20191225140433_create_ecom_core_attendance_sheets.rb

@@ -1,7 +1,7 @@
 class CreateEcomCoreAttendanceSheets < ActiveRecord::Migration[6.0]
   def change
     create_table :ecom_core_attendance_sheets do |t|
-      t.date :date, null: false, unique: true
+      t.date :date, null: false
       t.time :opened_at, null: false
       t.time :closed_at
       t.string :remark
@@ -13,5 +13,6 @@ class CreateEcomCoreAttendanceSheets < ActiveRecord::Migration[6.0]
 
       t.timestamps
     end
+    add_index :ecom_core_attendance_sheets, %i[date project_id], unique: true
   end
 end

data/db/migrate/20200410090701_create_ecom_core_overtime_sheets.rb

@@ -1,9 +1,10 @@
 class CreateEcomCoreOvertimeSheets < ActiveRecord::Migration[6.0]
   def change
     create_table :ecom_core_overtime_sheets do |t|
-      t.date :date, null: false, unique: true
+      t.date :date, null: false
       t.time :opened_at, null: false
       t.time :submitted_at
+      t.string :remark
       t.string :status, null: false, default: 'Open'
       t.references :project,
                    null: false,
@@ -12,5 +13,6 @@ class CreateEcomCoreOvertimeSheets < ActiveRecord::Migration[6.0]
 
       t.timestamps
     end
+    add_index :ecom_core_overtime_sheets, %i[date project_id], unique: true
   end
 end

data/lib/ecom/core/version.rb

@@ -1,5 +1,5 @@
 module Ecom
   module Core
-    VERSION = '1.2.7'.freeze
+    VERSION = '1.2.9'.freeze
   end
 end

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

@@ -4,7 +4,7 @@ FactoryBot.define do
     opened_at { Time.now }
     closed_at { nil }
     remark { FFaker::Name.name }
-    status { Ecom::Core::AttendanceSheet::OPEN }
+    status { Ecom::Core::StatusConstants::OPEN }
     association :project
   end
 end

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

@@ -3,7 +3,7 @@ FactoryBot.define do
     date { Date.today }
     opened_at { Time.now }
     submitted_at { Time.now + 1.day }
-    status { Ecom::Core::OvertimeSheet::OPEN }
+    status { Ecom::Core::StatusConstants::OPEN }
     association :project
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecom_core
 version: !ruby/object:Gem::Version
-  version: 1.2.7
+  version: 1.2.9
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-19 00:00:00.000000000 Z
+date: 2020-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -178,20 +178,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: solargraph
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: An engine which contains the core of a construction management app as
   a layer.
 email:
@@ -203,6 +189,7 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- app/constants/ecom/core/status_constants.rb
 - app/controllers/concerns/ecom/core/lookupable.rb
 - app/controllers/concerns/ecom/core/resource_typeable.rb
 - app/controllers/ecom/core/access_controller.rb