gaku_core 0.2.4 → 0.3.0.pre.0

data/app/models/gaku/student_review.rb

@@ -1,8 +1,8 @@
 module Gaku
   class StudentReview < ActiveRecord::Base
-    belongs_to :student
-    belongs_to :student_review_category
-    belongs_to :student_reviewable, polymorphic: true
+    belongs_to :student, required: false
+    belongs_to :student_review_category, required: false
+    belongs_to :student_reviewable, polymorphic: true, required: false
 
     validates :content, :student_id, :student_review_category_id, :student_reviewable_id, :student_reviewable_type , presence: true
     validates :student_id, uniqueness: { scope: [:student_reviewable_type, :student_reviewable_id] }

data/app/models/gaku/student_specialty.rb

@@ -1,7 +1,7 @@
 module Gaku
   class StudentSpecialty < ActiveRecord::Base
-    belongs_to :specialty
-    belongs_to :student
+    belongs_to :specialty, required: false
+    belongs_to :student, required: false
 
     validates :specialty_id, presence: true
 

data/app/models/gaku/syllabus.rb

@@ -11,7 +11,7 @@ module Gaku
     has_many :exam_syllabuses, dependent: :destroy
     has_many :exams, through: :exam_syllabuses
 
-    belongs_to :department
+    belongs_to :department, required: false
 
     accepts_nested_attributes_for :exams, :assignments
 

data/app/models/gaku/teacher.rb

@@ -2,6 +2,6 @@ module Gaku
   class Teacher < ActiveRecord::Base
     include Person, Addresses, Contacts, Notes, Picture, Pagination
 
-    belongs_to :user
+    belongs_to :user, required: false
   end
 end

data/config/initializers/redis.rb

@@ -1,5 +1,9 @@
 if Rails.env.test?
   $redis = Redis.new(db: 15)
 else
-  $redis = Redis.new
-end
+  if ENV['REDIS_HOST']
+    $redis = Redis.new(host: ENV['REDIS_HOST'])
+  else
+    $redis = Redis.new
+  end
+end

data/db/default/gaku/attendance_types.rb

@@ -41,7 +41,7 @@ types = [
 
   {
     name: 'Injury',
-    name: '病欠[怪我]',
+    name_ja: '病欠[怪我]',
     color_code: '#c85179',
     counted_absent: true,
     disable_credit: false,

data/db/migrate/20120202111850_presets.rb

@@ -1,8 +1,8 @@
-class Presets < ActiveRecord::Migration
+class Presets < ActiveRecord::Migration[4.2]
 
   def self.up
     enable_extension "hstore"
-
+    # execute "CREATE EXTENSION IF NOT EXISTS hstore"
     create_table :gaku_presets do |t|
       t.string   :name
       t.boolean  :default,         default: false
@@ -23,8 +23,7 @@ class Presets < ActiveRecord::Migration
 
   def self.down
     drop_table :gaku_presets
-
-    disable_extension "hstore"
+    execute "DROP EXTENSION IF EXISTS hstore"
   end
 
 end

data/db/migrate/20131014065028_translations.rb

@@ -1,4 +1,4 @@
-class Translations < ActiveRecord::Migration
+class Translations < ActiveRecord::Migration[4.2]
 
   def up
     create_table :gaku_attendance_types do |t|

data/db/migrate/20131025073352_gaku_core.rb

@@ -1,6 +1,6 @@
 require 'gaku/migrations'
 
-class GakuCore < ActiveRecord::Migration
+class GakuCore < ActiveRecord::Migration[4.2]
 
   include Gaku::Migrations
 

data/db/migrate/20140128141752_change_grading_methods_arguments_field.rb

@@ -1,4 +1,4 @@
-class ChangeGradingMethodsArgumentsField < ActiveRecord::Migration
+class ChangeGradingMethodsArgumentsField < ActiveRecord::Migration[4.2]
   def change
     rename_column :gaku_grading_methods, :arguments, :criteria
   end

data/db/migrate/20140130182100_change_fields_external_school_record.rb

@@ -1,4 +1,4 @@
-class ChangeFieldsExternalSchoolRecord < ActiveRecord::Migration
+class ChangeFieldsExternalSchoolRecord < ActiveRecord::Migration[4.2]
   def change
     add_column :gaku_external_school_records, :units_absent, :integer
     add_column :gaku_external_school_records, :total_units,  :integer

data/db/migrate/20140131113337_create_student_configs.rb

@@ -1,4 +1,4 @@
-class CreateStudentConfigs < ActiveRecord::Migration
+class CreateStudentConfigs < ActiveRecord::Migration[4.2]
   def change
     create_table :gaku_student_configs do |t|
       t.boolean :active, default: false

data/db/migrate/20140207093618_drop_student_configs.rb

@@ -1,4 +1,4 @@
-class DropStudentConfigs < ActiveRecord::Migration
+class DropStudentConfigs < ActiveRecord::Migration[4.2]
   def change
     drop_table :gaku_student_configs
   end

data/db/migrate/20140213113405_create_grading_method_connectors_table.rb

@@ -1,4 +1,4 @@
-class CreateGradingMethodConnectorsTable < ActiveRecord::Migration
+class CreateGradingMethodConnectorsTable < ActiveRecord::Migration[4.2]
   def change
     create_table :gaku_grading_method_connectors do |t|
       t.references :grading_method

data/db/migrate/20140304094422_create_gaku_exam_sessions_table.rb

@@ -1,4 +1,4 @@
-class CreateGakuExamSessionsTable < ActiveRecord::Migration
+class CreateGakuExamSessionsTable < ActiveRecord::Migration[4.2]
   def change
     create_table :gaku_exam_sessions do |t|
       t.integer    :session_time

data/db/migrate/20140325073941_add_time_format_24_to_presets_table.rb

@@ -1,4 +1,4 @@
-class AddTimeFormat24ToPresetsTable < ActiveRecord::Migration
+class AddTimeFormat24ToPresetsTable < ActiveRecord::Migration[4.2]
   def change
     add_column :gaku_presets, :time_format_24, :boolean, default: true
   end

data/db/migrate/20140408111314_remove_semester_join_tables.rb

@@ -1,4 +1,4 @@
-class RemoveSemesterJoinTables < ActiveRecord::Migration
+class RemoveSemesterJoinTables < ActiveRecord::Migration[4.2]
   def change
     drop_table :gaku_semester_class_groups
     drop_table :gaku_semester_courses

data/db/migrate/20140408111358_create_semester_connectors_table.rb

@@ -1,4 +1,4 @@
-class CreateSemesterConnectorsTable < ActiveRecord::Migration
+class CreateSemesterConnectorsTable < ActiveRecord::Migration[4.2]
   def change
     create_table :gaku_semester_connectors do |t|
       t.references :semester

data/db/migrate/20140423093155_create_enrollments_table.rb

@@ -1,4 +1,4 @@
-class CreateEnrollmentsTable < ActiveRecord::Migration
+class CreateEnrollmentsTable < ActiveRecord::Migration[4.2]
   def change
     create_table :gaku_enrollments do |t|
       t.references :student

data/db/migrate/20140423100114_clean_enrollments_join_models.rb

@@ -1,4 +1,4 @@
-class CleanEnrollmentsJoinModels < ActiveRecord::Migration
+class CleanEnrollmentsJoinModels < ActiveRecord::Migration[4.2]
   def change
     drop_table :gaku_class_group_enrollments
     drop_table :gaku_class_group_course_enrollments

data/db/migrate/20140429112725_add_counters_to_enrollmentable.rb

@@ -1,11 +1,13 @@
-class AddCountersToEnrollmentable < ActiveRecord::Migration
+class AddCountersToEnrollmentable < ActiveRecord::Migration[4.2]
   def change
     add_column :gaku_courses, :enrollments_count, :integer, default: 0, null: false
     add_column :gaku_class_groups, :enrollments_count, :integer, default: 0, null: false
     add_column :gaku_extracurricular_activities, :enrollments_count, :integer, default: 0, null: false
+    add_column :gaku_exam_sessions, :enrollments_count, :integer, default: 0, null: false
 
     #for courses already exist
     add_column :gaku_students, :extracurricular_activities_count, :integer, default: 0, null: false
     add_column :gaku_students, :class_groups_count, :integer, default: 0, null: false
+    add_column :gaku_students, :exam_sessions_count, :integer, default: 0, null: false
   end
 end

data/db/migrate/20140604104210_rename_method_to_grading_method.rb

@@ -1,4 +1,4 @@
-class RenameMethodToGradingMethod < ActiveRecord::Migration
+class RenameMethodToGradingMethod < ActiveRecord::Migration[4.2]
   def change
     rename_column :gaku_grading_methods, :method, :grading_type
   end

data/db/migrate/20140604113045_add_default_value_to_curved.rb

@@ -1,4 +1,4 @@
-class AddDefaultValueToCurved < ActiveRecord::Migration
+class AddDefaultValueToCurved < ActiveRecord::Migration[4.2]
   def change
     change_column :gaku_grading_methods, :curved, :boolean, default: false
   end

data/db/migrate/20140610091053_add_seat_number_to_enrollments.rb

@@ -1,4 +1,4 @@
-class AddSeatNumberToEnrollments < ActiveRecord::Migration
+class AddSeatNumberToEnrollments < ActiveRecord::Migration[4.2]
   def change
     add_column :gaku_enrollments, :seat_number, :integer
   end

data/db/migrate/20140701104700_change_hstore_to_string_criteria.rb

@@ -1,4 +1,4 @@
-class ChangeHstoreToStringCriteria < ActiveRecord::Migration
+class ChangeHstoreToStringCriteria < ActiveRecord::Migration[4.2]
   def change
     change_column :gaku_grading_methods, :criteria, :string
   end

data/db/migrate/20140715135152_create_semester_attendance_table.rb

@@ -1,4 +1,4 @@
-class CreateSemesterAttendanceTable < ActiveRecord::Migration
+class CreateSemesterAttendanceTable < ActiveRecord::Migration[4.2]
 
   def change
     create_table :gaku_semester_attendances do |t|

data/db/migrate/20140718105226_create_student_review_categories_table.rb

@@ -1,4 +1,4 @@
-class CreateStudentReviewCategoriesTable < ActiveRecord::Migration
+class CreateStudentReviewCategoriesTable < ActiveRecord::Migration[4.2]
   def up
     create_table :gaku_student_review_categories do |t|
       t.string :name

data/db/migrate/20140728121353_create_student_review_table.rb

@@ -1,4 +1,4 @@
-class CreateStudentReviewTable < ActiveRecord::Migration
+class CreateStudentReviewTable < ActiveRecord::Migration[4.2]
   def change
     create_table :gaku_student_reviews do |t|
       t.references :student

data/db/migrate/20150213095508_improve_countries_and_states.rb

@@ -1,4 +1,4 @@
-class ImproveCountriesAndStates < ActiveRecord::Migration
+class ImproveCountriesAndStates < ActiveRecord::Migration[4.2]
   def change
     add_column :gaku_countries, :states_required, :boolean
   end

data/db/migrate/20160125194100_add_gradable_to_exam_portion_score.rb

@@ -0,0 +1,5 @@
+class AddGradableToExamPortionScore < ActiveRecord::Migration[4.2]
+  def change
+    add_reference :gaku_exam_portion_scores, :gradable, polymorphic: true,  index: true
+  end
+end

data/db/migrate/20170509132020_change_enrollmentable_to_enrollable.rb

@@ -0,0 +1,6 @@
+class ChangeEnrollmentableToEnrollable < ActiveRecord::Migration[5.0]
+  def change
+    rename_column :gaku_enrollments, :enrollmentable_id, :enrollable_id
+    rename_column :gaku_enrollments, :enrollmentable_type, :enrollable_type
+  end
+end

data/gaku_core.gemspec

@@ -0,0 +1,37 @@
+require_relative '../common_gaku_gemspec_mixin'
+
+Gem::Specification.new do |s|
+  set_gaku_gemspec_shared s
+
+  s.name          = 'gaku_core'
+  s.summary       = 'GAKU Engine core module'
+  s.description   = 'Core functionality for GAKU Engine. See https://github.com/GAKUEngine/gaku'
+
+  s.files         = Dir.glob("{app,config,db,lib}/**/*") +
+                    [
+                      'Rakefile',
+                      'gaku_core.gemspec'
+                    ]
+  s.require_path  = 'lib'
+
+  s.requirements  << 'postgresql'
+  s.requirements  << 'postgresql-contrib'
+
+  s.add_dependency 'rails',             '~> 5.1.4'
+  s.add_dependency 'rails-i18n',        '~> 5.0.3'
+  s.add_dependency 'pg',                '~> 0.19'
+  s.add_dependency 'redis',             '~> 3.3.3'
+  s.add_dependency 'carmen',            '~> 1.0.2'
+  s.add_dependency 'activemodel-serializers-xml'
+  s.add_dependency 'paperclip',         '~> 5.1.0'
+  s.add_dependency 'ransack',           '~> 1.8.2'
+  s.add_dependency 'kaminari',          '~> 1.0.1'
+  s.add_dependency 'draper',            '~> 3.0.1'
+  s.add_dependency 'devise',            '~> 4.3.0'
+  s.add_dependency 'devise-i18n'
+  s.add_dependency 'cancan',            '~> 1.6.10'
+  s.add_dependency 'highline'
+  s.add_dependency 'ffaker',            '~> 2.5.0'
+  s.add_dependency 'rake-progressbar'
+  s.add_dependency 'globalize', '~> 5.1.0.beta2'
+end

data/lib/gaku/core.rb

@@ -3,7 +3,7 @@ require 'rails/generators'
 require 'rails-i18n'
 require 'paperclip'
 require 'ransack'
-require 'deface'
+# require 'deface'
 require 'redis'
 
 require 'devise'

data/lib/gaku/core/engine.rb

@@ -5,7 +5,7 @@ module Gaku
       engine_name 'gaku'
 
       config.autoload_paths += %W( #{config.root}/lib )
-      config.active_record.raise_in_transactional_callbacks = true
+      # config.active_record.raise_in_transactional_callbacks = true
 
 
       initializer 'gaku.paperclip' do

data/lib/gaku/grading/collection/base_method.rb

@@ -2,10 +2,11 @@ module Gaku
   module Grading
     module Collection
       class  BaseMethod
-        attr_reader :gradable, :gradable_type, :students, :criteria, :results
+        attr_reader :gradable, :gradable_type, :students, :criteria, :results, :gradable_scope
 
         # Pass a gradable object [exam or assignment] and students
-        def initialize(gradable, students, criteria = nil)
+        def initialize(gradable, students, gradable_scope, criteria = nil)
+          @gradable_scope = gradable_scope
           @gradable = gradable
           @students = students
           @criteria = criteria

data/lib/gaku/grading/collection/calculations.rb

@@ -3,18 +3,20 @@ module Gaku
     module Collection
       class  Calculations
 
-        attr_reader :grading_methods, :students, :exam
+        attr_reader :grading_methods, :students, :exam, :gradable_scope
 
-        def initialize(grading_method, students, exam)
+        def initialize(grading_method, students, exam, gradable_scope)
           @exam            = exam
           @students        = students
           @grading_methods = grading_method
+          @gradable_scope  = gradable_scope
+
         end
 
         def calculate
           {}.tap do |hash|
             @grading_methods.each do |grading_method|
-              grading = grading_types[grading_method.grading_type].constantize.new(@exam, @students, grading_method.criteria)
+              grading = grading_types[grading_method.grading_type].constantize.new(@exam, @students, gradable_scope, grading_method.criteria)
               hash[grading_method.id] = grading.grade
             end
           end

data/lib/gaku/grading/collection/interval.rb

@@ -5,7 +5,7 @@ class Gaku::Grading::Collection::Interval < Gaku::Grading::Collection::BaseMetho
     @scores = students_with_scores
 
     formated_student_results.each do |student|
-      @result << Gaku::Grading::Single::Interval.new(@gradable, student).grade_exam
+      @result << Gaku::Grading::Single::Interval.new(@gradable, student, gradable_scope).grade_exam
     end
 
     @result
@@ -35,7 +35,7 @@ class Gaku::Grading::Collection::Interval < Gaku::Grading::Collection::BaseMetho
   end
 
   def score_results
-    Gaku::Grading::Collection::Score.new(@gradable, @students).grade
+    Gaku::Grading::Collection::Score.new(@gradable, @students, gradable_scope).grade
   end
 
   def students_with_scores

data/lib/gaku/grading/collection/ordinal.rb

@@ -2,7 +2,7 @@ class Gaku::Grading::Collection::Ordinal < Gaku::Grading::Collection::BaseMethod
 
   def grade_exam
     @students.each do |student|
-      @result << Gaku::Grading::Single::Ordinal.new(@gradable, student, criteria).grade_exam
+      @result << Gaku::Grading::Single::Ordinal.new(@gradable, student, gradable_scope,criteria).grade_exam
     end
     @result
   end

data/lib/gaku/grading/collection/percentage.rb

@@ -2,7 +2,7 @@ class Gaku::Grading::Collection::Percentage < Gaku::Grading::Collection::BaseMet
 
   def grade_exam
     @students.each do |student|
-      @result << Gaku::Grading::Single::Percentage.new(@gradable, student).grade_exam
+      @result << Gaku::Grading::Single::Percentage.new(@gradable, student, gradable_scope).grade_exam
     end
     @result
   end

data/lib/gaku/grading/collection/score.rb

@@ -2,7 +2,7 @@ class Gaku::Grading::Collection::Score < Gaku::Grading::Collection::BaseMethod
 
   def grade_exam
     @students.each do |student|
-      @result << Gaku::Grading::Single::Score.new(@gradable, student).grade_exam
+      @result << Gaku::Grading::Single::Score.new(@gradable, student, gradable_scope).grade_exam
     end
     @result
   end

data/lib/gaku/grading/single/base_method.rb

@@ -2,13 +2,14 @@ module Gaku
   module Grading
     module Single
       class  BaseMethod
-        attr_reader :gradable, :gradable_type, :student, :criteria, :result
+        attr_reader :gradable, :gradable_type, :student, :criteria, :result, :gradable_scope
 
         # Pass a gradable object [exam or assignment] and students
-        def initialize(gradable, student, criteria = nil)
+        def initialize(gradable, student, gradable_scope, criteria = nil)
           @gradable = gradable
           @student = student
           @criteria = criteria
+          @gradable_scope = gradable_scope
           @result = {}
         end
 

data/lib/gaku/grading/single/calculations.rb

@@ -3,23 +3,24 @@ module Gaku
     module Single
       class  Calculations
 
-        attr_reader :grading_methods, :student, :exam, :collection_students
+        attr_reader :grading_methods, :student, :exam, :collection_students, :gradable_scope
 
-        def initialize(grading_methods, student, exam, collection_students = nil)
+        def initialize(grading_methods, student, exam, gradable_scope, collection_students = nil)
           @exam                = exam
           @student             = student
           @grading_methods     = grading_methods
           @collection_students = collection_students
+          @gradable_scope      = gradable_scope
         end
 
         def calculate
           {}.tap do |hash|
             @grading_methods.each do |grading_method|
               if grading_method.interval?
-                grading = Gaku::Grading::Collection::Interval.new(@exam, collection_students, grading_method.criteria )
+                grading = Gaku::Grading::Collection::Interval.new(@exam, collection_students, gradable_scope, grading_method.criteria )
                 hash[grading_method.id] = grading.grade
               else
-                grading = grading_types[grading_method.grading_type].constantize.new(@exam, @student, grading_method.criteria)
+                grading = grading_types[grading_method.grading_type].constantize.new(@exam, @student, gradable_scope, grading_method.criteria)
                 hash[grading_method.id] = grading.grade
               end
             end