gaku 0.1.1 → 0.2.0

data/frontend/app/controllers/gaku/students_controller.rb

@@ -1,10 +1,9 @@
 module Gaku
   class StudentsController < GakuController
+    include PictureController
 
     decorates_assigned :student
 
-    helper_method :sort_column, :sort_direction
-
     respond_to :html, :js
 
     before_action :load_data,             only: %i( new edit )
@@ -15,7 +14,7 @@ module Gaku
     def new
       @enrolled_status = EnrollmentStatus.where(code: 'enrolled').first_or_create!
       @last_student = Student.last
-
+      # raise @last_student.try(:class_groups).try(:last).try(:id).inspect
       @student = Student.new
       if @last_student
         @student.admitted = @last_student.admitted
@@ -23,13 +22,15 @@ module Gaku
       else
         @student.enrollment_status_code = @enrolled_status.code
       end
-      @student.class_group_enrollments.new
       respond_with @student
     end
 
     def create
       @student = Student.new(student_params)
       if @student.save
+        if params[:student][:enrollments]
+          @student.class_group_enrollments.create(enrollmentable_id: params[:student][:enrollments][:enrollmentable_id])
+        end
         @count = Student.count
         respond_with @student, location: [:edit, @student]
       else
@@ -43,14 +44,6 @@ module Gaku
 
     def chosen
       set_selected_students
-      set_class_groups
-      set_courses
-      @extracurricular_activity = ExtracurricularActivity.find(params[:extracurricular_activity_id]) if params[:extracurricular_activity_id]
-      @class_group = ClassGroup.find(params[:class_group_id]) if params[:class_group_id]
-
-      @enrolled_students = params[:enrolled_students]
-      @search = Student.active.search(params[:q])
-      @students = @search.result(distinct: true)
     end
 
     def clear_search
@@ -67,25 +60,26 @@ module Gaku
     end
 
     def search
-      if session[:q] != params[:q] && !params[:q].nil?
-        session[:q] = params[:q]
-      end
+      session[:q] = params[:q] if session[:q] != params[:q] && params[:q]
 
       if session[:q]
-        if session[:q][:graduated_gteq]  || session[:q][:graduated_lteq] || session[:q][:admitted_gteq] || session[:q][:admitted_lteq]
+
+        search_unscoped = search_unscoped_params.any? { |k| session[:q].key?(k) }
+        if search_unscoped == true
           @search = Student.includes(index_includes).search(session[:q])
         else
           @search = Student.includes(index_includes).active.search(session[:q])
         end
 
-        if session[:q][:birth_date_gteq]  || session[:q][:birth_date_lteq] || session[:q][:age_gteq] ||session[:q][:age_lteq]
+        sort_by_age = sort_age_params.any? { |k| session[:q].key?(k) }
+        if sort_by_age == true
           @search.sorts = 'birth_date desc'
         else
           @search.sorts = 'created_at desc'
         end
 
       else
-        @search = Student.includes(index_includes).active.search(session[:q])
+        @search = Student.includes(index_includes).active.search(params[:q])
       end
 
       results = @search.result(distinct: true)
@@ -114,19 +108,17 @@ module Gaku
       respond_with @student, location: [:edit, @student]
     end
 
-
     private
 
-
     def student_params
       params.require(:student).permit(attributes)
     end
 
     def attributes
-      [ :name, :surname, :name_reading, :surname_reading, :birth_date,
-          :gender, :scholarship_status_id,
-          :enrollment_status_code, :commute_method_type_id, :admitted,
-          :graduated, :picture, class_group_enrollments_attributes: [:id, :class_group_id] ]
+      [:name, :surname, :name_reading, :surname_reading, :birth_date,
+       :gender, :scholarship_status_id,
+       :enrollment_status_code, :commute_method_type_id, :admitted,
+       :graduated, :picture]
     end
 
     def includes
@@ -134,7 +126,19 @@ module Gaku
     end
 
     def index_includes
-      [:enrollment_status, :user]
+      [:enrollment_status, :user, :primary_address, :primary_contact]
+    end
+
+    def search_unscoped_params
+      %w(
+        graduated_gteq graduated_lteq
+        admitted_gteq admitted_lteq
+        enrollment_status_code_eq
+        )
+    end
+
+    def sort_age_params
+      %w( birth_date_gteq birth_date_lteq age_gteq age_lteq )
     end
 
     def set_preset
@@ -142,23 +146,15 @@ module Gaku
     end
 
     def set_enrollment_statuses
-      @enrollment_statuses = EnrollmentStatus.all.includes(:translations).collect{|p| [p.name, p.code]}
+      @enrollment_statuses = EnrollmentStatus.all.includes(:translations).map { |p| [p.name, p.code] }
     end
 
     def set_countries
       @countries = Country.all
     end
 
-    def set_class_groups
-      @class_groups = ClassGroup.all
-    end
-
-    def set_courses
-      @courses = Course.all
-    end
-
     def load_data
-      @class_groups = ClassGroup.all
+      @class_groups = ClassGroup.for_select
       @enrollment_statuses = EnrollmentStatus.includes(:translations)
       @scholarship_statuses = ScholarshipStatus.includes(:translations)
       @commute_method_types = CommuteMethodType.includes(:translations)
@@ -182,17 +178,5 @@ module Gaku
       set_notable
     end
 
-    def sort_column
-      Student.column_names.include?(params[:sort]) ? params[:sort] : 'surname'
-    end
-
-    def sort_direction
-      if %w[asc desc].include?(params[:direction])
-        params[:direction]
-      else
-        'asc'
-       end
-    end
-
   end
 end

data/frontend/app/controllers/gaku/syllabuses/exam_syllabuses_controller.rb

@@ -5,11 +5,16 @@ module Gaku
 
     before_action :set_syllabus
 
+    def new
+      @exam_syllabus = ExamSyllabus.new
+      respond_with @exam_syllabus
+    end
+
     def create
       @exam_syllabus = ExamSyllabus.new(exam_syllabus_params)
       @exam_syllabus.save
       set_count
-      flash[:now] = t(:'notice.added', resource: t(:'exam.singular'))
+      #flash[:notice] = t(:'notice.added', resource: t(:'exam.singular'))
       respond_with @exam_syllabus
     end
 

data/frontend/app/controllers/gaku/syllabuses/exams_controller.rb

@@ -44,7 +44,9 @@ module Gaku
     end
 
     def attributes
-      [:name, :description, :adjustments, :grading_method_id, exam_portions_attributes: [:id, :name, :weight, :problem_count, :max_score, :description, :adjustments]]
+      [:name, :description, :adjustments, :grading_method_id,
+       exam_portions_attributes: [:id, :name, :weight, :problem_count, :max_score, :description, :adjustments]
+      ]
     end
 
     def set_exam
@@ -63,6 +65,5 @@ module Gaku
       @exams_count = @syllabus.reload.exams_count
     end
 
-
   end
 end

data/frontend/app/controllers/gaku/syllabuses_controller.rb

@@ -1,8 +1,6 @@
 module Gaku
   class SyllabusesController < GakuController
 
-    # respond_to :js,   only: %i( new create destroy recovery )
-    # respond_to :html, only: %i( index edit update soft_delete show_deleted )
     respond_to :html, :js
 
     before_action :set_syllabus, only: %i( edit update destroy )
@@ -21,7 +19,7 @@ module Gaku
     end
 
     def index
-      @syllabuses = Syllabus.all
+      @syllabuses = Syllabus.includes(:department).all
       set_count
       respond_with @syllabuses
     end
@@ -33,7 +31,7 @@ module Gaku
 
     def update
       @syllabus.update(syllabus_params)
-      respond_with @syllabus, location: [:edit, @syllabus]
+      respond_with @syllabus
     end
 
     def destroy

data/frontend/app/controllers/gaku/teachers_controller.rb

@@ -1,13 +1,12 @@
 module Gaku
   class TeachersController < GakuController
+    include PictureController
 
     decorates_assigned :teacher
 
-    #respond_to :js,   only: %i( new create destroy )
-    #respond_to :html, only: %i( index edit update show )
     respond_to :html, :js
 
-    before_action :set_teacher,          only: %i( edit show update destroy )
+    before_action :set_teacher, only: %i( edit show update destroy )
 
     def destroy
       @teacher.destroy
@@ -50,6 +49,10 @@ module Gaku
 
     private
 
+    def includes
+      [[contacts: :contact_type, addresses: :country]]
+    end
+
     def teacher_params
       params.require(:teacher).permit(attributes)
     end
@@ -59,7 +62,7 @@ module Gaku
     end
 
     def set_teacher
-      @teacher = Teacher.find(params[:id])
+      @teacher = Teacher.includes(includes).find(params[:id])
       set_notable
     end
 

data/frontend/app/helpers/gaku/autocomplete_helper.rb

@@ -22,7 +22,7 @@ module Gaku::AutocompleteHelper
       concat form.select(
         options[:object_name],
         options[:collection],
-        {prompt: options[:prompt], selected: options[:selected]},
+        { prompt: options[:prompt], selected: options[:selected] },
         class: 'form-control input-sm'
       )
     end

data/frontend/app/helpers/gaku/exam_helper.rb

@@ -10,4 +10,4 @@ module Gaku
       "#{t(:'exam.completion')}:#{percentage} #{t(:'exam.graded')}:#{total - ungraded} #{t(:'exam.ungraded')}:#{ungraded} #{t(:'exam.total')}:#{total}"
     end
   end
-end
+end

data/frontend/app/helpers/gaku/frontend_helper.rb

@@ -8,12 +8,19 @@ module Gaku
     include Gaku::StudentChooserHelper
     include Gaku::StudentsHelper
 
+    def badge_count(count, text, css_class)
+      if count != 0
+        "#{text}<span class='badge pull-right #{css_class}'>#{count}</span>".html_safe
+      else
+        "#{text}<span class='badge pull-right #{css_class}'></span>".html_safe
+      end
+    end
 
     def ajax_link_to_search(text, resource, options = {})
       name = ("<span class='glyphicon glyphicon-search'></span> " + text).html_safe
       attributes = {
-        :remote => true,
-        :class => "btn btn-primary"
+        remote: true,
+        class: 'btn btn-primary'
       }.merge(options)
       link_to name, resource, attributes
     end
@@ -23,20 +30,29 @@ module Gaku
       [nested_resource, address].flatten
     end
 
-
     def show_field?(field)
-      ActiveRecord::ConnectionAdapters::Column.value_to_boolean(field.to_i)
+      ActiveRecord::Type::Boolean.new.type_cast_from_database(field.to_i)
     end
 
-
     def prepare_resource_name(nested_resources, resource)
-      @resource_name = [nested_resources.map {|r| r.is_a?(Symbol) ? r.to_s : get_class(r) }, resource.to_s].flatten.join '-'
+      @resource_name = [nested_resources.map { |r| r.is_a?(Symbol) ? r.to_s : get_class(r) }, resource.to_s].flatten.join '-'
     end
 
     def extract_grouped(grouped, resource)
       grouped.map(&resource.to_sym)
     end
 
+    def sort_handler
+      content_tag :td, class: 'sort-handler' do
+        content_tag :i, nil, class: 'glyphicon glyphicon-move'
+      end
+    end
+
+    def sortable_tbody(path, &block)
+      content_tag(:tbody, class: 'sortable', data: { 'sort-url' => url_for(path) }) do
+        block.call
+      end
+    end
 
   end
-end
+end

data/frontend/app/helpers/gaku/person_helper.rb

@@ -15,8 +15,8 @@ module Gaku
 
     def name_and_ruby_for(person)
       name_elements = [
-        {word: person.surname,  reading: person.surname_reading},
-        {word: person.name,     reading: person.name_reading}
+        { word: person.surname,  reading: person.surname_reading },
+        { word: person.name,     reading: person.name_reading }
       ]
 
       name_elements.map do |element|
@@ -25,13 +25,13 @@ module Gaku
             content_tag(:rb) do
               element[:word]
             end,
-            content_tag(:rp, "( "),
+            content_tag(:rp, '( '),
             content_tag(:rt) do
               element[:reading]
             end,
-            content_tag(:rp, " )"),
+            content_tag(:rp, ' )'),
             unless name_elements.last == element
-              " "
+              ' '
             end
           ].join.html_safe
         end
@@ -56,9 +56,8 @@ module Gaku
     def student_names(student, options = {})
       @names_preset ||= Gaku::Preset.names
       reading = options[:reading]
-      if @names_preset.blank?
-        return reading ? student.surname : student.name
-      end
+      return reading ? student.surname : student.names if @names_preset.blank?
+
       result = @names_preset.gsub(/%(\w+)/) do |name|
         case name
         when '%first' then proper_name(student, :name, reading)

data/frontend/app/helpers/gaku/shared_helper.rb

@@ -2,11 +2,7 @@ module Gaku
   module SharedHelper
 
     def can_edit?
-      if controller.action_name.include?('edit')
-        true
-      else
-        false
-      end
+      action_name.include? 'edit'
     end
 
     def genders
@@ -26,4 +22,4 @@ module Gaku
     end
 
   end
-end
+end

data/frontend/app/helpers/gaku/students_helper.rb

@@ -1,24 +1,22 @@
 module Gaku
   module StudentsHelper
 
-
     def surname_reading_label
-      t(:phonetic_reading) + ' ('+t(:surname)+')'
+      t(:phonetic_reading) + ' (' + t(:surname) + ')'
     end
 
     def name_reading_label
-      t(:phonetic_reading) + ' ('+t(:name)+')'
+      t(:phonetic_reading) + ' (' + t(:name) + ')'
     end
 
     def surname_label
-      t(:name)+' ('+t(:surname)+')'
+      t(:name) + ' (' + t(:surname) + ')'
     end
 
     def name_label
-      t(:name)+' ('+t(:name)+')'
+      t(:name) + ' (' + t(:name) + ')'
     end
 
-
     def guardian_icon
       content_tag :span, nil, class: 'glyphicon glyphicon-user'
     end

data/frontend/app/overrides/frontend_menu.rb

@@ -1,6 +1,6 @@
-Deface::Override.new(:virtual_path => "gaku/shared/menu/_global",
-                     :name => "frontend_menu",
-                     :insert_top => "[data-hook='menu']",
-                     :partial => "gaku/shared/menu/frontend",
-                     :disabled => false
-                     )
+Deface::Override.new(virtual_path: 'gaku/shared/menu/_global',
+                     name: 'frontend_menu',
+                     insert_top: "[data-hook='menu']",
+                     partial: 'gaku/shared/menu/frontend',
+                     disabled: false
+                     )