gaku_frontend 0.1.1 → 0.2.0

data/app/controllers/gaku/exams_controller.rb

@@ -1,8 +1,6 @@
 module Gaku
   class ExamsController < GakuController
 
-    include Gaku::Grading::Calculations
-
     respond_to :html, :js, :json
     respond_to :xls, only: :export
 
@@ -13,17 +11,18 @@ module Gaku
       if params[:course_id]
         @exams = Course.find(params[:course_id]).syllabus.exams
       else
-        @search = Exam.search(params[:q])
+        @search = Exam.includes(:department).search(params[:q])
         results = @search.result(distinct: true)
         @exams = results.page(params[:page])
         @exam = Exam.new
+        @exam_sessions = ExamSession.all
       end
 
       @exam.exam_portions.build
       set_count
       respond_to do |format|
         format.html
-        format.json { render json: @exams.as_json(include: {exam_portions: {include: :exam_portion_scores}})}
+        format.json { render json: @exams.as_json(include: { exam_portions: { include: :exam_portion_scores } }) }
       end
     end
 
@@ -38,8 +37,8 @@ module Gaku
     end
 
     def create
-      @exam = Exam.create(exam_params)
-      @exam.save
+      @exam = Exam.new(exam_params)
+      @exam.use_primary_grading_method_set if @exam.save
       set_count
       respond_with @exam
     end
@@ -63,46 +62,11 @@ module Gaku
       @course = Course.find(params[:course_id])
     end
 
-
-    def grading
-      @course = Course.find(params[:course_id])
-      @students = @course.students #.select("id, surname, name")
-      find_exams
-
-      calculate_totals
-      calculate_exam_averages
-      calculate_deviation
-      calculate_rank_and_grade
-
-      @path_to_exam = course_path(id: params[:course_id])
-
-      #exam_portions need reload to properly include exam_portion_score in as_json
-      @exams.each { |exam| exam.exam_portions.reload }
-
-      respond_to do |format|
-        format.json do render json: {
-          student_total_scores: @student_total_scores.as_json,
-          exams: @exams.as_json(include: {exam_portions: {include: :exam_portion_scores }},root: false),
-          course: @course.as_json(root: false),
-          exam_averages: @exam_averages.as_json(root: false),
-          deviation: @deviation.as_json(root: false),
-          students: @students.to_json(root: false),
-          grades: @grades.as_json(root: false),
-          ranks: @ranks.as_json(root: false),
-          attendances: @student_portion_attendance.as_json(root: true, include: :attendance_type),
-          path_to_exam: @path_to_exam.to_json,
-          completion: @completion
-        }end
-        format.html { render 'gaku/exams/grading' }
-      end
-    end
-
     def completed
       @exam = Exam.find(params[:id])
       @course = Course.find(params[:course_id])
       @students = @course.students
 
-
       respond_with @exam.completed_by_students(@students)
     end
 
@@ -124,18 +88,28 @@ module Gaku
 
     def attributes
       [:name, :department_id, :weight, :description, :adjustments, :use_weighting,
-        exam_portions_attributes: [:id, :name, :weight, :problem_count, :max_score, :description, :adjustments]
+       exam_portions_attributes: [:id, :name, :weight, :problem_count, :max_score, :description, :adjustments]
       ]
     end
 
+    def includes
+      { grading_method_connectors: :grading_method }
+    end
+
     def set_exam
-      @exam = Exam.find(params[:id])
+      @exam = Exam.includes(includes).find(params[:id])
       set_notable
+      set_gradable
     end
 
     def set_notable
       @notable = @exam
-      @notable_resource = @notable.class.to_s.underscore.split('/')[1].gsub('_','-')
+      @notable_resource = @notable.class.to_s.demodulize.underscore.dasherize
+    end
+
+    def set_gradable
+      @gradable = @exam
+      @gradable_resource = @gradable.class.to_s.demodulize.underscore.dasherize
     end
 
     def set_count
@@ -143,7 +117,7 @@ module Gaku
     end
 
     def find_exams
-      if params[:id] != nil
+      if params[:id]
         @exams = Exam.where(id: params[:id])
       else
         @exams = @course.syllabus.exams

data/app/controllers/gaku/extracurricular_activities_controller.rb

@@ -3,8 +3,6 @@ module Gaku
 
     include StudentChooserController
 
-    # respond_to :js,   only: %i( new create destroy recovery student_chooser )
-    # respond_to :html, only: %i( index edit update show show_deleted soft_delete )
     respond_to :html, :js
 
     before_action :set_extracurricular_activity, only: %i( edit show update student_chooser destroy )
@@ -58,6 +56,12 @@ module Gaku
 
     def set_extracurricular_activity
       @extracurricular_activity = ExtracurricularActivity.find(params[:id])
+      set_enrollmentable
+    end
+
+    def set_enrollmentable
+      @enrollmentable = @extracurricular_activity
+      @enrollmentable_resource = @enrollmentable.class.to_s.demodulize.underscore.dasherize
     end
 
     def set_count

data/app/controllers/gaku/gaku_controller.rb

@@ -6,6 +6,8 @@ module Gaku
 
     layout :resolve_layout
 
+    before_action :require_login
+
     def resolve_layout
       case action_name
       when 'index'
@@ -19,5 +21,14 @@ module Gaku
       end
     end
 
+
+    private
+
+    def require_login
+      unless current_user
+        redirect_to new_user_session_path
+      end
+    end
+
   end
 end

data/app/controllers/gaku/grading_method_connectors_controller.rb

@@ -0,0 +1,109 @@
+module Gaku
+  class GradingMethodConnectorsController < Gaku::GakuController
+
+    respond_to :js
+
+    before_action :load_gradable
+    before_action :set_grading_method_connector, only: %i( destroy )
+    before_action :load_data, only: %i( new )
+    before_action :load_sets, only: %i( new_set )
+
+    def index
+
+    end
+
+    def new
+      @grading_method_connector = @gradable.grading_method_connectors.new
+      respond_with @grading_method_connector
+    end
+
+    def create
+      @grading_method_connector = @gradable.grading_method_connectors.create(grading_method_connector_params)
+      set_count
+      respond_with @grading_method_connector
+    end
+
+    def destroy
+      @grading_method_connector.destroy!
+      set_count
+
+      respond_with @grading_method_connector
+    end
+
+    def sort
+      params['grading-method-connector'].each_with_index do |id, index|
+        @gradable.grading_method_connectors.where(id: id).update_all(position: index)
+      end
+
+      render nothing: true
+    end
+
+    def new_set
+      @grading_method_connector = @gradable.grading_method_connectors.new
+      respond_with @grading_method_connectors
+    end
+
+    def add_set
+      if params[:grading_method_set_id].present?
+        add_not_included_grading_methods
+        set_flash
+      end
+      set_count
+      render :add_set
+    end
+
+    private
+
+    def grading_method_connector_params
+      params.require(:grading_method_connector).permit(attrs)
+    end
+
+    def attrs
+      %i( grading_method_id )
+    end
+
+    def load_data
+      @grading_methods = Gaku::GradingMethod.all
+    end
+
+    def load_sets
+      @grading_method_sets = Gaku::GradingMethodSet.all
+    end
+
+    def set_grading_method_connector
+      @grading_method_connector = Gaku::GradingMethodConnector.find(params[:id])
+    end
+
+    def load_gradable
+      resource, id = request.path.split('/')[1, 2]
+      @gradable = resource.insert(0, 'gaku/').pluralize.classify.constantize.find(id)
+      @gradable_resource = @gradable.class.to_s.demodulize.underscore.dasherize
+    end
+
+    def set_count
+      @count = @gradable.grading_method_connectors.count
+    end
+
+    def set_flash
+      flash.now[:notice] = if @grading_method_connectors.any?
+                             t(:'grading_method_connector.add_set')
+                           else
+                             t(:'grading_method_connector.already')
+                           end
+    end
+
+    def add_not_included_grading_methods
+      @grading_method_set = Gaku::GradingMethodSet.find(params[:grading_method_set_id])
+
+      # remove methods that are already in gradable grading methods collection
+      not_included_grading_methods = @grading_method_set.grading_methods - @gradable.grading_methods
+
+      # get join model records for view appending
+      @grading_method_connectors = not_included_grading_methods.map do |method|
+        @gradable.grading_method_connectors.create(grading_method: method)
+      end
+
+    end
+
+  end
+end

data/app/controllers/gaku/{students/guardians_controller.rb → guardians_controller.rb}

@@ -1,12 +1,18 @@
 module Gaku
-  class Students::GuardiansController < GakuController
+  class GuardiansController < GakuController
+    include PictureController
 
-    respond_to :js,   only: %i( new create )
+    respond_to :js,   only: %i( new create edit index )
     respond_to :html, only: %i( edit update destroy )
 
-    before_action :set_student
+    before_action :set_student, except: %i( set_picture remove_picture )
     before_action :set_guardian, only: %i( show edit update destroy )
 
+    def index
+      @guardians = @student.guardians
+      respond_with @guardians
+    end
+
     def new
       @guardian = Guardian.new
       respond_with @guardian
@@ -20,6 +26,7 @@ module Gaku
     end
 
     def edit
+      respond_with @guardian
     end
 
     def update
@@ -30,18 +37,7 @@ module Gaku
     def destroy
       @guardian.destroy
       set_count
-      respond_with @guardian, location: [:edit, @student ]
-    end
-
-    def recovery
-      @guardian.recover
-      respond_with @guardian
-    end
-
-    def soft_delete
-      @guardian.soft_delete
-      set_count
-      respond_with @guardian, location: edit_student_path(@student)
+      respond_with @guardian, location: [:edit, @student]
     end
 
     private

data/app/controllers/gaku/notes_controller.rb

@@ -1,12 +1,17 @@
 module Gaku
   class NotesController < GakuController
 
-    #load_and_authorize_resource :note, class: Gaku::Note
+    # load_and_authorize_resource :note, class: Gaku::Note
 
     before_action :set_notable
     before_action :set_note,    only: %i( edit update destroy show )
     respond_to :js
 
+    def index
+      @notes = @notable.notes
+      respond_with @notes
+    end
+
     def new
       @note = Note.new
       respond_with @note

data/app/controllers/gaku/realtime_controller.rb

@@ -3,26 +3,25 @@ require 'gaku/streamer/sse'
 class Gaku::RealtimeController < ApplicationController
   include ActionController::Live
 
-
-  #change SSE.new with rails SSE object when is released
-  #https://github.com/rails/rails/blob/master/actionpack/lib/action_controller/metal/live.rb
+  # change SSE.new with rails SSE object when is released
+  # https://github.com/rails/rails/blob/master/actionpack/lib/action_controller/metal/live.rb
   def exam_portion_scores
     response.headers['Content-Type'] = 'text/event-stream'
     conn = ActiveRecord::Base.connection
     sse = Streamer::SSE.new(response.stream)
     begin
       loop do
-        conn.execute "LISTEN update_exam_portion_score"
-        conn.raw_connection.wait_for_notify do |event, pid, score|
+        conn.execute 'LISTEN update_exam_portion_score'
+        conn.raw_connection.wait_for_notify do |_event, _pid, score|
           sse.write(score, event: 'update.examPortionScore')
         end
       end
     rescue IOError
       sse.close
-      conn.execute "UNLISTEN update_exam_portion_score"
+      conn.execute 'UNLISTEN update_exam_portion_score'
     ensure
       sse.close
-      conn.execute "UNLISTEN update_exam_portion_score"
+      conn.execute 'UNLISTEN update_exam_portion_score'
     end
   end
 

data/app/controllers/gaku/semester_connectors_controller.rb

@@ -0,0 +1,66 @@
+module Gaku
+  class SemesterConnectorsController < GakuController
+
+    respond_to :js, only: %i( new create edit update destroy )
+
+    before_action :set_semesterable
+    before_action :set_semester_connector, only: %i( edit update destroy)
+    before_action :set_semesters, only: %i( new edit )
+
+    def new
+      @semester_connector = @semesterable.semester_connectors.new
+      respond_with @semester_connector
+    end
+
+    def create
+      @semester_connector = @semesterable.semester_connectors.build(semester_connector_params)
+      @semester_connector.save
+      set_count
+      respond_with @semester_connector
+    end
+
+    def edit
+      respond_with @semester_connector
+    end
+
+    def update
+      @semester_connector.update(semester_connector_params)
+      respond_with @semester_connector
+    end
+
+    def destroy
+      @semester_connector.destroy
+      set_count
+      respond_with @semester_connector
+    end
+
+    private
+
+    def set_semesterable
+      resource, id = request.path.split('/')[1, 2]
+      @semesterable = resource.insert(0, 'gaku/').pluralize.classify.constantize.find(id)
+      @semesterable_resource = @semesterable.class.to_s.demodulize.underscore.dasherize
+    end
+
+    def set_semester_connector
+      @semester_connector = SemesterConnector.find(params[:id])
+    end
+
+    def semester_connector_params
+      params.require(:semester_connector).permit(attributes)
+    end
+
+    def attributes
+      %i( semester_id )
+    end
+
+    def set_count
+      @count = @semesterable.semesters.count
+    end
+
+    def set_semesters
+      @semesters = Semester.all
+    end
+
+  end
+end