gaku_core 0.1.1 → 0.2.0

data/app/models/gaku/commute_method_type.rb

@@ -1,6 +1,5 @@
 module Gaku
   class CommuteMethodType < ActiveRecord::Base
-
     has_many :students
 
     validates :name, presence: true, uniqueness: true
@@ -10,6 +9,5 @@ module Gaku
     def to_s
       name
     end
-
   end
 end

data/app/models/gaku/contact.rb

@@ -1,15 +1,10 @@
 module Gaku
   class Contact < ActiveRecord::Base
-
     belongs_to :contact_type
     belongs_to :contactable, polymorphic: true, counter_cache: true
 
     validates :data, :contact_type, presence: true
 
-    before_save :ensure_first_is_primary, on: :create
-    before_save :remove_other_primary
-    after_save :update_primary_contact_field
-
     delegate :name, to: :contact_type, allow_nil: true
 
     def to_s
@@ -33,12 +28,12 @@ module Gaku
     end
 
     def make_primary
-      contacts.where.not(id: id).update_all(primary: false)
+      contactable.contacts.where.not(id: id).update_all(primary: false)
       update_attribute(:primary, true)
 
-      if contactable.has_attribute?(:primary_contact)
-        contactable.update_attribute(:primary_contact, contact_widget)
-      end
+      # if contactable.has_attribute?(:primary_contact)
+      #   contactable.update_attribute(:primary_contact, contactable.contact_widget)
+      # end
     end
 
     def primary?
@@ -56,37 +51,12 @@ module Gaku
     private
 
     def increment_count
-      contactable.class.increment_counter(:addresses_count, contactable.id)
+      contactable.class.increment_counter(:contacts_count, contactable.id)
     end
 
     def decrement_count
-      contactable.class.decrement_counter(:addresses_count, contactable.id)
-    end
-
-    def remove_other_primary
-      contacts.where.not(id: id).update_all(primary: false) if primary?
-    end
-
-    def ensure_first_is_primary
-      if contactable.respond_to? :contacts
-        self.primary = true if contacts.blank?
-      end
-    end
-
-    def contact_widget
-      contactable.contact_widget
-    end
-
-    def update_primary_contact_field
-      if contactable.has_attribute? :primary_contact
-        contactable.update_attribute(:primary_contact, contactable.contact_widget)
-      end
-    end
-
-    def contacts
-      contactable.contacts
+      contactable.class.decrement_counter(:contacts_count, contactable.id)
     end
 
   end
 end
-

data/app/models/gaku/contact_type.rb

@@ -1,6 +1,5 @@
 module Gaku
   class ContactType < ActiveRecord::Base
-
     has_many :contacts
 
     validates :name, presence: true, uniqueness: true
@@ -8,6 +7,5 @@ module Gaku
     def to_s
       name
     end
-
   end
 end

data/app/models/gaku/country.rb

@@ -1,11 +1,9 @@
 module Gaku
   class Country < ActiveRecord::Base
-
     has_many :states, -> { order name: :asc },
              foreign_key: :country_iso,
              primary_key: :iso
 
-
     default_scope -> { order('name ASC') }
 
     validates :name, :iso_name, :iso, presence: true
@@ -18,6 +16,5 @@ module Gaku
     def to_s
       name
     end
-
   end
 end

data/app/models/gaku/course.rb

@@ -1,23 +1,11 @@
 module Gaku
   class Course < ActiveRecord::Base
 
-    include Notes
-
-    has_many :enrollments,
-             class_name: 'Gaku::CourseEnrollment',
-             dependent: :destroy
-
-    has_many :students, through: :enrollments
+    include Notes, Gradable, Enrollmentable, Semesterable
 
     has_many :course_group_enrollments
     has_many :course_groups, through: :course_group_enrollments
 
-    has_many :class_groups, through: :class_group_course_enrollments
-    has_many :class_group_course_enrollments, dependent: :destroy
-
-    has_many :semester_courses, dependent: :destroy
-    has_many :semesters, through: :semester_courses
-
     has_many :exam_schedules
 
     belongs_to :syllabus
@@ -25,12 +13,10 @@ module Gaku
 
     delegate :name, :code, to: :syllabus, prefix: true, allow_nil: true
 
-    accepts_nested_attributes_for :enrollments
+    # accepts_nested_attributes_for :enrollments
 
     validates :code, presence: true
 
-    scope :without_semester, -> { includes(:semester_courses).where(gaku_semester_courses: { course_id: nil }) }
-
     def to_s
       if syllabus_name
         "#{syllabus_name}-#{code}"
@@ -43,15 +29,15 @@ module Gaku
       [to_s, id]
     end
 
-    def enroll_class_group(class_group)
-      unless class_group.blank?
-        ActiveRecord::Base.transaction do
-          class_group.student_ids.each do |student_id|
-            CourseEnrollment.find_or_create_by(student_id: student_id, course_id: id)
-         end
-        end
-      end
-    end
+    # def enroll_class_group(class_group)
+    #   unless class_group.blank?
+    #     ActiveRecord::Base.transaction do
+    #       class_group.student_ids.each do |student_id|
+    #         CourseEnrollment.find_or_create_by(student_id: student_id, course_id: id)
+    #      end
+    #     end
+    #   end
+    # end
 
   end
 end

data/app/models/gaku/course_group.rb

@@ -1,6 +1,5 @@
 module Gaku
   class CourseGroup < ActiveRecord::Base
-
     has_many :course_group_enrollments
     has_many :courses, through: :course_group_enrollments
 
@@ -9,6 +8,5 @@ module Gaku
     def to_s
       name
     end
-
   end
 end

data/app/models/gaku/course_group_enrollment.rb

@@ -8,9 +8,8 @@ module Gaku
     validates :course_id,
               presence: true,
               uniqueness: {
-                            scope: :course_group_id,
-                            message: I18n.t(:'course_group.already_enrolled')
-                          }
-
+                scope: :course_group_id,
+                message: I18n.t(:'course_group.already_enrolled')
+              }
   end
 end

data/app/models/gaku/department.rb

@@ -1,6 +1,5 @@
 module Gaku
   class Department < ActiveRecord::Base
-
     has_many :specialties
     has_many :syllabuses
     has_many :exams
@@ -12,6 +11,5 @@ module Gaku
     def to_s
       name
     end
-
   end
 end

data/app/models/gaku/enrollment.rb

@@ -0,0 +1,85 @@
+module Gaku
+  class Enrollment < ActiveRecord::Base
+
+    belongs_to :student
+    belongs_to :enrollmentable, polymorphic: true, counter_cache: true
+
+    validates :enrollmentable_type, :enrollmentable_id, :student_id, presence: true
+
+    validates :student_id,
+              uniqueness: {
+                scope: %w( enrollmentable_type enrollmentable_id ),
+                message: I18n.t(:'student.already_enrolled')
+              }
+
+    validates :enrollmentable_type,
+              inclusion: {
+                in: %w( Gaku::Course Gaku::ClassGroup Gaku::ExtracurricularActivity ),
+                message: '%{value} is not a valid'
+              }
+
+    validate :class_group_semesters_overlap, if: ->(record) { record.class_group_type? }
+
+    before_create :increment_enrollmentable_counter
+    before_destroy :decrement_enrollmentable_counter
+
+    before_create :proper_position, if: ->(record) { record.class_group_type? }
+    after_destroy :refresh_positions, if: ->(record) { record.class_group_type? }
+
+    scope :seat_numbered, -> { order('seat_number ASC') }
+
+    def class_group_type?
+      enrollmentable_type == 'Gaku::ClassGroup'
+    end
+
+    private
+
+    def class_group_semesters_overlap
+      if overlap_semester? && not_in_student_class_groups?
+        errors.add(:base, I18n.t('enrollment.class_group_overlapping'))
+      end
+    end
+
+    def overlap_semester?
+      if student && student.semesters && enrollmentable
+        student.semesters.where(id: enrollmentable.semester_ids).any?
+      end
+    end
+
+    def not_in_student_class_groups?
+      student.class_groups.exclude?(enrollmentable)
+    end
+
+    def increment_enrollmentable_counter
+      Student.increment_counter(resource_name_counter, student.id) if student
+    end
+
+    def decrement_enrollmentable_counter
+      Student.decrement_counter(resource_name_counter, student.id) if student
+    end
+
+    def resource_name_counter
+      enrollmentable_type.demodulize.underscore.pluralize.concat('_count') if enrollmentable_type
+    end
+
+    def proper_position
+      self.seat_number = enrollmentable.enrollments_count.next
+    end
+
+    def refresh_positions
+      enrollments = enrollmentable.enrollments
+      enrollments.pluck(:id).each_with_index do |id, index|
+        enrollments.where(id: id).update_all(seat_number: index.next)
+      end
+    end
+
+    def class_group_is_active?
+      Gaku::ClassGroup.active.include?(enrollmentable)
+    end
+
+    def not_in_student_class_groups?
+      student.class_groups.exclude?(enrollmentable)
+    end
+
+  end
+end

data/app/models/gaku/enrollment_status.rb

@@ -1,6 +1,5 @@
 module Gaku
   class EnrollmentStatus < ActiveRecord::Base
-
     has_many :students, foreign_key: :enrollment_status_code, primary_key: :code
 
     translates :name
@@ -20,6 +19,5 @@ module Gaku
     def set_name
       self.name = code if name.nil?
     end
-
   end
 end

data/app/models/gaku/exam.rb

@@ -1,7 +1,6 @@
 module Gaku
   class Exam < ActiveRecord::Base
-
-    include Notes, Pagination
+    include Notes, Pagination, Gradable
 
     has_many :exam_scores
     has_many :exam_portions, -> { order :position }
@@ -12,20 +11,21 @@ module Gaku
 
     has_many :attendances, as: :attendancable
 
+    has_many :exam_sessions
+
     belongs_to :grading_method
     belongs_to :department
 
-
     validates :name, presence: true
 
-    validates :weight, numericality: {
-                                        allow_blank: true,
-                                        greater_than_or_equal_to: 0
-                                     }
-
+    validates :weight, numericality: { allow_blank: true, greater_than_or_equal_to: 0 }
 
     accepts_nested_attributes_for :exam_portions
 
+    def to_s
+      name
+    end
+
     def self.without_syllabuses
       includes(:syllabuses).where(standalone: false)
                            .select { |p| p.syllabuses.length == 0 }
@@ -46,7 +46,7 @@ module Gaku
     end
 
     def max_score
-      exam_portions.reduce(0) { |sum, p| sum + p.max_score }
+      exam_portions.inject(0) { |sum, p| sum + p.max_score }
     end
 
     def completion(students)
@@ -56,17 +56,17 @@ module Gaku
     end
 
     def ungraded(students)
-       ungraded = 0
+      ungraded = 0
 
-        students.each do |student|
-          student_exam_eps = exam_portion_scores.select do |eps|
-            eps.student_id == student.id
-          end
+      students.each do |student|
+        student_exam_eps = exam_portion_scores.select do |eps|
+          eps.student_id == student.id
+        end
 
-          student_exam_eps.each do |eps|
-            ungraded += 1 if check_record_completion?(eps)
-          end
+        student_exam_eps.each do |eps|
+          ungraded += 1 if check_record_completion?(eps)
         end
+      end
 
       ungraded
     end
@@ -83,7 +83,6 @@ module Gaku
       completed
     end
 
-
     def completed_by_student?(student)
       state = true
 
@@ -97,8 +96,6 @@ module Gaku
       state
     end
 
-    private
-
     def check_record_completion?(student_eps)
       student_eps.score.nil? && !student_eps.attendances
                                             .last
@@ -107,5 +104,3 @@ module Gaku
     end
   end
 end
-
-

data/app/models/gaku/exam_portion.rb

@@ -15,10 +15,8 @@ module Gaku
     validates :name, presence: true
 
     validates :weight,
-              numericality: {
-                              greater_than_or_equal_to: 0,
-                              if: Proc.new { |ep| ep.weight.present? }
-                            }
+              numericality: { greater_than_or_equal_to: 0,
+                              if: proc { |ep| ep.weight.present? } }
 
     validates :max_score, presence: true,
                           numericality: { greater_than_or_equal_to: 0 }
@@ -35,7 +33,6 @@ module Gaku
 
     def correct_weight_with_error
       self.weight = weight_was
-      custom_errors =  I18n.t(:'exam_portion.error')
     end
 
     def weight_calculate
@@ -81,6 +78,5 @@ module Gaku
         exam_portions.where(id: id).update_all(position: index)
       end
     end
-
   end
 end

data/app/models/gaku/exam_portion_score.rb

@@ -1,12 +1,10 @@
 module Gaku
   class ExamPortionScore < ActiveRecord::Base
-
     belongs_to :student
     belongs_to :exam_portion
 
     has_many :attendances, as: :attendancable
 
     validates :student, :exam_portion, presence: true
-
   end
 end