ecom_core 1.1.8 → 1.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3c37e72f220d44c53d4755665e74b1686cf2564b849fc3f2c4c841262e67b4f
-  data.tar.gz: d5c2e34ef00245ae8e71a19222df308c5a4ccd2b25c33d805431c6afe7e5d215
+  metadata.gz: 8709c2c3e2b254d5f9ad43731d7b8211dbec9c1c575540b9e5467cc572253574
+  data.tar.gz: 277e6297a78b839ba8d182d53e121e1226e958656e1672eb0033e686efc8d72e
 SHA512:
-  metadata.gz: dbcf516b21e2758bd8c338a12f03a07b34e074681faec9213b849e86db236a110ea2cb80333c1dd405948f0d389969b08d7ff1a655ce33b4a0e7ef75e6c28c36
-  data.tar.gz: 982a4664a200653053ae74380f2d2f8a53b7dc077543d0aec4b202b17ec2d64a28dad16bf7b9cd66204f2599744e21f977154f5e165a828a3e65e5eb7d0480a2
+  metadata.gz: 160eb086e465388d14de00a33449fc7bfdb335cc69a90dbcb3cd4689f09143dde9e2db67548087e2baeecd46cf97184395c5aab35a1625f34185ed3d472a9cde
+  data.tar.gz: dacf08a193c3eb2a8106b555653183e48ce8b7bf25273040c7d740f9c292ade85e3abb7a09e18e18580d7b6069285cfcec75df9ae6d1ffdac9035da3b9be7ada

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

@@ -1,10 +1,57 @@
 module Ecom
   module Core
     class AttendanceSheet < ApplicationRecord
-      validates :date, presence: true, uniqueness: true
+      OPEN = 'Open'.freeze
+      CLOSED = 'Closed'.freeze
 
+      validates :date, :opened_at, presence: true, uniqueness: true
+      validates :status, inclusion: [OPEN, CLOSED]
+
+      has_many :attendance_sheet_entries
+
+      scope :open, -> { find_by(status: OPEN) }
+
+      def self.exists_for_today?
+        AttendanceSheet.where(date: Date.today).exists?
+      end
+
+      def self.open_exists_for_today?
+        where(status: OPEN, date: Date.today).exists?
+      end
+
+      # Attendance sheet should be created using the
+      # method below only. This is because we need to
+      # check if there is an open attendance already,
+      # and also that we have only one attendace sheet
+      # per day.
       def self.create_current
-        AttendanceSheet.where(date: Date.today).first_or_create
+        raise 'Attendance sheet already created for the day.' if AttendanceSheet.exists_for_today?
+
+        AttendanceSheet.create(date: Date.today, opened_at: Time.now, status: OPEN)
+      end
+
+      def self.close_current
+        sheet = AttendanceSheet.find_by(date: Date.today, status: OPEN)
+
+        raise 'There is no attendance sheet to close.' if sheet.nil?
+
+        sheet.closed_at = Time.now
+        sheet.status = CLOSED
+        sheet.save
+        sheet
+      end
+
+      # This method should be used by privileged users
+      # to close 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.close
+        raise 'There is no attendance sheet to close.' unless AttendanceSheet.open_exists_for_today?
+
+        sheet = AttendanceSheet.open
+        sheet.closed_at = Time.now
+        sheet.save
+        sheet
       end
     end
   end

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

@@ -0,0 +1,8 @@
+module Ecom
+  module Core
+    class AttendanceSheetEntry < ApplicationRecord
+      belongs_to :attendance_sheet
+      belongs_to :crew
+    end
+  end
+end

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

@@ -8,7 +8,6 @@ module Ecom
                   if: proc { |c| c.employment_date.nil? }
 
       belongs_to :crew_type
-      has_many :crew_times, class_name: 'Ecom::Core::CrewTime'
 
       validates :name, :qualification, presence: true
       validates :employment, inclusion: [PERMANENT, TEMPORARY]

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

@@ -1,8 +1,7 @@
 module Ecom
   module Core
     class CrewTime < ApplicationRecord
-      belongs_to :crew
-      belongs_to :attendance_sheet
+      belongs_to :attendance_sheet_entry
       belongs_to :overtime_type, optional: true
 
       validates :hours, :converted_hours, presence: true

data/db/migrate/20200401040433_create_ecom_core_attendance_sheets.rb

@@ -2,9 +2,10 @@ class CreateEcomCoreAttendanceSheets < ActiveRecord::Migration[6.0]
   def change
     create_table :ecom_core_attendance_sheets do |t|
       t.date :date, null: false, unique: true
-      t.time :opened_at
+      t.time :opened_at, null: false
       t.time :closed_at
       t.string :remark
+      t.string :status, null: false, default: 'Open'
 
       t.timestamps
     end

data/db/migrate/20200401122539_create_ecom_core_attendance_sheet_entries.rb

@@ -0,0 +1,14 @@
+class CreateEcomCoreAttendanceSheetEntries < ActiveRecord::Migration[6.0]
+  def change
+    create_table :ecom_core_attendance_sheet_entries do |t|
+      t.references :attendance_sheet, null: false, index: { name: 'ase_on_as_indx' }
+      t.references :crew, null: false, index: { name: 'ase_on_crew_indx' }
+      t.float :total_hours
+
+      t.timestamps
+    end
+    add_foreign_key :ecom_core_attendance_sheet_entries, :ecom_core_attendance_sheets,
+                    column: :attendance_sheet_id
+    add_foreign_key :ecom_core_attendance_sheet_entries, :ecom_core_crews, column: :crew_id
+  end
+end

data/db/migrate/20200401142959_relate_crew_time_with_attendance_sheet_entry.rb

@@ -0,0 +1,8 @@
+class RelateCrewTimeWithAttendanceSheetEntry < ActiveRecord::Migration[6.0]
+  def change
+    add_column :ecom_core_crew_times, :attendance_sheet_entry_id, :integer,
+               index: { name: 'ase_on_ct_indx' }
+    add_foreign_key :ecom_core_crew_times, :ecom_core_attendance_sheet_entries,
+                    column: :attendance_sheet_entry_id
+  end
+end

data/db/migrate/20200401144137_remove_crew_time_id_from_crew.rb

@@ -0,0 +1,7 @@
+class RemoveCrewTimeIdFromCrew < ActiveRecord::Migration[6.0]
+  def change
+    remove_foreign_key :ecom_core_crew_times, :ecom_core_crews, column: :crew_id
+    remove_index :ecom_core_crew_times, name: 'ct_on_crew_indx'
+    remove_column :ecom_core_crew_times, :crew_id
+  end
+end

data/lib/ecom/core/version.rb

@@ -1,5 +1,5 @@
 module Ecom
   module Core
-    VERSION = '1.1.8'.freeze
+    VERSION = '1.1.9'.freeze
   end
 end

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

@@ -0,0 +1,7 @@
+FactoryBot.define do
+  factory :attendance_sheet_entry, class: 'Ecom::Core::AttendanceSheetEntry' do
+    association :attendance_sheet
+    association :crew
+    total_hours { FFaker::Random.rand(0..8) }
+  end
+end

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

@@ -2,7 +2,8 @@ FactoryBot.define do
   factory :attendance_sheet, class: 'Ecom::Core::AttendanceSheet' do
     date { Date.today }
     opened_at { Time.now }
-    closed_at { Time.now + 1 }
+    closed_at { nil }
     remark { FFaker::Name.name }
+    status { Ecom::Core::AttendanceSheet::OPEN }
   end
 end

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

@@ -4,10 +4,9 @@ FactoryBot.define do
     checkout_time { Time.now + 2 * 60 * 60 }
     hours { 2 }
     converted_hours { 2 }
-    association :crew
     remark { FFaker::Name.name }
     overtime { false }
     overtime_type { nil }
-    association :attendance_sheet
+    association :attendance_sheet_entry
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ecom_core
 version: !ruby/object:Gem::Version
-  version: 1.1.8
+  version: 1.1.9
 platform: ruby
 authors:
 - Henock L.
@@ -217,6 +217,7 @@ files:
 - app/models/ecom/core/application_module.rb
 - app/models/ecom/core/application_record.rb
 - app/models/ecom/core/attendance_sheet.rb
+- app/models/ecom/core/attendance_sheet_entry.rb
 - app/models/ecom/core/crew.rb
 - app/models/ecom/core/crew_time.rb
 - app/models/ecom/core/crew_type.rb
@@ -298,14 +299,17 @@ files:
 - db/migrate/20200315160810_create_ecom_core_equipment_valuations.rb
 - db/migrate/20200316125323_create_ecom_core_equipment_components.rb
 - db/migrate/20200401040433_create_ecom_core_attendance_sheets.rb
-- db/migrate/20200401043014_link_crew_times_with_attendance_sheet.rb
 - db/migrate/20200401071343_remove_date_column_from_crew_times.rb
+- db/migrate/20200401122539_create_ecom_core_attendance_sheet_entries.rb
+- db/migrate/20200401142959_relate_crew_time_with_attendance_sheet_entry.rb
+- db/migrate/20200401144137_remove_crew_time_id_from_crew.rb
 - lib/ecom/core.rb
 - lib/ecom/core/engine.rb
 - lib/ecom/core/version.rb
 - lib/ecom_core.rb
 - lib/tasks/ecom_core_tasks.rake
 - spec/factories/ecom/core/application_modules.rb
+- spec/factories/ecom/core/attendance_sheet_entries.rb
 - spec/factories/ecom/core/attendance_sheets.rb
 - spec/factories/ecom/core/crew_times.rb
 - spec/factories/ecom/core/crew_types.rb

data/db/migrate/20200401043014_link_crew_times_with_attendance_sheet.rb

@@ -1,10 +0,0 @@
-class LinkCrewTimesWithAttendanceSheet < ActiveRecord::Migration[6.0]
-  def up
-    add_column :ecom_core_crew_times, :attendance_sheet_id, :integer, index: { name: 'ct_on_as_indx' }
-    add_foreign_key :ecom_core_crew_times, :ecom_core_attendance_sheets, column: :attendance_sheet_id
-  end
-
-  def down
-    raise ActiveRecord::IrreversibleMigration
-  end
-end