ecom_core 1.1.17 → 1.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7bdf3745639577dacd60d41eb82831de69cd41040b71411628f17be1a8397b42
-  data.tar.gz: 21fd30d003500d6648d42eb6be7e5d073eff6b7810148cd00aed1fd2496363ec
+  metadata.gz: cbaba2b0f521af3d18d5636be2e3be40c6de15aa9f3951b5c3d8b57bdc634e83
+  data.tar.gz: 24ab07446617733ce416002684e0565f4bb04e66ad0a30d0b28d1f1cd79cf9a2
 SHA512:
-  metadata.gz: 769ccb1b054f0b6faf9421e323e562053d3fe7770fb3abed2af5e0535be3f61f39803deff27b4816d4b58efcb07419b46519c73906ff44c7480ee4b03e9ac099
-  data.tar.gz: 6d852af57207ad9cfbc6f30d7eaadf239c338b6c4796198e5ec8f833b69b16fba2d790d555b64b37279583e87edb8a517a7dfe0811e74b66fc21f1e0659c3b9c
+  metadata.gz: 88dc9269297366e77f415c768da3bb457414b57143f3aef34df98cbbc3923ac7a125f4bec6005f0f46ff071a64dfabb2295c91931b1033ad872f02cfc5100e04
+  data.tar.gz: cec52dafb2589e7711300bd0322425be7c670ee83bc440def6f26ee6663f10edf6fd1b4231327e28603e9e6bcea95e09e1635c6ce97dda774f69cdea736f58e7

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

@@ -10,19 +10,24 @@ module Ecom
 
       has_many :attendance_sheet_entries
 
-      scope :open, -> { find_by(status: OPEN) }
-      scope :current_open, -> { where(status: OPEN, date: Date.today) }
+      scope :open, -> { where(status: OPEN) }
+      scope :current, -> { where(date: Date.today) }
+      scope :current_open, -> { open.current }
+
+      def self.open_for_date(date)
+        AttendanceSheet.find_by(status: OPEN, date: date)
+      end
 
       def self.open_exists?
-        AttendanceSheet.where(status: OPEN).exists?
+        AttendanceSheet.open.exists?
       end
 
       def self.exists_for_today?
-        AttendanceSheet.where(date: Date.today).exists?
+        AttendanceSheet.current.exists?
       end
 
       def self.open_exists_for_today?
-        where(status: OPEN, date: Date.today).exists?
+        AttendanceSheet.current_open.exists?
       end
 
       # Attendance sheet should be created using the
@@ -53,13 +58,14 @@ 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 submit
-        raise 'This attendance sheet is not open. Therefore it cannot be submitted' unless status == OPEN
+      def self.submit(date)
+        sheet = AttendanceSheet.open_for_date(date)
+        raise 'There is no open attendance sheet to submit for the selected day.' unless sheet
 
-        self.closed_at = Time.now
-        self.status = SUBMITTED
-        save
-        self
+        sheet.closed_at = Time.now
+        sheet.status = SUBMITTED
+        sheet.save
+        sheet
       end
     end
   end

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

@@ -6,7 +6,7 @@ module Ecom
       belongs_to :revision_to, class_name: 'Ecom::Core::CrewOvertime', optional: true
       belongs_to :created_by, class_name: 'Ecom::Core::User'
 
-      has_one :revision, class_name: 'Ecom::Core::CrewOvertime'
+      has_one :revision, class_name: 'Ecom::Core::CrewOvertime', foreign_key: :revision_to_id
 
       validates :hours, :converted_hours, presence: true
 

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

@@ -10,10 +10,15 @@ module Ecom
 
       has_many :overtime_sheet_entries
 
-      scope :open, -> { find_by(status: OPEN) }
+      scope :open, -> { where(status: OPEN) }
+      scope :for_date, ->(date) { where(date: date) }
 
       def self.open_exists?
-        OvertimeSheet.where(status: OPEN).exists?
+        OvertimeSheet.open.exists?
+      end
+
+      def self.open_for_date_exists?(date)
+        OvertimeSheet.open.for_date(date).exists?
       end
 
       # Overtime sheet should be created using the
@@ -22,6 +27,10 @@ module Ecom
       # 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)
+          raise 'There is already an open overtime sheet for the selected date.'
+        end
+
         if OvertimeSheet.open_exists?
           raise 'There is already an open overtime sheet. It has to be submitted before creating a new one.'
         end

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

@@ -3,6 +3,7 @@ module Ecom
     class OvertimeSheetEntry < ApplicationRecord
       belongs_to :overtime_sheet
       belongs_to :crew
+      has_many :crew_overtimes
     end
   end
 end

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

@@ -6,7 +6,7 @@ module Ecom
       has_and_belongs_to_many :user_roles, join_table: 'ecom_core_users_user_roles'
 
       VALID_EMAIL_REGEX = /\A[\w+\-.]+@[a-z\d\-.]+\.[a-z]+\z/i.freeze
-      validates :first_name, :last_name, :active, presence: true
+      validates :first_name, :last_name, presence: true
       validates :email, presence: true, format: { with: VALID_EMAIL_REGEX }, uniqueness: { case_sensitive: false }
       validates :password, presence: true, length: { minimum: 6 }, confirmation: true, if: :password
 

data/lib/ecom/core/version.rb

@@ -1,5 +1,5 @@
 module Ecom
   module Core
-    VERSION = '1.1.17'.freeze
+    VERSION = '1.1.18'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecom_core
 version: !ruby/object:Gem::Version
-  version: 1.1.17
+  version: 1.1.18
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-10 00:00:00.000000000 Z
+date: 2020-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm