gaku_core 0.3.0.pre.0 → 0.3.0.pre.1

data/config/locales/pt-BR.yml

@@ -49,8 +49,8 @@ pt-BR:
     zipcode: CEP
   admitted: Admitido Em
   alert:
-    already_added: '%{resource} já foram adicionados!'
-    empty: '%{resource} está vazio!'
+    already_added: "%{resource} já foram adicionados!"
+    empty: "%{resource} está vazio!"
     not_selected: Nenhum %{resource} selecionado!
   and: e
   are_you_sure: Você tem certeza?
@@ -240,7 +240,7 @@ pt-BR:
     already_enrolled: 
     choose: Escolha Curso
     code: Código de Curso
-    code_sample: '[EX: FALL2020]'
+    code_sample: "[EX: FALL2020]"
     combined_code: Código Combinado
     count: Contagem de cursos
     edit: Editar Curso
@@ -452,6 +452,7 @@ pt-BR:
     view: 
     weight: 
   exam_portion:
+    add_option: 
     adjustments: 
     attached_file_count: 
     count: 
@@ -466,7 +467,14 @@ pt-BR:
     name: 
     plural: 
     problem_count: 
+    remove_option: 
     save: 
+    score_selection_options: 
+    score_type:
+      plural: 
+      score: 
+      score_selection: 
+      score_text: 
     show: 
     singular: 
     use_weighting: 

data/config/locales/zh-CN.yml

@@ -1,7 +1,7 @@
 zh-CN:
   academic: 
   achievement:
-    add: 添加成就
+    add: "添加成就"
     authority: 
     badge: 
     choose: 
@@ -452,6 +452,7 @@ zh-CN:
     view: 
     weight: 
   exam_portion:
+    add_option: 
     adjustments: 
     attached_file_count: 
     count: 
@@ -466,7 +467,14 @@ zh-CN:
     name: 
     plural: 
     problem_count: 
+    remove_option: 
     save: 
+    score_selection_options: 
+    score_type:
+      plural: 
+      score: 
+      score_selection: 
+      score_text: 
     show: 
     singular: 
     use_weighting: 

data/config/routes.rb

@@ -1,10 +1,125 @@
 Gaku::Core::Engine.routes.draw do
 
-  devise_for :users,  class_name: 'Gaku::User', module: :devise,
-                      controllers: { sessions: 'gaku/devise/sessions',
-                                     registrations: 'gaku/devise/registrations',
-                                     passwords: 'gaku/devise/passwords'
-                                    }
+  # concerns
+
+  concern :addresses do
+    resources :addresses, concerns: %i( soft_delete primary ), except: %i( show index soft )
+  end
+
+  concern :contacts do
+    resources :contacts, concerns: %i( soft_delete primary )
+  end
+
+  concern :notes do
+    resources :notes
+  end
+
+  concern :soft_delete do
+    patch :recovery,    on: :member
+    patch :soft_delete, on: :member
+  end
+
+  concern(:primary)         { patch :make_primary, on: :member }
+  concern(:show_deleted)    { get :show_deleted, on: :member }
+  concern(:pagination)      { get 'page/:page', action: :index, on: :collection }
+  concern(:sort)            { post :sort, on: :collection }
+  concern(:download)        { get :download, on: :member }
+
+  concern(:enroll_students) { post :enroll_students, on: :collection }
+  concern(:enroll_student)  { post :enroll_student, on: :collection }
+  concern(:student_chooser) { get :student_chooser, on: :member }
+
+  # devise
+  devise_for :users, {
+    class_name: 'Gaku::User',
+    module: :devise,
+    controllers: {
+       sessions: 'gaku/devise/sessions',
+       registrations: 'gaku/devise/registrations',
+       passwords: 'gaku/devise/passwords'
+     }
+  }
+
+  devise_scope :user do
+    get :set_up_admin_account, to: 'devise/registrations#set_up_admin_account'
+    post :create_admin,        to: 'devise/registrations#create_admin'
+  end
+
+  resources :extracurricular_activities, concerns: %i( student_chooser pagination soft_delete show_deleted ) do
+    resources :students,
+      controller: 'extracurricular_activities/students',
+      concerns: %i( enroll_student )
+  end
+
+  resources :class_groups, concerns: %i( notes soft_delete student_chooser ) do
+    resources :semester_class_groups, controller: 'class_groups/semester_class_groups'
+    resources :class_group_course_enrollments, controller: 'class_groups/courses', only: %i( new create destroy )
+    resources :students, controller: 'class_groups/students', only: %i( new destroy ), concerns: %i( enroll_student )
+  end
+
+  resources :courses, concerns: %i( notes student_chooser soft_delete show_deleted ) do
+    resources :semester_courses, controller: 'courses/semester_courses'
+    resources :enrollments, controller: 'courses/enrollments', concerns: %i( enroll_student ) do
+      post :enroll_class_group, on: :collection
+    end
+
+    resources :exams, controller: 'courses/exams' do
+      resources :exam_portion_scores, controller: 'courses/exams/exam_portion_scores' do
+        resources :attendances
+      end
+
+      collection do
+        get :grading
+        get :export
+      end
+
+      member do
+        get :grading
+        put :update_score
+        get :completed
+      end
+    end
+  end
+
+  resources :class_group_enrollments,              concerns: %i( enroll_students )
+  resources :course_enrollments,                   concerns: %i( enroll_students )
+  resources :extracurricular_activity_enrollments, concerns: %i( enroll_students )
+
+  resources :syllabuses, concerns: %i( notes soft_delete show_deleted ) do
+    resources :assignments,     controller: 'syllabuses/assignments'
+    resources :exams,           controller: 'syllabuses/exams'
+    resources :exam_syllabuses, controller: 'syllabuses/exam_syllabuses'
+  end
+
+  resources :teachers, concerns: %i( addresses contacts notes soft_delete show_deleted pagination )
+
+  resources :students, concerns: %i( addresses contacts notes soft_delete show_deleted pagination ) do
+    get :load_autocomplete_data, on: :collection
+
+    resources :simple_grades,        controller: 'students/simple_grades', except: :show
+    resources :commute_methods,      controller: 'students/commute_methods'
+    resources :student_achievements, controller: 'students/student_achievements', except: :show
+    resources :student_specialties,  controller: 'students/student_specialties',  except: :show
+
+    resources :guardians, except: %i( index show ),
+      controller: 'students/guardians',
+      concerns: %i( addresses contacts soft_delete )
+
+    resources :course_enrollments,
+      controller: 'students/course_enrollments',
+      only: %i( new create destroy )
+
+    resources :class_group_enrollments, controller: 'students/class_group_enrollments'
+  end
+
+  resources :exams, concerns: %i( notes soft_delete ) do
+    put :create_exam_portion, on: :member
+
+    resources :exam_scores
+    resources :exam_portions, controller: 'exams/exam_portions', concerns: %i( sort ) do
+      resources :attachments, controller: 'exams/exam_portions/attachments'
+    end
+  end
 
   resources :states, only: :index
 

data/db/migrate/20160209100945_add_score_types_to_exam_portions.rb

@@ -0,0 +1,6 @@
+class AddScoreTypesToExamPortions < ActiveRecord::Migration[4.2]
+  def change
+    add_column :gaku_exam_portions, :score_type, :integer, default: 0
+    add_column :gaku_exam_portions, :score_selection_options, :text, array:true, default: []
+  end
+end

data/db/migrate/20160209104713_add_fields_to_exam_portion_score.rb

@@ -0,0 +1,6 @@
+class AddFieldsToExamPortionScore < ActiveRecord::Migration[4.2]
+  def change
+    add_column :gaku_exam_portion_scores, :score_text, :string
+    add_column :gaku_exam_portion_scores, :score_selection, :string
+  end
+end

data/lib/gaku/grading/single/percentage.rb

@@ -7,9 +7,9 @@ class Gaku::Grading::Single::Percentage < Gaku::Grading::Single::BaseMethod
 
     @scores = []
     @max_score = exam.max_score
-    exam.exam_portions.each_with_index do |exam_portion, index|
-      ep_score = @student.exam_portion_scores.where(gradable: gradable_scope, exam_portion_id: exam_portion.id).first_or_create
-      @scores << ep_score.score if ep_score && ep_score.score
+    exam.exam_portions.select(&:score?).each_with_index do |exam_portion, index|
+      ep_score = @student.exam_portion_scores.find_by(gradable: gradable_scope, exam_portion_id: exam_portion.id)
+      @scores << ep_score.score if ep_score.score
     end
 
     @result = { id: @student.id, score: formated_score }

data/lib/gaku/grading/single/score.rb

@@ -3,9 +3,9 @@ class Gaku::Grading::Single::Score < Gaku::Grading::Single::BaseMethod
   def grade_exam
     @score = nil
     exam = @gradable
-    exam.exam_portions.each_with_index do |exam_portion, index|
-      ep_score = @student.exam_portion_scores.where(gradable: gradable_scope, exam_portion_id: exam_portion.id).first_or_create
-      @score = @score.to_f + ep_score.score if ep_score && ep_score.score
+    exam.exam_portions.select(&:score?).each_with_index do |exam_portion, index|
+      ep_score = @student.exam_portion_scores.find_by(gradable: gradable_scope, exam_portion_id: exam_portion.id)
+      @score = @score.to_f + ep_score.score if ep_score.score
     end
 
     @result = { id: @student.id, score: @score }

data/lib/gaku/testing/factories/exam_portion_factory.rb

@@ -6,7 +6,7 @@ FactoryGirl.define do
     weight 100
     problem_count 1
     exam
-
+    score_type 'score'
     factory(:invalid_exam_portion) { name nil }
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gaku_core
 version: !ruby/object:Gem::Version
-  version: 0.3.0.pre.0
+  version: 0.3.0.pre.1
 platform: ruby
 authors:
 - Rei Kagetsuki
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-25 00:00:00.000000000 Z
+date: 2017-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -309,12 +309,19 @@ files:
 - app/assets/images/tick.png
 - app/assets/images/ui-bg_flat_75_ffffff_40x100.png
 - app/assets/images/up_arrow.gif
+- app/assets/javascripts/gaku/courses.js.coffee
+- app/assets/javascripts/gaku/exams.js.coffee
+- app/assets/stylesheets/gaku/bootstrap_and_theme.css.scss
 - app/controllers/gaku/core_controller.rb
+- app/controllers/gaku/courses/exams/exam_portion_scores_controller.rb
+- app/controllers/gaku/courses/exams_controller.rb
+- app/controllers/gaku/exams_controller.rb
 - app/decorators/gaku/course_decorator.rb
 - app/decorators/gaku/guardian_decorator.rb
 - app/decorators/gaku/person_decorator.rb
 - app/decorators/gaku/student_decorator.rb
 - app/decorators/gaku/teacher_decorator.rb
+- app/helpers/gaku/gaku_helper.rb
 - app/models/application_record.rb
 - app/models/concerns/addresses.rb
 - app/models/concerns/contacts.rb
@@ -403,6 +410,15 @@ files:
 - app/services/gaku/user_creator.rb
 - app/views/gaku/admin/grading_methods/_arguments_form_fields.html.slim
 - app/views/gaku/admin/grading_methods/_arguments_template.html.slim
+- app/views/gaku/admin/grading_methods/_form_fields.html.slim
+- app/views/gaku/courses/_form_fields.html.slim
+- app/views/gaku/courses/exams/exam_portion_scores/update.js.erb
+- app/views/gaku/courses/exams/grading.html.slim
+- app/views/gaku/courses/exams/grading/_calculations.html.slim
+- app/views/gaku/courses/exams/grading/_exam_portion_score_form.htmls.lim
+- app/views/gaku/courses/exams/grading/_exam_scores.html.slim
+- app/views/gaku/courses/exams/grading/_students.html.slim
+- app/views/gaku/layouts/gaku.html.slim
 - app/views/gaku/shared/menu/_global.html.erb
 - config/initializers/active_record.rb
 - config/initializers/devise.rb
@@ -453,6 +469,8 @@ files:
 - db/migrate/20140728121353_create_student_review_table.rb
 - db/migrate/20150213095508_improve_countries_and_states.rb
 - db/migrate/20160125194100_add_gradable_to_exam_portion_score.rb
+- db/migrate/20160209100945_add_score_types_to_exam_portions.rb
+- db/migrate/20160209104713_add_fields_to_exam_portion_score.rb
 - db/migrate/20170509132020_change_enrollmentable_to_enrollable.rb
 - db/schema.rb
 - db/seeds.rb