ecom_core 1.1.14 → 1.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b8bc2e6d8400e996f20f351ee949cff29dbbbba72dbb396c2039b51714ac6f7
-  data.tar.gz: f4c58d21264802a0dc6b18a2adf895205a66c33cbbb160e7b677e9e65eae5465
+  metadata.gz: d9fc9fe1236a00b622bd5943fab08346f23c4de7f059e65fddb511907eda18bf
+  data.tar.gz: cf6f34036919d900666afcd8419b26ca5f6e9b2ec45f047e4e3afb3bba27c649
 SHA512:
-  metadata.gz: e3a700353f3e4fc0bf5e7402026c0ae492a51dae4e30c42a21125e0cef713923910add513c1dc37dfd5aefff06de0451e15c8ca6493e6e226903ec389c736b78
-  data.tar.gz: 39c78b1cd0607c49a7c954b96ce87af031067c198ee78ac628f43715604a38b5b665a11d3019d5abfd5a72db8efb386878a91112143140a4b81bc782126b30a6
+  metadata.gz: 5f2d852b30af828fd6dbdfe72a0663905285f98c1b935becd9953fd54433502cc7fdea620e8f43cf11719d723aa8cfcb8622cd74937404658c39ee9229fd1909
+  data.tar.gz: fc8f98d4b4c383a13092c5166963163afcde41745d279f8a97fa025ee66c3e19de0d906855e970b444879b147972b00a0f59efa01f3166f6fde1714ec1c58620

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

@@ -2,10 +2,11 @@ module Ecom
   module Core
     class AttendanceSheet < ApplicationRecord
       OPEN = 'Open'.freeze
-      CLOSED = 'Closed'.freeze
+      SUBMITTED = 'Submitted'.freeze
+      APPROVED = 'Approved'.freeze
 
       validates :date, :opened_at, presence: true, uniqueness: true
-      validates :status, inclusion: [OPEN, CLOSED]
+      validates :status, inclusion: [OPEN, SUBMITTED, APPROVED]
 
       has_many :attendance_sheet_entries
 
@@ -31,28 +32,28 @@ module Ecom
         AttendanceSheet.create(date: Date.today, opened_at: Time.now, status: OPEN)
       end
 
-      def self.close_current
+      def self.submit_current
         sheet = AttendanceSheet.find_by(date: Date.today, status: OPEN)
 
-        raise 'There is no attendance sheet to close.' if sheet.nil?
+        raise 'There is no open attendance sheet to submit.' if sheet.nil?
 
         sheet.closed_at = Time.now
-        sheet.status = CLOSED
+        sheet.status = SUBMITTED
         sheet.save
         sheet
       end
 
       # This method should be used by privileged users
-      # to close the attendance sheet after the date has
+      # 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 self.close
-        raise 'There is no attendance sheet to close.' unless AttendanceSheet.open_exists_for_today?
+      def submit
+        raise 'This attendance sheet is not open. Therefore it cannot be submitted' unless status == OPEN
 
-        sheet = AttendanceSheet.open
-        sheet.closed_at = Time.now
-        sheet.save
-        sheet
+        self.closed_at = Time.now
+        self.status = SUBMITTED
+        save
+        self
       end
     end
   end

data/lib/ecom/core/version.rb

@@ -1,5 +1,5 @@
 module Ecom
   module Core
-    VERSION = '1.1.14'.freeze
+    VERSION = '1.1.15'.freeze
   end
 end

metadata

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