sis_core 1.0.6 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c2e069bab5a79b5ea0e86bc34f9445920cdc3bbf883938f5e2aae454ae38763
-  data.tar.gz: d27da2f1dab2dbaceb1d08ac11486f325e9793f9dfdadd8a18bb9aaa4199e33f
+  metadata.gz: 01b7b4d1444769ba3e2953377e0eb99528221ad26f98cae32e88ef57351940c9
+  data.tar.gz: 4424ba65e6077accf44a1a215f87b4594f79a9c04523cb26660999606945f5be
 SHA512:
-  metadata.gz: e5d24cf81adef27efce96ad29dc9b1bfe5e71adb557d9a1f30d255e78a0979d1c7039e518b4658b1602be5ccb4da9d3d649c33c5bc9f39c052ed4ed032277ad5
-  data.tar.gz: 78c398a895cfb1bcb55fddfe7a6bb097d82dd524e9cbeb8ce1e13f1e9ece68f7660c49753ff86c0d5623fa701a51fe157f76d05912aa3eec40cc62a994d0c474
+  metadata.gz: 17ac3d072458f6b74b25e4301ed1ceb4ac3d2b31d1fb1343936d3efa03eec1f9fbe60fa95aa4b6823de7f15fd9d1e0a696040179503428d83c27fc8355342bf9
+  data.tar.gz: fd114115c828fee511449c65fd6302e91677bd5c4596e9e524413be00bd87bafb9dc2e6929c2592c62acb6141a31cfac28a2baa61004790a86a52e9140079ac4

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

@@ -4,6 +4,14 @@ module Sis
       belongs_to :programme
       belongs_to :programme_type
       belongs_to :programme_level
+
+      delegate(:name, to: :programme, prefix: true, allow_nil: false)
+      delegate(:name, to: :programme_type, prefix: true, allow_nil: false)
+      delegate(:name, to: :programme_level, prefix: true, allow_nil: false)
+
+      def name
+        programme.name.to_s + ' ' + programme_level.name.to_s + ' ' + programme_type.name.to_s
+      end
     end
   end
 end

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

@@ -5,7 +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,10 @@ 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)
     end
   end
 end

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

@@ -5,6 +5,8 @@ module Sis
 
       belongs_to :application
       belongs_to :document_requirement
+
+      delegate(:name, to: :document_requirement, prefix: true, allow_nil: false)
     end
   end
 end

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

@@ -7,9 +7,18 @@ 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]
+
+      delegate(:name, to: :target_semester, prefix: true, allow_nil: false)
+      delegate(:name, to: :academic_programme, prefix: true, allow_nil: false)
+
+      def name
+        academic_programme.programme.name.to_s + ' ' + academic_programme.programme_level.name.to_s + ' ' +
+          academic_programme.programme_type.name.to_s
+      end
     end
   end
 end

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

@@ -5,6 +5,9 @@ module Sis
       belongs_to :application_setup
 
       validates :original, :copy, presence: true
+
+      delegate(:name, to: :document_type, prefix: true, allow_nil: false)
+      delegate(:name, to: :application_setup, prefix: true, allow_nil: false)
     end
   end
 end

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

@@ -10,6 +10,12 @@ module Sis
       def set_pass_point
         self.pass_point = points / 2 unless pass_point || !points
       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,8 +2,15 @@ module Sis
   module Core
     class ExamSetup < ApplicationRecord
       belongs_to :application_setup
+      has_many :exams
 
       validates :date, :hours, :venue, presence: true
+
+      def name
+        application_setup.academic_programme.name
+      end
+
+      delegate(:name, to: :application_setup, prefix: true, allow_nil: false)
     end
   end
 end

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

@@ -4,6 +4,8 @@ module Sis
       belongs_to :academic_year
 
       validates :name, presence: true
+
+      delegate(:label, to: :academic_year, prefix: true, allow_nil: false)
     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.6'.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

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.6
+  version: 1.0.11
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-23 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.