gaku_core 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df332b097347c0b53484b5c7ab8f4ed7d81f3eb6
-  data.tar.gz: 497232fa220c2e410cdbebbd1f5567919d59ed1a
+  metadata.gz: 20342fcdfd2861a72ac472b2686b6c4b94cf0db3
+  data.tar.gz: f5a1482fcf966d496f04d53c8e497675594c4b6a
 SHA512:
-  metadata.gz: 7a2433b7a857e897afbf0189d44647ecfa87e48b2620e02f0606a29c49d1bfd866f6b257bc11bcb53f3a0660a2142f6d793293dc2c5f0df31ae96418df3cdf8d
-  data.tar.gz: 9c8353ba3035fb83326fcc51a072c40a81e4412307bffb881bc68208d26cfba632958be18c8701f4f728abeca99c52134d66541cea4800a12310506cce2b3ef5
+  metadata.gz: 7c2cc6b3fc11c5dfa6560dc7067d6d6d3d954254c1c894f4d6a7fbab03962c7791852b7351125ea65e4baba19e75aebd9cd83f68df67c88ff60da111b4753f75
+  data.tar.gz: afe4fb7cbc4ced2ff729c5abe92d20c0f2a256c1731c21079abe1d18b02569af9049a8a0404c13535d4bef54abd9f0bd4eb95d24e6842f2baf703a12348eae97

data/app/controllers/gaku/core_controller.rb

@@ -1,7 +1,7 @@
 module Gaku
   class CoreController < ActionController::Base
     protect_from_forgery
-    #check_authorization
+    # check_authorization
 
     rescue_from CanCan::AccessDenied do |exception|
       session[:previous_url] = request.fullpath unless request.fullpath =~ /\/users/
@@ -15,7 +15,6 @@ module Gaku
     #   user_signed_in? ? current_user : 'Public user'  # or whatever
     # end
 
-
     protected
 
     def get_resource_name(object)
@@ -46,19 +45,15 @@ module Gaku
     end
 
     def users_check
-      if User.count == 0
-        redirect_to set_up_admin_account_path
-      end
+      redirect_to set_up_admin_account_path if User.count == 0
     end
 
     def extract_locale_from_accept_language_header
       request.env['HTTP_ACCEPT_LANGUAGE'].scan(/^[a-z]{2}/).first
     end
 
-
-    def after_sign_out_path_for(resource_or_scope)
+    def after_sign_out_path_for(_resource_or_scope)
       root_path
     end
-
   end
 end

data/app/decorators/gaku/course_decorator.rb

@@ -10,6 +10,5 @@ module Gaku
         object.code
       end
     end
-
   end
-end
+end

data/app/decorators/gaku/guardian_decorator.rb

@@ -3,4 +3,4 @@ module Gaku
     decorates 'Gaku::Guardian'
     delegate_all
   end
-end
+end

data/app/decorators/gaku/person_decorator.rb

@@ -1,11 +1,10 @@
 module Gaku
   class PersonDecorator < Draper::Decorator
-
     def sex_and_birth
       [h.gender(object), object.birth_date.to_s].reject(&:empty?).join(', ')
     end
 
-    #returns full name complete with formatting [if any]
+    # returns full name complete with formatting [if any]
     def formatted_name
       student_names
     end
@@ -14,10 +13,8 @@ module Gaku
       student_names reading: true
     end
 
-    # return full name without formatting but in order,
-    # with spaces between portions
     def full_name
-      student_names without_formating: true
+      "#{object.surname} #{object.name}"
     end
 
     def full_name_reading
@@ -30,18 +27,18 @@ module Gaku
 
       if options[:without_formating]
         preset_without_format = ''
-        preset.gsub(/%(\w+)/) {|n|  preset_without_format << n + ' '}
+        preset.gsub(/%(\w+)/) { |n|  preset_without_format << n + ' ' }
         preset = preset_without_format.strip
       end
 
-      if options[:reading] && object.name_reading.blank? && object.surname_reading.blank? && object.middle_name_reading.blank?
+      if options[:reading] && object.name_reading.blank? &&
+        object.surname_reading.blank? &&
+        object.middle_name_reading.blank?
         return ''
       end
 
       reading = options[:reading]
-      if preset.blank?
-        return reading ? object.phonetic_reading : object.to_s
-      end
+      return reading ? object.phonetic_reading : object.to_s if preset.blank?
       result = preset.gsub(/%(\w+)/) do |name|
         case name
         when '%first' then proper_name(:name, reading)
@@ -58,6 +55,5 @@ module Gaku
     def proper_name(attribute, reading)
       reading ? object.send(attribute.to_s + '_reading') : object.send(attribute)
     end
-
   end
-end
+end

data/app/decorators/gaku/student_decorator.rb

@@ -40,7 +40,5 @@ module Gaku
     def major_check(student_specialty)
       student_specialty.major ? h.t(:'specialty.major') : h.t(:'specialty.minor')
     end
-
-
   end
 end

data/app/decorators/gaku/teacher_decorator.rb

@@ -3,4 +3,4 @@ module Gaku
     decorates 'Gaku::Teacher'
     delegate_all
   end
-end
+end

data/app/models/concerns/addresses.rb

@@ -3,15 +3,15 @@ module Addresses
 
   included do
     has_many :addresses, as: :addressable
+    has_one :primary_address, -> { where(primary: true) }, class_name: 'Gaku::Address', as: :addressable
 
-    def get_primary_address
-      addresses.where(primary: true).first
-    end
+    # def primary_address
+    #   addresses.where(primary: true).first
+    # end
 
     def address_widget
-      "#{get_primary_address.city}, " +
-        "#{get_primary_address.address1}" if get_primary_address
+      "#{primary_address.city}, " \
+        "#{primary_address.address1}" if primary_address
     end
   end
-
 end

data/app/models/concerns/contacts.rb

@@ -3,15 +3,15 @@ module Contacts
 
   included do
     has_many :contacts, as: :contactable
+    has_one :primary_contact, -> { where(primary: true) }, class_name: 'Gaku::Contact', as: :contactable
 
-    def get_primary_contact
-      contacts.where(primary: true).first
-    end
+
+    # def primary_contact
+    #   contacts.where(primary: true).first
+    # end
 
     def contact_widget
-      "#{get_primary_contact.contact_type}: #{get_primary_contact.data}" if get_primary_contact
+      "#{primary_contact.contact_type}: #{primary_contact.data}" if primary_contact
     end
   end
-
 end
-

data/app/models/concerns/enrollmentable.rb

@@ -0,0 +1,9 @@
+module Enrollmentable
+  extend ActiveSupport::Concern
+
+  included do
+    has_many :enrollments, as: :enrollmentable, dependent: :destroy
+    has_many :students, through: :enrollments
+  end
+
+end

data/app/models/concerns/gradable.rb

@@ -0,0 +1,14 @@
+module Gradable
+  extend ActiveSupport::Concern
+
+  included do
+    has_many :grading_method_connectors, as: :gradable
+    has_many :grading_methods, through: :grading_method_connectors
+  end
+
+  def use_primary_grading_method_set
+    if Gaku::GradingMethodSet.primary
+      grading_methods << Gaku::GradingMethodSet.primary.grading_methods
+    end
+  end
+end

data/app/models/concerns/notes.rb

@@ -4,5 +4,4 @@ module Notes
   included do
     has_many :notes, as: :notable
   end
-
-end
+end

data/app/models/concerns/pagination.rb

@@ -4,5 +4,4 @@ module Pagination
   included do
     paginates_per 20
   end
-
-end
+end

data/app/models/concerns/person.rb

@@ -24,6 +24,4 @@ module Person
     end
 
   end
-
 end
-

data/app/models/concerns/picture.rb

@@ -2,8 +2,6 @@ module Picture
   extend ActiveSupport::Concern
 
   included do
-    has_attached_file :picture, styles: {thumb: '256x256>'}, default_url: ':placeholder'
+    has_attached_file :picture, styles: { thumb: '256x256>' }, default_url: ':placeholder'
   end
-
 end
-

data/app/models/concerns/semesterable.rb

@@ -0,0 +1,12 @@
+module Semesterable
+  extend ActiveSupport::Concern
+
+  included do
+    has_many :semester_connectors, as: :semesterable, dependent: :destroy
+    has_many :semesters, through: :semester_connectors, source: :semester
+
+    scope :without_semester,
+          -> { includes(:semester_connectors).where(gaku_semester_connectors: { semesterable_id: nil }) }
+
+  end
+end

data/app/models/concerns/student_reviewable.rb

@@ -0,0 +1,7 @@
+module StudentReviewable
+  extend ActiveSupport::Concern
+
+  included do
+    has_many :student_reviews, as: :student_reviewable
+  end
+end

data/app/models/gaku/ability.rb

@@ -26,7 +26,7 @@ module Gaku
       clear_aliased_actions
 
       # override cancan default aliasing
-      #(we don't want to differentiate between read and index)
+      # (we don't want to differentiate between read and index)
       alias_action :edit, to: :update
       alias_action :new,  to: :create
       alias_action :new_action, to: :create
@@ -47,13 +47,11 @@ module Gaku
         end
       end
 
-
-      #include any abilities registered by extensions, etc.
+      # include any abilities registered by extensions, etc.
       Ability.abilities.each do |clazz|
         ability = clazz.send(:new, user)
         @rules = rules + ability.send(:rules)
       end
-
     end
   end
 end

data/app/models/gaku/address.rb

@@ -4,24 +4,26 @@ module Gaku
     belongs_to :state
     belongs_to :addressable, polymorphic: true, counter_cache: true
 
-    scope :deleted,   -> { where(deleted: true) }
     scope :students,  -> { where(addressable_type: 'Gaku::Student') }
     scope :teachers,  -> { where(addressable_type: 'Gaku::Teacher') }
     scope :guardians, -> { where(addressable_type: 'Gaku::Guardian') }
 
-
     validates :address1, :country, :city, presence: true
 
     accepts_nested_attributes_for :country
 
     before_create :ensure_first_primary, on: :create
-    after_save :update_primary_address_field
+    # after_save :update_primary_address_field
     after_destroy :reset_counter_cache
 
+    def to_s
+      "#{city} #{address1}"
+    end
+
     def make_primary
       addresses.where.not(id: id).update_all(primary: false)
       update_attribute(:primary, true)
-      update_primary_address_field
+      # update_primary_address_field
     end
 
     def primary?
@@ -79,11 +81,10 @@ module Gaku
       end
     end
 
-    def update_primary_address_field
-      if addressable && addressable.has_attribute?(:primary_address)
-        addressable.update_attribute(:primary_address, addressable.address_widget)
-      end
-    end
-
+    # def update_primary_address_field
+    #   if addressable && addressable.has_attribute?(:primary_address)
+    #     addressable.update_attribute(:primary_address, addressable.address_widget)
+    #   end
+    # end
   end
 end

data/app/models/gaku/admin_ability.rb

@@ -15,7 +15,6 @@ module Gaku
       user ||= User.new
 
       can :manage, :all if user.role? :admin
-
     end
   end
 end

data/app/models/gaku/assignment.rb

@@ -1,6 +1,5 @@
 module Gaku
   class Assignment < ActiveRecord::Base
-
     belongs_to :syllabus
     belongs_to :grading_method
 
@@ -10,6 +9,5 @@ module Gaku
     def to_s
       name
     end
-
   end
 end

data/app/models/gaku/assignment_score.rb

@@ -8,6 +8,5 @@ module Gaku
     def to_s
       score
     end
-
   end
 end

data/app/models/gaku/attachment.rb

@@ -1,12 +1,10 @@
 module Gaku
   class Attachment < ActiveRecord::Base
-
     belongs_to :attachable, polymorphic: true
 
     has_attached_file :asset
 
-    validates_associated  :attachable,
-                          message: I18n.t(:'attachment.associated')
+    validates_associated :attachable, message: I18n.t(:'attachment.associated')
 
     validates :name, presence: true
     validates :asset, presence: true, on: :create
@@ -14,6 +12,5 @@ module Gaku
     def to_s
       name
     end
-
   end
 end

data/app/models/gaku/attendance.rb

@@ -1,6 +1,5 @@
 module Gaku
   class Attendance < ActiveRecord::Base
-
     belongs_to :attendancable, polymorphic: true
     belongs_to :student
     belongs_to :attendance_type
@@ -11,6 +10,5 @@ module Gaku
     def to_s
       reason
     end
-
   end
 end

data/app/models/gaku/attendance_type.rb

@@ -1,6 +1,5 @@
 module Gaku
   class AttendanceType < ActiveRecord::Base
-
     has_many :attendances
 
     translates :name
@@ -10,6 +9,5 @@ module Gaku
     def to_s
       name
     end
-
   end
 end

data/app/models/gaku/badge.rb

@@ -1,10 +1,8 @@
 module Gaku
   class Badge < ActiveRecord::Base
-
     belongs_to :student, counter_cache: :badges_count
     belongs_to :badge_type
 
     validates :badge_type_id, :student_id, presence: true
-
   end
 end

data/app/models/gaku/badge_type.rb

@@ -10,6 +10,5 @@ module Gaku
     def to_s
       name
     end
-
   end
 end

data/app/models/gaku/class_group.rb

@@ -1,23 +1,23 @@
 module Gaku
   class ClassGroup < ActiveRecord::Base
 
-    include Notes, Pagination
+    include Notes, Pagination, Enrollmentable, Semesterable, StudentReviewable
 
-    has_many :enrollments, class_name: 'Gaku::ClassGroupEnrollment'
-    has_many :students, through: :enrollments
-
-    has_many :class_group_course_enrollments, dependent: :destroy
-    has_many :courses, through: :class_group_course_enrollments
+    validates :name, presence: true
 
-    has_many :semester_class_groups, dependent: :destroy
-    has_many :semesters, through: :semester_class_groups
+    def self.for_select
+      %w(active upcomming).map do |state|
+        [state.humanize, send(state).map { |cg| [cg.to_s, cg.id] }]
+      end
+    end
 
-    validates :name, presence: true
+    def self.active
+      @active = joins(:semesters).merge(Gaku::Semester.active).uniq
+    end
 
-    scope :without_semester, -> {
-                                  includes(:semester_class_groups)
-                                  .where(gaku_semester_class_groups: {class_group_id: nil})
-                                }
+    def self.upcomming
+      @upcomming = joins(:semesters).merge(Gaku::Semester.upcomming).uniq - active
+    end
 
     def to_s
       "#{grade} - #{name}"