gaku_core 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8ec2a924579efe2c5e618e4ebf79066ffd3bc19
-  data.tar.gz: dd6421683b81443905db7df3b1ea9bfd43acc09b
+  metadata.gz: 1f71ccfcff2623665e161d75c74d9b29b098bb92
+  data.tar.gz: f1ca972df804e840b02ecc79068f82ab6fdb867e
 SHA512:
-  metadata.gz: 43e5b0dfef9b6856697da0fc162ce9948ff44534d0eddcde86bff31bf46a2aed4c941a7e79c96a532187f08e8abe6ab6467122dee914ea4a9587dc036afeaf7d
-  data.tar.gz: 5126158bc5f912f6f5e716fa53f3c6eec2c4d4dd9efd91e1bb9b5a65f96fd4f4488f4bde7b04d931eec3a9a58c3a302127f40ae2c9cbcd508e6ff97fe57e6611
+  metadata.gz: 56185a1572c66c3d0e326cf2c04fe82ae6d635924c7119e9c37c29871c68a4d8b634caf00139d621ebf1bc4836d5d7c99d8f38110f57388ba1a659b522de1aff
+  data.tar.gz: 285d16acdd8838670a9c641d4a2fb1c9391e298333fb9d74cd784709cba2122e2b4df2efa80d7cce3300b88b0fc2d4f8d0c93a5bfdcfe0ef9a90034c55828e8d

data/app/controllers/gaku/{gaku_controller.rb → core_controller.rb}

@@ -1,30 +1,20 @@
 module Gaku
-  class GakuController < ActionController::Base
+  class CoreController < ActionController::Base
     protect_from_forgery
     #check_authorization
 
-    self.responder = AppResponder
-    respond_to :html
-
     rescue_from CanCan::AccessDenied do |exception|
+      session[:previous_url] = request.fullpath unless request.fullpath =~ /\/users/
       redirect_to root_url, alert: exception.message
     end
 
     before_filter :set_locale
     before_filter :users_check
 
-    layout :resolve_layout
-
+    # def user_for_paper_trail
+    #   user_signed_in? ? current_user : 'Public user'  # or whatever
+    # end
 
-    helper_method :preset
-
-    def user_for_paper_trail
-      user_signed_in? ? current_user : 'Public user'  # or whatever
-    end
-
-    def preset(name)
-      Gaku::Preset.get(name)
-    end
 
     protected
 
@@ -42,19 +32,6 @@ module Gaku
       @current_ability ||= Gaku::Ability.new(current_user)
     end
 
-    def resolve_layout
-      case action_name
-      when 'index'
-        'gaku/layouts/index'
-      when 'show'
-        'gaku/layouts/show'
-      when 'edit'
-        'gaku/layouts/edit'
-      else
-        'gaku/layouts/gaku'
-      end
-    end
-
     def set_locale
       if current_user && params[:locale]
         I18n.locale = params[:locale]
@@ -78,12 +55,6 @@ module Gaku
       request.env['HTTP_ACCEPT_LANGUAGE'].scan(/^[a-z]{2}/).first
     end
 
-    def after_sign_in_path_for(resource_or_scope)
-      unless current_user.settings[:locale].blank?
-        I18n.locale = current_user.settings[:locale]
-      end
-      super
-    end
 
     def after_sign_out_path_for(resource_or_scope)
       root_path

data/app/decorators/gaku/course_decorator.rb

@@ -0,0 +1,15 @@
+module Gaku
+  class CourseDecorator < Draper::Decorator
+    decorates 'Gaku::Course'
+    delegate_all
+
+    def code_with_syllabus_name
+      if object.syllabus_name
+        "#{object.syllabus_name}-#{object.code}"
+      else
+        object.code
+      end
+    end
+
+  end
+end

data/app/decorators/gaku/person_decorator.rb

@@ -25,7 +25,7 @@ module Gaku
     end
 
     def student_names(options = {})
-      @names_preset ||= Gaku::Preset.get(:names)
+      @names_preset ||= Gaku::Preset.names
       preset = @names_preset
 
       if options[:without_formating]

data/app/decorators/gaku/student_decorator.rb

@@ -3,16 +3,26 @@ module Gaku
     decorates 'Gaku::Student'
     delegate_all
 
-    def specialties_list
-      object.specialties.map { |s| s.name }.join(', ')
+    def badges_list
+      h.comma_separated_list(object.badges) do |badge|
+        if badge.badge_type.badge_image_file_name.nil?
+          badge.badge_type.name
+        else
+          "#{badge.badge_type.name} (#{h.resize_image(badge.badge_type.badge_image, size: 22)})"
+        end
+      end
     end
 
-    def achievements_list
-      object.achievements.map { |s| s.name }.join(', ')
+    def simple_grades_list
+      h.comma_separated_list(object.simple_grades) do |simple_grade|
+        "#{simple_grade.simple_grade_type_name}"
+      end
     end
 
-    def simple_grades_list
-      object.simple_grades.map { |s| s.name }.join(', ')
+    def student_specialties_list
+      h.comma_separated_list(object.student_specialties) do |student_specialty|
+        "#{student_specialty.specialty} (#{major_check(student_specialty)})"
+      end
     end
 
     def class_group
@@ -25,5 +35,12 @@ module Gaku
       sn.blank? ? '' : sn.seat_number
     end
 
+    private
+
+    def major_check(student_specialty)
+      student_specialty.major ? h.t(:'specialty.major') : h.t(:'specialty.minor')
+    end
+
+
   end
-end
+end

data/app/models/concerns/pagination.rb

@@ -0,0 +1,8 @@
+module Pagination
+  extend ActiveSupport::Concern
+
+  included do
+    paginates_per 20
+  end
+
+end

data/app/models/concerns/person.rb

@@ -2,6 +2,7 @@ module Person
   extend ActiveSupport::Concern
 
   included do
+
     validates :name, :surname, presence: true
 
     def to_s
@@ -12,6 +13,16 @@ module Person
       "#{surname_reading} #{name_reading}"
     end
 
+    def age
+      Date.today.year - birth_date.year
+    end
+
+    ransacker :age do
+      Arel::Nodes::SqlLiteral.new(
+        "DATE_PART('year', AGE(NOW(), birth_date))"
+      )
+    end
+
   end
 
 end

data/app/models/concerns/picture.rb

@@ -2,7 +2,7 @@ module Picture
   extend ActiveSupport::Concern
 
   included do
-    has_attached_file :picture, styles: {thumb: '256x256>'}, default_url: '/assets/pictures/thumb/missing.png'
+    has_attached_file :picture, styles: {thumb: '256x256>'}, default_url: ':placeholder'
   end
 
 end

data/app/models/gaku/address.rb

@@ -9,14 +9,6 @@ module Gaku
     scope :teachers,  -> { where(addressable_type: 'Gaku::Teacher') }
     scope :guardians, -> { where(addressable_type: 'Gaku::Guardian') }
 
-    has_paper_trail class_name: 'Gaku::Versioning::AddressVersion',
-                    on:   [:update, :destroy],
-                    meta: {
-                            join_model: :join_model_name,
-                            joined_resource_id: :joined_resource_id
-                          }
-
-    default_scope -> { where(deleted: false) }
 
     validates :address1, :country, :city, presence: true
 
@@ -32,26 +24,16 @@ module Gaku
       update_primary_address_field
     end
 
-    def soft_delete
-      update_attributes(deleted: true, primary: false)
-      decrement_count
-    end
-
-    def recover
-      update_attribute(:deleted, false)
-      increment_count
-    end
-
     def primary?
       primary
     end
 
-    def join_model_name
-      addressable_type
+    def self.primary
+      where(primary: true).first
     end
 
-    def joined_resource_id
-      addressable_id
+    def self.secondary
+      where(primary: false)
     end
 
     def state_text

data/app/models/gaku/attachment.rb

@@ -1,8 +1,6 @@
 module Gaku
   class Attachment < ActiveRecord::Base
 
-    include Trashable
-
     belongs_to :attachable, polymorphic: true
 
     has_attached_file :asset

data/app/models/gaku/badge.rb

@@ -0,0 +1,10 @@
+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

@@ -0,0 +1,15 @@
+module Gaku
+  class BadgeType < ActiveRecord::Base
+    has_many :badges
+    has_many :students, through: :badges
+
+    has_attached_file :badge_image, default_url: ':placeholder'
+
+    validates :name, presence: true
+
+    def to_s
+      name
+    end
+
+  end
+end

data/app/models/gaku/class_group.rb

@@ -1,7 +1,7 @@
 module Gaku
   class ClassGroup < ActiveRecord::Base
 
-    include Notes
+    include Notes, Pagination
 
     has_many :enrollments, class_name: 'Gaku::ClassGroupEnrollment'
     has_many :students, through: :enrollments

data/app/models/gaku/class_group_enrollment.rb

@@ -5,9 +5,9 @@ module Gaku
     belongs_to :student
     has_many :school_roles, as: :school_rolable
 
-    validates :class_group_id, presence: true
+    validates :class_group, presence: true
 
-    validates :student_id,
+    validates :student,
               presence: true,
               uniqueness: {
                             scope: :class_group_id,

data/app/models/gaku/contact.rb

@@ -4,13 +4,6 @@ module Gaku
     belongs_to :contact_type
     belongs_to :contactable, polymorphic: true, counter_cache: true
 
-    has_paper_trail class_name: 'Gaku::Versioning::ContactVersion',
-                    on: [:update, :destroy],
-                    meta: {
-                            join_model: :join_model_name,
-                            joined_resource_id: :joined_resource_id
-                          }
-
     validates :data, :contact_type, presence: true
 
     before_save :ensure_first_is_primary, on: :create
@@ -19,20 +12,12 @@ module Gaku
 
     delegate :name, to: :contact_type, allow_nil: true
 
-    default_scope -> { where(deleted: false) }
-
-    def soft_delete
-      update_attributes(deleted: true, primary: false)
-      decrement_count
-    end
-
-    def recover
-      update_attribute(:deleted, false)
-      increment_count
+    def to_s
+      data
     end
 
-    def self.deleted
-      where(deleted: true)
+    def self.primary_email
+      where(primary: true, contact_type: Gaku::ContactType.where(name: 'Email').first).first
     end
 
     def self.students
@@ -60,12 +45,12 @@ module Gaku
       primary
     end
 
-    def join_model_name
-      contactable_type
+    def self.primary
+      where(primary: true).first
     end
 
-    def joined_resource_id
-      contactable_id
+    def self.secondary
+      where(primary: false)
     end
 
     private

data/app/models/gaku/contact_type.rb

@@ -3,7 +3,7 @@ module Gaku
 
     has_many :contacts
 
-    validates :name, presence: true
+    validates :name, presence: true, uniqueness: true
 
     def to_s
       name

data/app/models/gaku/country.rb

@@ -9,6 +9,7 @@ module Gaku
     default_scope -> { order('name ASC') }
 
     validates :name, :iso_name, :iso, presence: true
+    validates :iso, uniqueness: true
 
     def <=>(other)
       name <=> other.name

data/app/models/gaku/course_enrollment.rb

@@ -12,6 +12,12 @@ module Gaku
                             scope: :course_id,
                             message: I18n.t(:'course.already_enrolled')
                           }
+    def code_with_syllabus_name
+      course.decorate.code_with_syllabus_name if course
+    end
 
+    def course_id
+      course.id if course
+    end
   end
 end

data/app/models/gaku/course_group.rb

@@ -1,8 +1,6 @@
 module Gaku
   class CourseGroup < ActiveRecord::Base
 
-    include Trashable
-
     has_many :course_group_enrollments
     has_many :courses, through: :course_group_enrollments
 

data/app/models/gaku/department.rb

@@ -1,6 +1,10 @@
 module Gaku
   class Department < ActiveRecord::Base
 
+    has_many :specialties
+    has_many :syllabuses
+    has_many :exams
+
     translates :name
 
     validates :name, presence: true, uniqueness: true

data/app/models/gaku/enrollment_status.rb

@@ -5,7 +5,7 @@ module Gaku
 
     translates :name
 
-    validates :code, presence: true
+    validates :code, presence: true, uniqueness: true
 
     before_create :set_name
 

data/app/models/gaku/exam.rb

@@ -1,7 +1,7 @@
 module Gaku
   class Exam < ActiveRecord::Base
 
-    include Notes, Trashable
+    include Notes, Pagination
 
     has_many :exam_scores
     has_many :exam_portions, -> { order :position }
@@ -13,6 +13,8 @@ module Gaku
     has_many :attendances, as: :attendancable
 
     belongs_to :grading_method
+    belongs_to :department
+
 
     validates :name, presence: true
 

data/app/models/gaku/exam_portion.rb

@@ -4,7 +4,7 @@ module Gaku
 
     attr_accessor :custom_errors
 
-    belongs_to :exam
+    belongs_to :exam, counter_cache: true
     belongs_to :grading_method
 
     has_many :exam_schedules

data/app/models/gaku/external_school_record.rb

@@ -1,15 +1,30 @@
 module Gaku
   class ExternalSchoolRecord < ActiveRecord::Base
     belongs_to :school
-    belongs_to :student
+    belongs_to :student, counter_cache: :external_school_records_count
 
-    has_many :simple_grades,
-             -> { where("school_id = #{school_id} AND student_id = #{student_id}") },
-             class_name: 'Gaku::SimpleGrade',
-             dependent: :destroy
-
-    has_many :achievements
+    # has_many :simple_grades,
+    #          -> { where("school_id = #{school_id} AND student_id = #{student_id}") },
+    #          class_name: 'Gaku::SimpleGrade',
+    #          dependent: :destroy
 
     validates :school, :student, presence: true
+
+    def attendance_rate
+      if units_values_present?
+        (presence_days.to_f / total_units) * 100
+      end
+    end
+
+    def presence_days
+      total_units - units_absent if units_values_present?
+    end
+
+    private
+
+    def units_values_present?
+      units_absent.present? && total_units.present?
+    end
+
   end
 end

data/app/models/gaku/extracurricular_activity.rb

@@ -4,7 +4,7 @@ module Gaku
     has_many :enrollments, class_name: 'Gaku::ExtracurricularActivityEnrollment'
     has_many :students, through: :enrollments
 
-    validates :name, presence: true
+    validates :name, presence: true, uniqueness: true
 
     def to_s
       name

data/app/models/gaku/grading_method.rb

@@ -4,11 +4,12 @@ module Gaku
     has_one :exam
     has_one :exam_portion
     has_one :assignment
+    has_many :simple_grade_types
 
     has_many :grading_method_set_items
     has_many :grading_method_sets, through: :grading_method_set_items
 
-    validates :name, presence: true
+    validates :name, presence: true, uniqueness: true
 
     def to_s
       name

data/app/models/gaku/guardian.rb

@@ -1,7 +1,7 @@
 module Gaku
   class Guardian < ActiveRecord::Base
 
-    include Person, Addresses, Contacts, Picture, Trashable
+    include Person, Addresses, Contacts, Picture
 
     belongs_to :user
     has_many :student_guardians, dependent: :destroy

data/app/models/gaku/level.rb

@@ -7,6 +7,7 @@ module Gaku
     has_many :programs, through: :program_levels
 
     validates :name, :school, presence: true
+    validates :name, uniqueness: true
 
     def to_s
       name

data/app/models/gaku/preset.rb

@@ -1,74 +1,47 @@
 module Gaku
   class Preset < ActiveRecord::Base
 
-    PRESETS = {
-      student: %w(students_gender address_country address_state address_city),
-      locale:  %w(language),
-      grading: %w(grading_method grading_scheme),
-      default: %w(chooser_table_columns),
-      pagination: %w(default_per_page students_per_page changes_per_page),
-      output_formats: %w(spreadsheets printables documents),
-      names: %w(names)
-    }
-
-    def self.save_presets(params)
-      ActiveRecord::Base.transaction do
-        params.each do |preset|
-          send(:set, preset[0], preset[1])
-        end
-      end
-    end
-
-    def self.method_missing(method, *args, &block)
-      return send method, *args, &block if self.respond_to? method
-
-      method_name = method.to_s
-      if method_name =~ /=/
-        return set method_name.gsub('=', ''), args.first
-
-      elsif method_name =~ /^.*_per_page$/
-        if get(method_name)
-          return get method_name
-        else
-          return get 'default_per_page' # default_per_page
-        end
-
-      else
-        return get method_name
-      end
-    end
-
-    private
-
-    def self.set(key, value)
-      preset = Preset.where(name: key).first_or_initialize
-      preset.update_attribute(:content, value.to_yaml)
+    store_accessor :pagination
+    store_accessor :person
+    store_accessor :student, :increment_foreign_id_code, :last_foreign_id_code
+    store_accessor :address
+    store_accessor :export_formats
+
+    store_accessor :chooser_fields,
+                      :show_name,
+                      :show_middle_name,
+                      :show_surname,
+                      :show_birth_date,
+                      :show_gender,
+                      :show_user,
+                      :show_code,
+                      :show_foreign_id_code,
+                      :show_enrollment_status,
+                      :show_class_name,
+                      :show_specialty,
+                      :show_admitted,
+                      :show_graduated,
+                      :show_primary_address,
+                      :show_primary_contact,
+                      :show_primary_email,
+                      :show_personal_information
+
+    store_accessor :grading
+
+    def self.default
+      where(default: true).first
     end
 
-    def self.get(key)
-      preset =  Preset.where(name: key).first
-      preset.nil? ? nil : YAML.load(preset.content)
+    def self.active
+      where(active: true).first
     end
 
-    def self.load_or_create(presets)
-      @presets = Preset.where(name: presets)
-      if presets.count == @presets.length
-        @presets
-      else
-        presets.each do |preset|
-          Preset.where(name: preset).first_or_create
-        end
-        @presets = Preset.where(name: presets)
-      end
+    def self.per_page(key)
+      active.pagination[key.to_s].to_i unless active.nil?
     end
 
-    def self.load_presets_hash(presets)
-      presets_hash = {}
-      @presets = Preset.where(name: presets)
-      @presets.each do |preset|
-        presets_hash[preset.name.to_sym] = YAML.load(preset.content) rescue nil
-      end
-      presets_hash
+    def self.address(key)
+      active.address[key.to_s] unless active.nil?
     end
 
   end

data/app/models/gaku/program.rb

@@ -13,6 +13,7 @@ module Gaku
     belongs_to :school
 
     validates :name, :school, presence: true
+    validates :name, uniqueness: true
 
     accepts_nested_attributes_for :program_levels,
                                   :program_specialties,