gaku_frontend 0.1.1 → 0.2.0

data/app/controllers/gaku/student_selection_controller.rb

@@ -0,0 +1,58 @@
+module Gaku
+  class StudentSelectionController < GakuController
+
+    respond_to :js,             only: %i( index add remove clear )
+    before_action :user_selection
+    before_action :set_student, only: %i( add remove )
+    before_action :set_students, only: %i( collection remove_collection )
+
+    def add
+      @selection = @user_selection.add(@student)
+      respond_with @selection
+    end
+
+    def remove
+      @selection = @user_selection.remove(@student)
+      set_count
+      respond_with @selection
+    end
+
+    def collection
+      @selection = @user_selection.collection(@students)
+      render 'index'
+    end
+
+    def remove_collection
+      @selection = @user_selection.remove_collection(@students)
+      render 'index'
+    end
+
+    def index
+      @selection = @user_selection.students
+    end
+
+    def clear
+      @selection = @user_selection.remove_all
+      respond_with @selection
+    end
+
+    private
+
+    def set_student
+      @student = Student.find(params[:id])
+    end
+
+    def set_students
+      @students = Student.where(id: params[:student_ids])
+    end
+
+    def set_count
+      @count = @selection.count
+    end
+
+    def user_selection
+      @user_selection = Gaku::StudentSelection.new(current_user)
+    end
+
+  end
+end

data/app/controllers/gaku/students/badges_controller.rb

@@ -1,4 +1,4 @@
-[module Gaku
+module Gaku
   class Students::BadgesController < GakuController
 
     respond_to :js, only: %i( new create edit update destroy index )
@@ -19,6 +19,7 @@
     end
 
     def edit
+      respond_with @badge
     end
 
     def update
@@ -62,4 +63,3 @@
 
   end
 end
-]

data/app/controllers/gaku/students/class_group_enrollments_controller.rb

@@ -1,45 +1,53 @@
 module Gaku
   class Students::ClassGroupEnrollmentsController < GakuController
 
-    respond_to :js, only: %i( new create destroy )
+    respond_to :js, only: %i( index new create destroy )
 
-    before_action :student, only: %i( new create )
-    before_action :set_class_groups, only: :new
+    before_action :set_student
+    before_action :load_data
 
     def new
-      @class_group_enrollment = ClassGroupEnrollment.new
+      @class_group_enrollment = @student.class_group_enrollments.build
+      respond_with @class_group_enrollment
     end
 
     def create
-      @class_group_enrollment = ClassGroupEnrollment.new(class_group_enrollment_params)
-      @class_group_enrollment.save
-      flash.now[:notice] = t(:'notice.enrolled', resource: t(:'student.singular'), to: t(:'class_group.singular'))
+      @class_group_enrollment = @student.class_group_enrollments.create(enrollment_params)
+      set_count
       respond_with @class_group_enrollment
     end
 
+    def index
+      @class_group_enrollments = @student.class_group_enrollments
+    end
+
     def destroy
-      @class_group_enrollment.destroy
+      @class_group_enrollment = Gaku::Enrollment.find(params[:id])
+      @class_group_enrollment.destroy!
       set_count
-      render nothing: true
+      respond_with @class_group_enrollment
     end
 
     private
 
-    def attributes
-      %i( class_group_id seat_number student_id )
+    def enrollment_params
+      params.require(:enrollment).permit(enrollment_attr)
     end
 
-    def class_group_enrollment_params
-      params.require(:class_group_enrollment).permit(attributes)
+    def enrollment_attr
+      %i( enrollmentable_id )
     end
 
     def set_student
-      @student = Student.find(params[:student_id])
+      @student = Student.find(params[:student_id]).decorate
     end
 
-    def set_class_groups
-      @class_groups = ClassGroup.all
+    def set_count
+      @count = @student.reload.class_groups_count
     end
 
+    def load_data
+      @class_groups = Gaku::ClassGroup.all
+    end
   end
 end

data/app/controllers/gaku/students/course_enrollments_controller.rb

@@ -1,51 +1,53 @@
 module Gaku
   class Students::CourseEnrollmentsController < GakuController
 
-    respond_to :js, only: %i( new create destroy )
+    respond_to :js, only: %i( index new create destroy )
 
     before_action :set_student
+    before_action :load_data
 
     def new
-      set_courses
-      @course_enrollment = CourseEnrollment.new
+      @course_enrollment = @student.course_enrollments.build
       respond_with @course_enrollment
     end
 
     def create
-      @course_enrollment = CourseEnrollment.new(course_enrollment_params)
-      if @course_enrollment.save
-        set_count
-        respond_with @course_enrollment
-      else
-        set_count
-        render :error
-      end
+      @course_enrollment = @student.course_enrollments.create(enrollment_params)
+      set_count
+      respond_with @course_enrollment
+    end
+
+    def index
+      @course_enrollments = @student.course_enrollments
     end
 
     def destroy
-      @course_enrollment = CourseEnrollment.find(params[:id])
-      @course_enrollment.destroy
+      @course_enrollment = Gaku::Enrollment.find(params[:id])
+      @course_enrollment.destroy!
       set_count
       respond_with @course_enrollment
     end
 
     private
 
-    def course_enrollment_params
-      params.require(:course_enrollment).permit([:course_id, :student_id])
+    def enrollment_params
+      params.require(:enrollment).permit(enrollment_attr)
     end
 
-    def set_student
-      @student = Student.find(params[:student_id])
+    def enrollment_attr
+      %i( enrollmentable_id )
     end
 
-    def set_courses
-      @courses = Course.includes(:syllabus).decorate
+    def set_student
+      @student = Student.find(params[:student_id]).decorate
     end
 
     def set_count
       @count = @student.reload.courses_count
     end
 
+    def load_data
+      @courses = Gaku::Course.all
+    end
   end
 end

data/app/controllers/gaku/students/external_school_records_controller.rb

@@ -5,7 +5,7 @@ module Gaku
 
     before_action :set_student
     before_action :set_schools, only: %i( new edit )
-    before_action :set_external_school_record, only: %i( edit update )
+    before_action :set_external_school_record, only: %i( edit update destroy )
 
     def new
       @external_school_record = ExternalSchoolRecord.new
@@ -13,17 +13,11 @@ module Gaku
     end
 
     def create
-      @external_school_record = ExternalSchoolRecord.new(external_school_record_params)
-      if @external_school_record.save
-        set_count
-        respond_with @external_school_record
-      else
-        set_count
-        render :new
-      end
+      @external_school_record = ExternalSchoolRecord.create(external_school_record_params)
+      set_count
+      respond_with @external_school_record
     end
 
-
     def edit
       respond_with @external_school_record
     end
@@ -34,7 +28,6 @@ module Gaku
     end
 
     def destroy
-      @external_school_record = ExternalSchoolRecord.find(params[:id])
       @external_school_record.destroy
       set_count
       respond_with @external_school_record
@@ -47,7 +40,7 @@ module Gaku
     end
 
     def external_school_record_attr
-      %i( school_id student_id beginning ending units_absent total_units)
+      %i( school_id student_id student_id_number beginning ending units_absent total_units )
     end
 
     def set_student

data/app/controllers/gaku/students/extracurricular_activity_enrollments_controller.rb

@@ -0,0 +1,53 @@
+module Gaku
+  class Students::ExtracurricularActivityEnrollmentsController < GakuController
+
+    respond_to :js, only: %i( index new create destroy )
+
+    before_action :set_student
+    before_action :load_data
+
+    def new
+      @extracurricular_activity_enrollment = @student.extracurricular_activity_enrollments.build
+      respond_with @extracurricular_activity_enrollment
+    end
+
+    def create
+      @extracurricular_activity_enrollment = @student.extracurricular_activity_enrollments.create(enrollment_params)
+      set_count
+      respond_with @extracurricular_activity_enrollment
+    end
+
+    def index
+      @extracurricular_activity_enrollments = @student.extracurricular_activity_enrollments
+    end
+
+    def destroy
+      @extracurricular_activity_enrollment = Gaku::Enrollment.find(params[:id])
+      @extracurricular_activity_enrollment.destroy!
+      set_count
+      respond_with @extracurricular_activity_enrollment
+    end
+
+    private
+
+    def enrollment_params
+      params.require(:enrollment).permit(enrollment_attr)
+    end
+
+    def enrollment_attr
+      %i( enrollmentable_id )
+    end
+
+    def set_student
+      @student = Student.find(params[:student_id]).decorate
+    end
+
+    def set_count
+      @count = @student.reload.extracurricular_activities_count
+    end
+
+    def load_data
+      @extracurricular_activities = Gaku::ExtracurricularActivity.all
+    end
+  end
+end

data/app/controllers/gaku/students/simple_grades_controller.rb

@@ -5,7 +5,7 @@ module Gaku
 
     before_action :student
     before_action :set_simple_grade_types, only: %i( new edit )
-    before_action :set_simple_grade, only: %i( edit update destroy )
+    before_action :set_simple_grade,       only: %i( edit update destroy )
 
     def new
       @simple_grade = SimpleGrade.new

data/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