sis_core 1.0.8 → 1.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c36e2c8bba7e35681f66af9d69533eb938c804eebb4317f2994f71ce015f4a22
-  data.tar.gz: 201448c119d21219b68094ade5aa46f920d4006a34c21c72ad3d62b4f5dd3980
+  metadata.gz: 48102d4df50313be44276b37c0db422f6805cf05a7f3295e550938853da1c84e
+  data.tar.gz: 2a58d518039a44a80f39583fcde21d3b74574bada3b9a531691466279e85cfc7
 SHA512:
-  metadata.gz: b0892082b1f456a1c0e084b5d624481a5d339f66c9d3c2f272960ce5ba095efd08e77e15e9c1f9f978bb0436db5439b52c323363be45443dcbaa550a6369b053
-  data.tar.gz: c9d0b2302de92f151af251ab32bf7f0701247572a5e2466624d40e9e76a40c4d973914bf4d0097a5af769483113da873f5dfdf1ad2a2e2e80d52d3046020b091
+  metadata.gz: 2e4b8c53defcbdc8fe1705d172269bd7067a2c64b77368f546e5d1ccb44d744bdd59ecb6a6472a7ed0be4799e2338a03f62bffbc04dd8aa76e3a963c8c0fbc57
+  data.tar.gz: 8db810b8ecd8e93a2ed5077159fdf44e51a9aa3f0c666d6c9d321e1d911f67c543c98386ef89887bd1dfd740eb2ce0f5ffd5c0cd2bda199b0aed09c6b77246b2

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,10 @@ module Sis
       belongs_to :programme
       belongs_to :programme_type
       belongs_to :programme_level
+      has_many :academic_programme_documents
+
+      validates :programme_id, uniqueness: { scope: [:programme_level_id, :programme_type_id],
+                                             message: 'Program has already been created !' }
 
       delegate(:name, to: :programme, prefix: true, allow_nil: false)
       delegate(:name, to: :programme_type, prefix: true, allow_nil: false)

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

@@ -0,0 +1,11 @@
+module Sis
+  module Core
+    class AcademicProgrammeDocument < ApplicationRecord
+      belongs_to :academic_programme
+      belongs_to :document_type
+
+      delegate(:name, to: :academic_programme, prefix: true, allow_nil: false)
+      delegate(:name, to: :document_type, prefix: true, allow_nil: false)
+    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,23 +25,36 @@ 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
       validates :payment_information, presence: true, if: :payment_made
 
       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(:name, to: :application_setup, prefix: true, allow_nil: false)
       delegate(:full_name, to: :applicant, prefix: true, allow_nil: false)
+      delegate(:academic_programme_id, to: :application_setup, prefix: false, allow_nil: false)
     end
   end
 end

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

@@ -6,17 +6,37 @@ module Sis
 
       belongs_to :academic_programme
       belongs_to :target_semester, class_name: 'Sis::Core::Semester'
+      belongs_to :academic_year
       has_many :document_requirements
+      has_many :exam_setups
 
       validates :start_date, :end_date, :status, presence: true
       validates :status, inclusion: [OPEN, CLOSED]
+      validates :academic_programme_id, uniqueness: { scope: [:target_semester_id, :academic_year_id],
+                                                      message: 'Announcement has already been created for this academic
+                                                                program !' }
 
-      delegate(:name, to: :target_semester, prefix: true, allow_nil: false)
+      delegate(:code, to: :target_semester, prefix: true, allow_nil: false)
+      delegate(:year, to: :academic_year, prefix: false , allow_nil: false)
       delegate(:name, to: :academic_programme, prefix: true, allow_nil: false)
+      delegate(:programme_id, to: :academic_programme, prefix: false, allow_nil: false)
+      delegate(:programme_type_id, to: :academic_programme, prefix: false, allow_nil: false)
+      delegate(:programme_level_id, to: :academic_programme, prefix: false, allow_nil: false)
+      def programme_name
+        academic_programme.programme.name
+      end
+
+      def programme_type_name
+        academic_programme.programme_type.name
+      end
+
+      def programme_level_name
+        academic_programme.programme_level.name
+      end
 
       def name
-        academic_programme.programme.name.to_s + ' ' + academic_programme.programme_level.name.to_s + ' ' +
-          academic_programme.programme_type.name.to_s
+        "#{academic_programme.programme.name} #{academic_programme.programme_level.name}
+         #{academic_programme.programme_type.name}"
       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

@@ -4,10 +4,17 @@ module Sis
       belongs_to :document_type
       belongs_to :application_setup
 
-      validates :original, :copy, presence: true
+      validates :application_setup_id, uniqueness: { scope: :document_type_id,
+                                                     message: 'Document has been already captured !' }
 
       delegate(:name, to: :document_type, prefix: true, allow_nil: false)
       delegate(:name, to: :application_setup, prefix: true, allow_nil: false)
+      delegate(:programme_id, to: :application_setup, prefix: false, allow_nil: false)
+      delegate(:programme_name, to: :application_setup, prefix: false, allow_nil: false)
+      delegate(:programme_level_id, to: :application_setup, prefix: false, allow_nil: false)
+      delegate(:programme_level_name, to: :application_setup, prefix: false, allow_nil: false)
+      delegate(:programme_type_id, to: :application_setup, prefix: false, allow_nil: false)
+      delegate(:programme_type_name, to: :application_setup, prefix: false, allow_nil: false)
     end
   end
 end

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

@@ -1,6 +1,8 @@
 module Sis
   module Core
     class DocumentType < Lookup
+      has_many :academic_programme_documents
+      validates :code, :name, uniqueness: { case_sensitive: false }
     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
 
@@ -10,6 +11,9 @@ module Sis
       end
 
       delegate(:name, to: :application_setup, prefix: true, allow_nil: false)
+      delegate(:programme_id, to: :application_setup, prefix: false, allow_nil: false)
+      delegate(:programme_type_id, to: :application_setup, prefix: false, allow_nil: false)
+      delegate(:programme_level_id, to: :application_setup, prefix: false, allow_nil: false)
     end
   end
 end

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

@@ -1,7 +1,7 @@
 module Sis
   module Core
     class Programme < ApplicationRecord
-      validates :code, :name, presence: true, uniqueness: true
+      validates :code, :name, presence: true, uniqueness: { case_sensitive: false }
     end
   end
 end

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

@@ -1,11 +1,7 @@
 module Sis
   module Core
     class Semester < ApplicationRecord
-      belongs_to :academic_year
-
-      validates :name, presence: true
-
-      delegate(:label, to: :academic_year, prefix: true, allow_nil: false)
+      validates :code, presence: true, uniqueness: { case_sensitive: false }
     end
   end
 end

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/20200105061717_create_sis_core_lookups.rb

@@ -1,7 +1,9 @@
 class CreateSisCoreLookups < ActiveRecord::Migration[6.0]
   def change
     create_table :sis_core_lookups do |t|
-      t.string :name, null: false
+      t.string :code, null: false
+      t.string :name
+      t.string :description
       t.string :type, null: false
 
       t.timestamps

data/db/migrate/20200105072142_create_sis_core_academic_years.rb

@@ -2,7 +2,7 @@ class CreateSisCoreAcademicYears < ActiveRecord::Migration[6.0]
   def change
     create_table :sis_core_academic_years do |t|
       t.string :year, null: false, unique: true
-      t.string :label
+      t.string :description
 
       t.timestamps
     end

data/db/migrate/20200106072246_create_sis_core_semesters.rb

@@ -1,12 +1,8 @@
 class CreateSisCoreSemesters < ActiveRecord::Migration[6.0]
   def change
     create_table :sis_core_semesters do |t|
-      t.string :name, null: false
+      t.string :code, null: false
       t.string :description
-      t.references :academic_year,
-                   index: { name: 'ay_on_semester_indx' },
-                   null: false,
-                   foreign_key: { to_table: :sis_core_academic_years }
 
       t.timestamps
     end

data/db/migrate/20200106132521_create_sis_core_application_setups.rb

@@ -12,6 +12,10 @@ class CreateSisCoreApplicationSetups < ActiveRecord::Migration[6.0]
                    null: false,
                    index: { name: 'as_on_ts_indx' },
                    foreign_key: { to_table: :sis_core_semesters }
+      t.references :academic_year,
+                   null: false,
+                   index: { name: 'ay_on_ts_indx' },
+                   foreign_key: { to_table: :sis_core_academic_years }
 
       t.timestamps
     end

data/db/migrate/20200106133034_create_sis_core_document_requirements.rb

@@ -1,8 +1,8 @@
 class CreateSisCoreDocumentRequirements < ActiveRecord::Migration[6.0]
   def change
     create_table :sis_core_document_requirements do |t|
-      t.integer :original, null: false, default: 0
-      t.integer :copy, null: false, default: 0
+      t.integer :original, null: false, default: 1
+      t.integer :copy, null: false, default: 1
       t.string :remark
       t.references :document_type,
                    null: false,

data/db/migrate/20200107094449_create_sis_core_applications.rb

@@ -9,10 +9,6 @@ class CreateSisCoreApplications < ActiveRecord::Migration[6.0]
                    null: false,
                    index: { name: 'applications_on_applicant_indx' },
                    foreign_key: { to_table: :sis_core_applicants }
-      t.references :academic_programme,
-                   null: false,
-                   index: { name: 'applications_on_ap_indx' },
-                   foreign_key: { to_table: :sis_core_academic_programmes }
       t.references :application_setup,
                    null: false,
                    index: { name: 'application_setup_on_ap_indx' },

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/db/migrate/20201019055620_create_sis_core_academic_programme_documents.rb

@@ -0,0 +1,19 @@
+class CreateSisCoreAcademicProgrammeDocuments < ActiveRecord::Migration[6.0]
+  def change
+    create_table :sis_core_academic_programme_documents do |t|
+      t.references :academic_programme,
+                   null: false,
+                   index: { name: 'ap_on_ap_doc' },
+                   foreign_key: { to_table: :sis_core_academic_programmes }
+      t.references :document_type,
+                   null: false,
+                   index: { name: 'dt_on_ap_doc' },
+                   foreign_key: { to_table: :sis_core_lookups }
+      t.string :remark
+      t.integer :original, default: 1
+      t.integer :copy, default: 1
+
+      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.8'.freeze
+    VERSION = '1.0.13'.freeze
   end
 end

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

@@ -0,0 +1,9 @@
+FactoryBot.define do
+  factory :academic_programme_document, class: Sis::Core::AcademicProgrammeDocument do
+    association :academic_programme
+    association :document_type
+    remark { FFaker::Name.name }
+    original { 1 }
+    copy { 1 }
+  end
+end

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

@@ -1,6 +1,6 @@
 FactoryBot.define do
   factory :academic_year, class: Sis::Core::AcademicYear do
     year { FFaker::Name.name }
-    label { 'Academic year of 2000/01' }
+    description { 'Academic year of 2000/01' }
   end
 end

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

@@ -2,6 +2,7 @@ FactoryBot.define do
   factory :application_setup, class: Sis::Core::ApplicationSetup do
     association :academic_programme
     association :target_semester, factory: :semester
+    association :academic_year
     start_date { Date.today - 15.days }
     end_date { Date.today + 15.days }
     status { 'Open' }

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

@@ -5,7 +5,6 @@ FactoryBot.define do
     payment_information { nil }
     application_date { Date.today }
     association :applicant
-    association :academic_programme
     association :application_setup
   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/lookups.rb

@@ -1,6 +1,8 @@
 FactoryBot.define do
   factory :lookup, class: 'Sis::Core::Lookup' do
+    code { FFaker::Identification.ssn }
     name { FFaker::Name.name }
+    description { FFaker::Lorem.paragraph }
     type { 'Sis::Core::Lookup' }
   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

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

@@ -1,7 +1,6 @@
 FactoryBot.define do
   factory :semester, class: Sis::Core::Semester do
-    association :academic_year
-    name { FFaker::Name.name }
+    code { FFaker::Name.name }
     description { FFaker::Name.name }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sis_core
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.13
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-29 00:00:00.000000000 Z
+date: 2020-11-02 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
@@ -233,6 +227,7 @@ files:
 - app/controllers/sis/core/menus_controller.rb
 - app/controllers/sis/core/users_controller.rb
 - app/models/sis/core/academic_programme.rb
+- app/models/sis/core/academic_programme_document.rb
 - app/models/sis/core/academic_year.rb
 - app/models/sis/core/applicant.rb
 - app/models/sis/core/application.rb
@@ -242,6 +237,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 +283,8 @@ 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
+- db/migrate/20201019055620_create_sis_core_academic_programme_documents.rb
 - lib/authorize_request.rb
 - lib/json_web_token.rb
 - lib/sis/core.rb
@@ -293,6 +292,7 @@ files:
 - lib/sis/core/version.rb
 - lib/sis_core.rb
 - lib/tasks/sis_core_tasks.rake
+- spec/factories/sis/core/academic_programme_documents.rb
 - spec/factories/sis/core/academic_programmes.rb
 - spec/factories/sis/core/academic_years.rb
 - spec/factories/sis/core/applicants.rb
@@ -302,6 +302,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 +339,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.