sis_core 1.0.10 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ff2d148f4eca48a8979342a003e254fdbec40a6a147676644de6226a56cff81
-  data.tar.gz: 6bc411d65008fd7a3977b386d2ebf41aa9260f470895903df2f599b8458c2a29
+  metadata.gz: 01b7b4d1444769ba3e2953377e0eb99528221ad26f98cae32e88ef57351940c9
+  data.tar.gz: 4424ba65e6077accf44a1a215f87b4594f79a9c04523cb26660999606945f5be
 SHA512:
-  metadata.gz: 7aba4b8f85de604a00fd1faddc86e9cc9c0c55320d4cfe9a0c917c9f598dc7cd259378c09e24f399c3d37c2666f73b5b139e83de75359fd7d86d56067d07db04
-  data.tar.gz: 84203b42fac41805a48f285568f78a707bf0a9c0364f77d6ace0e2e4182a202445634d5f82317ea7b3f4f063ba3f61c47d2866a9dadd09fc882c0e0977f0bc68
+  metadata.gz: 17ac3d072458f6b74b25e4301ed1ceb4ac3d2b31d1fb1343936d3efa03eec1f9fbe60fa95aa4b6823de7f15fd9d1e0a696040179503428d83c27fc8355342bf9
+  data.tar.gz: fd114115c828fee511449c65fd6302e91677bd5c4596e9e524413be00bd87bafb9dc2e6929c2592c62acb6141a31cfac28a2baa61004790a86a52e9140079ac4

data/app/controllers/sis/core/users_controller.rb

@@ -27,7 +27,8 @@ module Sis
       def login
         user = User.find_by_email(params[:email])
         if User&.find_by_email(params[:email]) && user.authenticate(params[:password])
-          token = JsonWebToken.encode({ id: user.id, first_name: user.first_name, last_name: user.last_name })
+          token = JsonWebToken.encode({ id: user.id, first_name: user.first_name, last_name: user.last_name,
+                                        roles: user.user_roles.map(&:name) })
           render json: { success: true, jwt: token }
         else
           render json: { success: false, errors: ['Invalid username or password !'] }

data/app/models/sis/core/application.rb

@@ -9,18 +9,15 @@ module Sis
 
       aasm column: :status do
         state :draft, initial: true
-        state :submitted, :under_review, :accepted, :rejected, :selected_for_exam, :selected_for_admission
+        state :submitted, :under_review, :rejected, :selected_for_exam, :selected_for_admission, :waiting, :accepted,
+              :declined
 
         event :submit do
           transitions from: :draft, to: :submitted
         end
 
         event :review do
-          transitions from: %i[submitted rejected accepted], to: :under_review
-        end
-
-        event :accept do
-          transitions from: :under_review, to: :accepted
+          transitions from: %i[submitted rejected], to: :under_review
         end
 
         event :reject do
@@ -28,12 +25,24 @@ module Sis
         end
 
         event :select_for_exam do
-          transitions from: :accepted, to: :selected_for_exam
+          transitions from: %i[submitted under_review], to: :selected_for_exam
         end
 
         event :select_for_admission do
           transitions from: :selected_for_exam, to: :selected_for_admission
         end
+
+        event :select_for_waiting do
+          transitions from: :selected_for_exam, to: :waiting
+        end
+
+        event :accept do
+          transitions from: :selected_for_admission, to: :accepted
+        end
+
+        event :decline do
+          transitions from: :selected_for_admission, to: :declined
+        end
       end
 
       validates :status, presence: true
@@ -42,6 +51,7 @@ module Sis
       belongs_to :applicant
       belongs_to :academic_programme
       belongs_to :application_setup
+      has_many :application_documents
 
       delegate(:name, to: :academic_programme, prefix: true, allow_nil: false)
       delegate(:full_name, to: :applicant, prefix: true, allow_nil: false)

data/app/models/sis/core/credit_hour_rate.rb

@@ -0,0 +1,13 @@
+module Sis
+  module Core
+    class CreditHourRate < ApplicationRecord
+      belongs_to :programme_level
+      belongs_to :currency
+
+      validates :rate, presence: true
+
+      delegate(:name, to: :programme_level, prefix: true, allow_nil: false)
+      delegate(:name, to: :currency, prefix: true, allow_nil: false)
+    end
+  end
+end

data/app/models/sis/core/currency.rb

@@ -0,0 +1,7 @@
+module Sis
+  module Core
+    class Currency < Lookup
+      validates :name, presence: true
+    end
+  end
+end

data/db/migrate/20200919235516_create_sis_core_credit_hour_rates.rb

@@ -0,0 +1,17 @@
+class CreateSisCoreCreditHourRates < ActiveRecord::Migration[6.0]
+  def change
+    create_table :sis_core_credit_hour_rates do |t|
+      t.references :programme_level,
+                   null: false,
+                   index: { name: 'pr_level_on_chr_hr_rate_indx' },
+                   foreign_key: { to_table: :sis_core_lookups }
+      t.references :currency,
+                   null: false,
+                   index: { name: 'currency_on_chr_hr_rate_indx' },
+                   foreign_key: { to_table: :sis_core_lookups }
+      t.float :rate, null: false
+
+      t.timestamps
+    end
+  end
+end

data/lib/sis/core/version.rb

@@ -1,5 +1,5 @@
 module Sis
   module Core
-    VERSION = '1.0.10'.freeze
+    VERSION = '1.0.11'.freeze
   end
 end

data/spec/factories/sis/core/credit_hour_rates.rb

@@ -0,0 +1,7 @@
+FactoryBot.define do
+  factory :credit_hour_rate, class: Sis::Core::CreditHourRate do
+    association :programme_level
+    association :currency
+    rate { 1.5 }
+  end
+end

data/spec/factories/sis/core/currencies.rb

@@ -0,0 +1,5 @@
+FactoryBot.define do
+  factory :currency, class: Sis::Core::Currency, parent: :lookup do
+    type { 'Sis::Core::Currency' }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sis_core
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-21 00:00:00.000000000 Z
+date: 2020-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -242,6 +242,8 @@ files:
 - app/models/sis/core/application_setup.rb
 - app/models/sis/core/course.rb
 - app/models/sis/core/course_registration.rb
+- app/models/sis/core/credit_hour_rate.rb
+- app/models/sis/core/currency.rb
 - app/models/sis/core/document_requirement.rb
 - app/models/sis/core/document_type.rb
 - app/models/sis/core/exam.rb
@@ -286,6 +288,7 @@ files:
 - db/migrate/20200511165121_create_sis_core_application_modules.rb
 - db/migrate/20200511165241_create_sis_core_user_roles.rb
 - db/migrate/20200511165450_create_sis_core_menus.rb
+- db/migrate/20200919235516_create_sis_core_credit_hour_rates.rb
 - lib/authorize_request.rb
 - lib/json_web_token.rb
 - lib/sis/core.rb
@@ -302,6 +305,8 @@ files:
 - spec/factories/sis/core/applications.rb
 - spec/factories/sis/core/course_registrations.rb
 - spec/factories/sis/core/courses.rb
+- spec/factories/sis/core/credit_hour_rates.rb
+- spec/factories/sis/core/currencies.rb
 - spec/factories/sis/core/document_requirements.rb
 - spec/factories/sis/core/document_types.rb
 - spec/factories/sis/core/exam_results.rb
@@ -337,7 +342,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Core engine for student information system application.