ecom_core 1.1.11 → 1.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac844133bce138559e3a84c51b8f617a42cbcfed66935835693e9478230cc682
-  data.tar.gz: 1416a37521f375b4b4432816661fa7f71dc1e9859c4822b4c63dc692bf144f57
+  metadata.gz: fe250f7096d4de2dbcce2ab0e9ad159f107812cf69768fa6cd92962c8c80c937
+  data.tar.gz: 29bba333d43472d8339ad18a0ecd9e238a72b705c13fd86ae283ac095d9adf0b
 SHA512:
-  metadata.gz: 0244a00f0335429ea1810c615ecaa7f4d934f8f2ab0cca46da585c576b4420acd45606cb0f11f6cd060009e292bbc47564f4761a9823f6a2751789f77c50b25d
-  data.tar.gz: e17dc48bf97da94e12e824099e70d3a86f5aa6600fb67507278afba74eae7bdad6c5bade2dcaf2a9cb23936856be98b98a953ed863df776df3ab56e48e07bed8
+  metadata.gz: 981a42e43a0beeef91423b2f282c2908dd516d1c4ee56d5ad55cf6275221f3962e2ba1eacb7861d63bdb5ae4805041f1e786f321473696f540c927b8c8472b8f
+  data.tar.gz: 2a84218270b5001b34d02c16e4a5c6cfc6fc0e9d47651389e2851524bf4e6910dc8e99b6578e2d52dd7996802c06953f266034df6652a42c97c8e6608e48f162

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

@@ -2,14 +2,20 @@ 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
 
       scope :open, -> { find_by(status: OPEN) }
+      scope :current_open, -> { where(status: OPEN, date: Date.today) }
+
+      def self.open_exists?
+        AttendanceSheet.where(status: OPEN).exists?
+      end
 
       def self.exists_for_today?
         AttendanceSheet.where(date: Date.today).exists?
@@ -27,31 +33,33 @@ module Ecom
       def self.create_current
         raise 'Attendance sheet already created for the day.' if AttendanceSheet.exists_for_today?
 
+        raise 'There is an open attendance sheet which needs to be submitted before creating a new one.' if AttendanceSheet.open_exists?
+
         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/app/models/ecom/core/attendance_sheet_entry.rb

@@ -3,6 +3,7 @@ module Ecom
     class AttendanceSheetEntry < ApplicationRecord
       belongs_to :attendance_sheet
       belongs_to :crew
+      has_many :crew_times
     end
   end
 end

data/app/services/ecom/core/menu_service.rb

@@ -9,13 +9,13 @@ module Ecom
         SQL
         menu = Menu.joins(join_sql).where('UR.id IN (?)', role_ids).distinct
         menu_list = menu.select { |m| m.parent.nil? }.each_with_object([]) do |item, list|
-          list << { id: item.id, label: item.label, icon: item.icon, items: [] }
+          list << { id: item.id, label: item.label, icon: item.icon, children: [] }
         end
 
         menu_list.each do |ml|
-          ml[:items] = menu.reject { |m| m.parent.nil? }.each_with_object([]) do |item, list|
+          ml[:children] = menu.reject { |m| m.parent.nil? }.each_with_object([]) do |item, list|
             if item.parent_id == ml[:id]
-              list << { id: item.id, label: item.label, icon: item.icon, routerLink: item.route }
+              list << { id: item.id, label: item.label, icon: item.icon, route: item.route }
             end
           end
         end

data/lib/ecom/core/version.rb

@@ -1,5 +1,5 @@
 module Ecom
   module Core
-    VERSION = '1.1.11'.freeze
+    VERSION = '1.1.16'.freeze
   end
 end

metadata

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