sis_core 1.0.7 → 1.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d9b0264aef8769263ead6f9f8bcef7b789ca2a52ec27478a1646e0626e67ebb
-  data.tar.gz: f5c6909c614cd0ff7fdc75d922d22836c030be6a951e60cc4f640895f7e62bb2
+  metadata.gz: 0a391a271ae5aa358a916776b0e2eedf3fc09cdb49e522627c81a5eefcdf6072
+  data.tar.gz: 667e0483f0eb8dbac9d6bb81d2e7b98d3f59bb3244e3251f23010a921db5a8c7
 SHA512:
-  metadata.gz: 061ec28c7971d97981cd84d3662350d261c30fb5a5cfa845f7d9b7be7bcd06e341f4cb40976d48fa850b52adfcfb9cc29f1b78cf707b7fdfed52aa7a071bc16b
-  data.tar.gz: 9293603b43d28e10bbe8d79024fc1c5392bdd5c43e2b378fc1497acc36624c95d108d8fc138acb5839abb47e336c2adbed2fca576727a33caeecd8163fecbc42
+  metadata.gz: 8ac73e86b89644a285ddb1b45425daa0e809f80b0023f3dcbf091eec7344819ee51b22a2ff791268dad3ec701bf9307f4256dd6e483700f6f11ec10d1f99df59
+  data.tar.gz: 4b9073797a0fc8317ba4f190678fba109444d8b1a0148383cbc7d5b694f61a56ffb39ba238bb1494bb5c2d10fc705cd3bb8dfbc0361616d6657a417095e16fde

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

@@ -11,8 +11,8 @@ module Sis
           user_menus.each do |user_menu|
             children = user_menu.children.where(parent_id: user_menu.id, application_module_id: app_module_id)
             children = children.map { |c| { label: c.text, icon: c.icon_cls, routerLink: [c.location] } }
-            menus.push({ label: user_menu.text, icon: user_menu.icon_cls, location: user_menu.location,
-                         items: children })
+            menus.push({ id: user_menu.id, label: user_menu.text, icon: user_menu.icon_cls,
+                         location: user_menu.location, items: children, expanded: true })
           end
         end
         render json: { success: true, data: menus }

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/applicant.rb

@@ -5,11 +5,21 @@ module Sis
       validates :first_name, :middle_name, :last_name, :email, presence: true
       validates :email, uniqueness: true
 
+      has_many :applications
+
       has_secure_password
 
       def full_name
         first_name + ' ' + middle_name + ' ' + last_name
       end
+
+      scope :by_application_setup, (lambda do |app_setup_id|
+        joins(applications: :application_setup).where('sis_core_applications.application_setup_id': app_setup_id)
+      end)
+
+      scope :by_status, (lambda do |status|
+        joins(:applications).where('sis_core_applications.status': status)
+      end)
     end
   end
 end

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/application_setup.rb

@@ -7,6 +7,7 @@ module Sis
       belongs_to :academic_programme
       belongs_to :target_semester, class_name: 'Sis::Core::Semester'
       has_many :document_requirements
+      has_many :exam_setups
 
       validates :start_date, :end_date, :status, presence: true
       validates :status, inclusion: [OPEN, CLOSED]

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/app/models/sis/core/exam.rb

@@ -12,6 +12,10 @@ module Sis
       end
 
       delegate(:name, to: :exam_setup, prefix: true, allow_nil: false)
+
+      scope :by_application_setup, (lambda do |app_setup_id|
+        joins(:exam_setup).where('sis_core_exam_setups.application_setup_id': app_setup_id)
+      end)
     end
   end
 end

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

@@ -2,6 +2,7 @@ module Sis
   module Core
     class ExamSetup < ApplicationRecord
       belongs_to :application_setup
+      has_many :exams
 
       validates :date, :hours, :venue, presence: true
 

data/app/uploaders/sis/core/application_document_uploader.rb

@@ -12,7 +12,7 @@ module Sis
       # Override the directory where uploaded files will be stored.
       # This is a sensible default for uploaders that are meant to be mounted:
       def store_dir
-        "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
+        ENV.fetch('UPLOAD_PREFIX') + "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
       end
 
       # Provide a default URL as a default if there hasn't been a file uploaded:

data/app/uploaders/sis/core/photo_uploader.rb

@@ -12,7 +12,7 @@ module Sis
       # Override the directory where uploaded files will be stored.
       # This is a sensible default for uploaders that are meant to be mounted:
       def store_dir
-        "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
+        ENV.fetch('UPLOAD_PREFIX') + "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
       end
 
       # Provide a default URL as a default if there hasn't been a file uploaded:

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/engine.rb

@@ -4,7 +4,6 @@ module Sis
       isolate_namespace Sis::Core
 
       config.generators.api_only = true
-      config.eager_load_paths << Sis::Core::Engine.root.join('lib')
       config.autoload_paths << Sis::Core::Engine.root.join('lib')
 
       config.generators do |g|

data/lib/sis/core/version.rb

@@ -1,5 +1,5 @@
 module Sis
   module Core
-    VERSION = '1.0.7'.freeze
+    VERSION = '1.0.12'.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

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

@@ -1,5 +1,5 @@
 FactoryBot.define do
   factory :programme_level, class: Sis::Core::ProgrammeLevel, parent: :lookup do
-    type { 'Ecom::Core::ProgrammeLevel' }
+    type { 'Sis::Core::ProgrammeLevel' }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sis_core
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.12
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-27 00:00:00.000000000 Z
+date: 2020-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -100,20 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.2
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 6.0.2.1
+        version: 6.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.2
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 6.0.2.1
+        version: 6.0.3
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -242,6 +236,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 +282,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 +299,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 +336,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.