sis_core 1.0.15 → 1.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a693cc89dd56d1a0b03c6a33e3e4254a0c31ba9fed62d736fcd5abd08ade3abe
-  data.tar.gz: ef4448b178025f62b5c0538f1fd19d504c082a8bd11d382e11f2320122745728
+  metadata.gz: 765cf9bd0e11c73f120a46ef27e7c452f96881e0c360c54ecb697af5a129abb2
+  data.tar.gz: 0fc3147cba5580ede372afac7041a727aff0dc09431cd3af9856623ed652b28d
 SHA512:
-  metadata.gz: eca6082acb41b9058dec21c40f7b9d2819bf70a15f434e6428c45af7d62f657c65dbc37daaad388147fed8101d237d4226c7ee90a96342a3c992691f2957b37c
-  data.tar.gz: 6599a39511fdf9b93732bd61c7c0cc535b15d4eaa089190812e79e8385c4371566d58e3fd327195c5530b76d5ff439d6ea9fb640b73b475a1ab34b6a2a3c4b86
+  metadata.gz: f626f605104d910d210424efb3ab331dd567517577b786999ab3035317059d421ba0a694e0a00a00bc945d228663e908a44c51678eef3c5160de1bcbdf2eea69
+  data.tar.gz: 6ffe0155717f44b3c4fb5819e3fa206503cc9a32e6afe273f395667f53de7fd8cb2894c230cbcd07a308cab5382940a8dae0032ec6ba602e57a97c827ce3f025

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

@@ -0,0 +1,19 @@
+module Sis
+  module Core
+    class UtilsController < ApplicationController
+      skip_before_action :authenticate_request, only: %i[filter]
+      before_action :set_util_service, only: %i[filter]
+
+      def filter
+        result = ApplicationRecord.serialize(@service.filter_record(params))
+        render json: { success: true, data: result }
+      end
+
+      private
+
+      def set_util_service
+        @service = UtilService.new
+      end
+    end
+  end
+end

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

@@ -2,6 +2,10 @@ module Sis
   module Core
     class ApplicationRecord < ActiveRecord::Base
       self.abstract_class = true
+
+      def self.serialize(data)
+        ActiveModelSerializers::SerializableResource.new(data)
+      end
     end
   end
 end

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

@@ -1,10 +1,8 @@
 module Sis
   module Core
     class Course < ApplicationRecord
-      belongs_to :program
-
-      validates :code, :title, :description, :credit_hours, :ects, :lecture_hours, :lab_hours, presence: true
-      validates :code, uniqueness: true
+      validates :code, :title, :credit_hours, :ects, :lecture_hours, presence: true
+      validates :code, uniqueness: { case_sensitive: false }
     end
   end
 end

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

@@ -0,0 +1,19 @@
+module Sis
+  module Core
+    class CourseOffering < ApplicationRecord
+      belongs_to :course_offering_sequence
+      belongs_to :academic_year
+      belongs_to :semester
+      belongs_to :level
+
+      delegate(:course_code, to: :course_offering_sequence, prefix: false)
+      delegate(:course_title, to: :course_offering_sequence, prefix: false)
+      delegate(:course_ects, to: :course_offering_sequence, prefix: false)
+      delegate(:course_credit_hours, to: :course_offering_sequence, prefix: false)
+      delegate(:course_id, to: :course_offering_sequence, prefix: false)
+      delegate(:course_lecture_hours, to: :course_offering_sequence, prefix: false)
+      delegate(:course_lab_hours, to: :course_offering_sequence, prefix: false)
+      delegate(:course_tutorial_hours, to: :course_offering_sequence, prefix: false)
+    end
+  end
+end

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

@@ -0,0 +1,42 @@
+module Sis
+  module Core
+    class CourseOfferingSequence < ApplicationRecord
+      belongs_to :curriculum_course
+      belongs_to :programme_type
+      belongs_to :level
+      belongs_to :semester
+
+      def course_id
+        curriculum_course.course.id.to_s
+      end
+
+      def course_code
+        curriculum_course.course.code.to_s
+      end
+
+      def course_title
+        curriculum_course.course.title.to_s
+      end
+
+      def course_ects
+        curriculum_course.course.ects.to_s
+      end
+
+      def course_credit_hours
+        curriculum_course.course.credit_hours.to_s
+      end
+
+      def course_lecture_hours
+        curriculum_course.course.lecture_hours.to_s
+      end
+
+      def course_lab_hours
+        curriculum_course.course.lab_hours.to_s
+      end
+
+      def course_tutorial_hours
+        curriculum_course.course.tutorial_hours.to_s
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+module Sis
+  module Core
+    class Curriculum < ApplicationRecord
+      belongs_to :programme
+      belongs_to :programme_level
+
+      validates :compulsory_course_credit_hours, :elective_course_credit_hours, :thesis_hour, :project_hour,
+                presence: true
+      delegate(:name, to: :programme, prefix: true)
+      delegate(:name, to: :programme_level, prefix: true)
+
+      def name
+        "#{programme.name} #{programme_level.name}"
+      end
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+module Sis
+  module Core
+    class CurriculumCourse < ApplicationRecord
+      belongs_to :curriculum
+      belongs_to :course
+      validates :course_type, presence: true
+      has_many :predecessor_prerequisites, foreign_key: :successor_id, class_name: 'Prerequisite'
+      has_many :predecessors, through: :predecessor_prerequisites, source: :predecessor
+      has_many :successor_prerequisites, foreign_key: :predecessor_id, class_name: 'Prerequisite'
+      has_many :successors, through: :successor_prerequisites, source: :successor
+
+      delegate(:title, to: :course, prefix: true)
+      delegate(:code, to: :course, prefix: true)
+      delegate(:ects, to: :course, prefix: true)
+      delegate(:credit_hours, to: :course, prefix: true)
+      delegate(:name, to: :curriculum, prefix: true)
+    end
+  end
+end

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

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

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

@@ -0,0 +1,16 @@
+module Sis
+  module Core
+    class Prerequisite < ApplicationRecord
+      belongs_to :predecessor, foreign_key: 'predecessor_id', class_name: 'CurriculumCourse'
+      belongs_to :successor, foreign_key: 'successor_id', class_name: 'CurriculumCourse'
+
+      def predecessor_name
+        predecessor.course.title.to_s
+      end
+
+      def successor_name
+        successor.course.name.to_s
+      end
+    end
+  end
+end

data/app/services/sis/core/util_service.rb

@@ -0,0 +1,16 @@
+module Sis
+  module Core
+    class UtilService
+      def filter_record(params)
+        pos = {}
+        neg = {}
+
+        filter = params[:filter] || []
+        filter.each do |f|
+          f[:cond] == 'P' ? pos[f[:key]] = f[:value] : neg[f[:key]] = f[:value]
+        end
+        params[:entity].constantize.where(pos).where.not(neg)
+      end
+    end
+  end
+end

data/config/routes.rb

@@ -5,4 +5,6 @@ Sis::Core::Engine.routes.draw do
   post '/sign_in', controller: :users, action: :sign_in
   post '/generate_recovery_token', controller: :users, action: :generate_recovery_token
   post '/reset_password', controller: :users, action: :reset_password
+  resources :user_roles, only: %i[index]
+  post '/utils/filter', controller: :utils, action: :filter
 end

data/db/migrate/20201102134749_create_sis_core_curriculums.rb

@@ -0,0 +1,20 @@
+class CreateSisCoreCurriculums < ActiveRecord::Migration[6.0]
+  def change
+    create_table :sis_core_curriculums do |t|
+      t.references :programme,
+                   null: false,
+                   index: { name: 'pr_on_curriculum_indx' },
+                   foreign_key: { to_table: :sis_core_programmes }
+      t.references :programme_level,
+                   null: false,
+                   index: { name: 'pr_level_on_curriculum_indx' },
+                   foreign_key: { to_table: :sis_core_lookups }
+      t.float :compulsory_course_credit_hours, null: false
+      t.float :elective_course_credit_hours, null: false
+      t.float :thesis_hour, null: false
+      t.float :project_hour, null: false
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20201102182012_remove_programme_and_add_maximum_class_size_to_course.rb

@@ -0,0 +1,10 @@
+class RemoveProgrammeAndAddMaximumClassSizeToCourse < ActiveRecord::Migration[6.0]
+  def change
+    remove_column :sis_core_courses, :academic_programme_id
+    add_column :sis_core_courses, :maximum_class_size, :integer
+    add_column :sis_core_courses, :has_lab, :boolean, default: false
+    add_column :sis_core_courses, :has_tutorial, :boolean, default: false
+    add_column :sis_core_courses, :tutorial_hours, :float
+    change_column :sis_core_courses, :description, :string, null: true
+  end
+end

data/db/migrate/20201102192055_create_sis_core_curriculum_courses.rb

@@ -0,0 +1,17 @@
+class CreateSisCoreCurriculumCourses < ActiveRecord::Migration[6.0]
+  def change
+    create_table :sis_core_curriculum_courses do |t|
+      t.references :curriculum,
+                   null: false,
+                   index: { name: 'cc_on_cc_course_indx' },
+                   foreign_key: { to_table: :sis_core_curriculums }
+      t.references :course,
+                   null: false,
+                   index: { name: 'course_on_cc_course_indx' },
+                   foreign_key: { to_table: :sis_core_courses }
+      t.string :course_type
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20201104085458_create_sis_core_course_offering_sequences.rb

@@ -0,0 +1,24 @@
+class CreateSisCoreCourseOfferingSequences < ActiveRecord::Migration[6.0]
+  def change
+    create_table :sis_core_course_offering_sequences do |t|
+      t.references :curriculum_course,
+                   null: false,
+                   index: { name: 'cc_on_course_off_seq' },
+                   foreign_key: { to_table: :sis_core_curriculum_courses }
+      t.references :programme_type,
+                   null: false,
+                   index: { name: 'pt_on_course_off_seq' },
+                   foreign_key: { to_table: :sis_core_lookups }
+      t.references :level,
+                   null: false,
+                   index: { name: 'level_on_course_off_seq' },
+                   foreign_key: { to_table: :sis_core_lookups }
+      t.references :semester,
+                   null: false,
+                   index: { name: 'sem_on_course_off_seq' },
+                   foreign_key: { to_table: :sis_core_semesters }
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20201104111548_create_sis_core_course_offerings.rb

@@ -0,0 +1,24 @@
+class CreateSisCoreCourseOfferings < ActiveRecord::Migration[6.0]
+  def change
+    create_table :sis_core_course_offerings do |t|
+      t.references :course_offering_sequence,
+                   null: false,
+                   index: { name: 'crs_off_seq_on_crs_off' },
+                   foreign_key: { to_table: :sis_core_course_offering_sequences }
+      t.references :academic_year,
+                   null: false,
+                   index: { name: 'ay_on_crs_off' },
+                   foreign_key: { to_table: :sis_core_academic_years }
+      t.references :semester,
+                   null: false,
+                   index: { name: 'sem_on_crs_off' },
+                   foreign_key: { to_table: :sis_core_semesters }
+      t.references :level,
+                   null: false,
+                   index: { name: 'level_on_crs_off' },
+                   foreign_key: { to_table: :sis_core_lookups }
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20201106091250_create_sis_core_prerequisites.rb

@@ -0,0 +1,15 @@
+class CreateSisCorePrerequisites < ActiveRecord::Migration[6.0]
+  def change
+    create_table :sis_core_prerequisites do |t|
+      t.references :predecessor,
+                   null: false,
+                   index: { name: 'pred_on_prerequisite' },
+                   foreign_key: { to_table: :sis_core_curriculum_courses }
+      t.references :successor,
+                   null: false,
+                   index: { name: 'succ_on_prerequisite' },
+                   foreign_key: { to_table: :sis_core_curriculum_courses }
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20210310071526_add_minimum_class_size_to_course.rb

@@ -0,0 +1,6 @@
+class AddMinimumClassSizeToCourse < ActiveRecord::Migration[6.0]
+  def change
+    add_column :sis_core_courses, :minimum_class_size, :integer
+    change_column :sis_core_courses, :lab_hours, :float, null: true
+  end
+end

data/lib/sis/core/version.rb

@@ -1,5 +1,5 @@
 module Sis
   module Core
-    VERSION = '1.0.15'.freeze
+    VERSION = '1.0.16'.freeze
   end
 end

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

@@ -0,0 +1,8 @@
+FactoryBot.define do
+  factory :course_offering_sequence, class: Sis::Core::CourseOfferingSequence do
+    association :curriculum_course
+    association :programme_type
+    association :level
+    association :semester
+  end
+end

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

@@ -0,0 +1,8 @@
+FactoryBot.define do
+  factory :course_offering, class: Sis::Core::CourseOffering do
+    association :course_offering_sequence
+    association :academic_year
+    association :semester
+    association :level
+  end
+end

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

@@ -7,6 +7,8 @@ FactoryBot.define do
     ects { FFaker::Random.rand(1..10) }
     lecture_hours { FFaker::Random.rand(1..4) }
     lab_hours { FFaker::Random.rand(1..4) }
-    association :program
+    has_lab { true }
+    has_tutorial { false }
+    maximum_class_size { 40 }
   end
 end

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

@@ -0,0 +1,7 @@
+FactoryBot.define do
+  factory :curriculum_course, class: Sis::Core::CurriculumCourse do
+    association :curriculum
+    association :course
+    course_type { 'Compulsory' }
+  end
+end

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

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

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

@@ -0,0 +1,6 @@
+FactoryBot.define do
+  factory :prerequisite, class: Sis::Core::Prerequisite do
+    association :predecessor, factory: :curriculum_course
+    association :successor, factory: :curriculum_course
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sis_core
 version: !ruby/object:Gem::Version
-  version: 1.0.15
+  version: 1.0.16
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-15 00:00:00.000000000 Z
+date: 2021-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -226,6 +226,7 @@ files:
 - app/controllers/sis/core/application_controller.rb
 - app/controllers/sis/core/menus_controller.rb
 - app/controllers/sis/core/users_controller.rb
+- app/controllers/sis/core/utils_controller.rb
 - app/models/sis/core/academic_programme.rb
 - app/models/sis/core/academic_programme_document.rb
 - app/models/sis/core/academic_year.rb
@@ -236,9 +237,13 @@ files:
 - app/models/sis/core/application_record.rb
 - app/models/sis/core/application_setup.rb
 - app/models/sis/core/course.rb
+- app/models/sis/core/course_offering.rb
+- app/models/sis/core/course_offering_sequence.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/curriculum.rb
+- app/models/sis/core/curriculum_course.rb
 - app/models/sis/core/document_requirement.rb
 - app/models/sis/core/document_type.rb
 - app/models/sis/core/exam.rb
@@ -247,8 +252,10 @@ files:
 - app/models/sis/core/field_of_study.rb
 - app/models/sis/core/instructor.rb
 - app/models/sis/core/instructor_course.rb
+- app/models/sis/core/level.rb
 - app/models/sis/core/lookup.rb
 - app/models/sis/core/menu.rb
+- app/models/sis/core/prerequisite.rb
 - app/models/sis/core/programme.rb
 - app/models/sis/core/programme_level.rb
 - app/models/sis/core/programme_type.rb
@@ -257,6 +264,7 @@ files:
 - app/models/sis/core/user.rb
 - app/models/sis/core/user_role.rb
 - app/services/sis/core/user_service.rb
+- app/services/sis/core/util_service.rb
 - app/uploaders/sis/core/application_document_uploader.rb
 - app/uploaders/sis/core/photo_uploader.rb
 - config/database.ci.yml
@@ -285,6 +293,13 @@ files:
 - 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
+- db/migrate/20201102134749_create_sis_core_curriculums.rb
+- db/migrate/20201102182012_remove_programme_and_add_maximum_class_size_to_course.rb
+- db/migrate/20201102192055_create_sis_core_curriculum_courses.rb
+- db/migrate/20201104085458_create_sis_core_course_offering_sequences.rb
+- db/migrate/20201104111548_create_sis_core_course_offerings.rb
+- db/migrate/20201106091250_create_sis_core_prerequisites.rb
+- db/migrate/20210310071526_add_minimum_class_size_to_course.rb
 - lib/authorize_request.rb
 - lib/json_web_token.rb
 - lib/sis/core.rb
@@ -300,10 +315,13 @@ files:
 - spec/factories/sis/core/application_modules.rb
 - spec/factories/sis/core/application_setups.rb
 - spec/factories/sis/core/applications.rb
+- spec/factories/sis/core/course_offering_sequences.rb
+- spec/factories/sis/core/course_offerings.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/curriculum_courses.rb
 - spec/factories/sis/core/curriculums.rb
 - spec/factories/sis/core/document_requirements.rb
 - spec/factories/sis/core/document_types.rb
@@ -312,8 +330,10 @@ files:
 - spec/factories/sis/core/exams.rb
 - spec/factories/sis/core/instructor_courses.rb
 - spec/factories/sis/core/instructors.rb
+- spec/factories/sis/core/levels.rb
 - spec/factories/sis/core/lookups.rb
 - spec/factories/sis/core/menus.rb
+- spec/factories/sis/core/prerequisites.rb
 - spec/factories/sis/core/programme_levels.rb
 - spec/factories/sis/core/programme_types.rb
 - spec/factories/sis/core/programmes.rb