gaku_core 0.1.1 → 0.2.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/controllers/gaku/core_controller.rb +3 -8
- data/app/decorators/gaku/course_decorator.rb +1 -2
- data/app/decorators/gaku/guardian_decorator.rb +1 -1
- data/app/decorators/gaku/person_decorator.rb +8 -12
- data/app/decorators/gaku/student_decorator.rb +0 -2
- data/app/decorators/gaku/teacher_decorator.rb +1 -1
- data/app/models/concerns/addresses.rb +6 -6
- data/app/models/concerns/contacts.rb +6 -6
- data/app/models/concerns/enrollmentable.rb +9 -0
- data/app/models/concerns/gradable.rb +14 -0
- data/app/models/concerns/notes.rb +1 -2
- data/app/models/concerns/pagination.rb +1 -2
- data/app/models/concerns/person.rb +0 -2
- data/app/models/concerns/picture.rb +1 -3
- data/app/models/concerns/semesterable.rb +12 -0
- data/app/models/concerns/student_reviewable.rb +7 -0
- data/app/models/gaku/ability.rb +2 -4
- data/app/models/gaku/address.rb +11 -10
- data/app/models/gaku/admin_ability.rb +0 -1
- data/app/models/gaku/assignment.rb +0 -2
- data/app/models/gaku/assignment_score.rb +0 -1
- data/app/models/gaku/attachment.rb +1 -4
- data/app/models/gaku/attendance.rb +0 -2
- data/app/models/gaku/attendance_type.rb +0 -2
- data/app/models/gaku/badge.rb +0 -2
- data/app/models/gaku/badge_type.rb +0 -1
- data/app/models/gaku/class_group.rb +13 -13
- data/app/models/gaku/commute_method_type.rb +0 -2
- data/app/models/gaku/contact.rb +6 -36
- data/app/models/gaku/contact_type.rb +0 -2
- data/app/models/gaku/country.rb +0 -3
- data/app/models/gaku/course.rb +11 -25
- data/app/models/gaku/course_group.rb +0 -2
- data/app/models/gaku/course_group_enrollment.rb +3 -4
- data/app/models/gaku/department.rb +0 -2
- data/app/models/gaku/enrollment.rb +85 -0
- data/app/models/gaku/enrollment_status.rb +0 -2
- data/app/models/gaku/exam.rb +17 -22
- data/app/models/gaku/exam_portion.rb +2 -6
- data/app/models/gaku/exam_portion_score.rb +0 -2
- data/app/models/gaku/exam_schedule.rb +0 -1
- data/app/models/gaku/exam_session.rb +14 -0
- data/app/models/gaku/exam_syllabus.rb +2 -6
- data/app/models/gaku/external_school_record.rb +1 -9
- data/app/models/gaku/extracurricular_activity.rb +1 -2
- data/app/models/gaku/faculty.rb +0 -2
- data/app/models/gaku/grading_method.rb +14 -2
- data/app/models/gaku/grading_method_connector.rb +35 -0
- data/app/models/gaku/grading_method_set.rb +6 -4
- data/app/models/gaku/grading_method_set_item.rb +4 -5
- data/app/models/gaku/guardian.rb +1 -3
- data/app/models/gaku/install.rb +0 -2
- data/app/models/gaku/lesson.rb +0 -1
- data/app/models/gaku/lesson_plan.rb +0 -2
- data/app/models/gaku/level.rb +0 -2
- data/app/models/gaku/preset.rb +18 -18
- data/app/models/gaku/program.rb +0 -2
- data/app/models/gaku/program_level.rb +0 -2
- data/app/models/gaku/program_specialty.rb +0 -2
- data/app/models/gaku/program_syllabus.rb +0 -2
- data/app/models/gaku/role.rb +0 -2
- data/app/models/gaku/schedule.rb +0 -1
- data/app/models/gaku/scholarship_status.rb +0 -2
- data/app/models/gaku/school.rb +0 -2
- data/app/models/gaku/school_role.rb +0 -2
- data/app/models/gaku/school_year.rb +4 -2
- data/app/models/gaku/semester.rb +21 -6
- data/app/models/gaku/semester_attendance.rb +14 -0
- data/app/models/gaku/semester_connector.rb +27 -0
- data/app/models/gaku/simple_grade.rb +0 -2
- data/app/models/gaku/simple_grade_type.rb +0 -1
- data/app/models/gaku/specialty.rb +0 -2
- data/app/models/gaku/state.rb +0 -3
- data/app/models/gaku/student.rb +47 -45
- data/app/models/gaku/student_exam_session.rb +11 -0
- data/app/models/gaku/student_guardian.rb +0 -2
- data/app/models/gaku/student_review.rb +11 -0
- data/app/models/gaku/student_review_category.rb +13 -0
- data/app/models/gaku/student_specialty.rb +2 -5
- data/app/models/gaku/syllabus.rb +0 -4
- data/app/models/gaku/teacher.rb +0 -2
- data/app/models/gaku/template.rb +7 -9
- data/app/models/gaku/user.rb +10 -22
- data/app/models/gaku/user_role.rb +0 -2
- data/app/services/gaku/contact_creation.rb +49 -0
- data/app/services/gaku/contact_updation.rb +41 -0
- data/app/services/gaku/student_selection.rb +57 -0
- data/app/services/gaku/user_creator.rb +31 -0
- data/config/initializers/devise.rb +1 -1
- data/config/initializers/redis.rb +5 -0
- data/config/locales/en.yml +79 -15
- data/config/routes.rb +5 -10
- data/db/default/gaku/attendance_types.rb +14 -16
- data/db/default/gaku/commute_method_types.rb +2 -4
- data/db/default/gaku/enrollment_status.rb +3 -3
- data/db/default/gaku/master_school.rb +7 -6
- data/db/default/gaku/presets.rb +6 -9
- data/db/default/gaku/scholarship_statuses.rb +1 -1
- data/db/migrate/20140128141752_change_grading_methods_arguments_field.rb +5 -0
- data/db/migrate/20140213113405_create_grading_method_connectors_table.rb +9 -0
- data/db/migrate/20140304094422_create_gaku_exam_sessions_table.rb +10 -0
- data/db/migrate/20140304101025_create_gaku_student_exam_session_table.rb +8 -0
- data/db/migrate/20140325073941_add_time_format_24_to_presets_table.rb +5 -0
- data/db/migrate/20140408111314_remove_semester_join_tables.rb +6 -0
- data/db/migrate/20140408111358_create_semester_connectors_table.rb +8 -0
- data/db/migrate/20140423093155_create_enrollments_table.rb +11 -0
- data/db/migrate/20140423100114_clean_enrollments_join_models.rb +8 -0
- data/db/migrate/20140429112725_add_counters_to_enrollmentable.rb +11 -0
- data/db/migrate/20140604104210_rename_method_to_grading_method.rb +5 -0
- data/db/migrate/20140604113045_add_default_value_to_curved.rb +5 -0
- data/db/migrate/20140610091053_add_seat_number_to_enrollments.rb +5 -0
- data/db/migrate/20140701104700_change_hstore_to_string_criteria.rb +5 -0
- data/db/migrate/20140715135152_create_semester_attendance_table.rb +16 -0
- data/db/migrate/20140718105226_create_student_review_categories_table.rb +13 -0
- data/db/migrate/20140728121353_create_student_review_table.rb +12 -0
- data/db/seeds.rb +1 -1
- data/lib/gaku/core.rb +2 -1
- data/lib/gaku/core/engine.rb +7 -5
- data/lib/gaku/core/url_helpers.rb +1 -1
- data/lib/gaku/grading/collection/base_method.rb +30 -0
- data/lib/gaku/grading/collection/calculations.rb +36 -0
- data/lib/gaku/grading/collection/interval.rb +55 -0
- data/lib/gaku/grading/collection/ordinal.rb +10 -0
- data/lib/gaku/grading/collection/percentage.rb +10 -0
- data/lib/gaku/grading/collection/result.rb +18 -0
- data/lib/gaku/grading/collection/score.rb +10 -0
- data/lib/gaku/grading/single/base_method.rb +30 -0
- data/lib/gaku/grading/single/calculations.rb +42 -0
- data/lib/gaku/grading/single/interval.rb +7 -0
- data/lib/gaku/grading/single/ordinal.rb +30 -0
- data/lib/gaku/grading/single/pass_fail.rb +2 -0
- data/lib/gaku/grading/single/percentage.rb +26 -0
- data/lib/gaku/grading/single/ratio.rb +2 -0
- data/lib/gaku/grading/single/result.rb +18 -0
- data/lib/gaku/grading/single/score.rb +15 -0
- data/lib/gaku/migrations.rb +1 -1
- data/lib/gaku/streamer/sse.rb +5 -5
- data/lib/gaku/testing/auth_helpers.rb +6 -2
- data/lib/gaku/testing/common_rake.rb +9 -3
- data/lib/gaku/testing/controller_helpers.rb +17 -12
- data/lib/gaku/testing/coverage.rb +1 -1
- data/lib/gaku/testing/deferred_garbage_collection.rb +3 -3
- data/lib/gaku/testing/factories/attachment_factory.rb +0 -1
- data/lib/gaku/testing/factories/attendance_type_factory.rb +1 -1
- data/lib/gaku/testing/factories/class_group_factory.rb +12 -1
- data/lib/gaku/testing/factories/contact_creation_factory.rb +18 -0
- data/lib/gaku/testing/factories/course_enrollment_factory.rb +9 -9
- data/lib/gaku/testing/factories/course_factory.rb +2 -4
- data/lib/gaku/testing/factories/course_group_factory.rb +2 -4
- data/lib/gaku/testing/factories/enrollment_factory.rb +10 -0
- data/lib/gaku/testing/factories/exam_factory.rb +1 -1
- data/lib/gaku/testing/factories/exam_portion_factory.rb +2 -4
- data/lib/gaku/testing/factories/exam_score_factory.rb +1 -1
- data/lib/gaku/testing/factories/exam_session_factory.rb +14 -0
- data/lib/gaku/testing/factories/extracurricular_activity_factory.rb +1 -1
- data/lib/gaku/testing/factories/grading_method_connector_factory.rb +11 -0
- data/lib/gaku/testing/factories/grading_method_factory.rb +3 -2
- data/lib/gaku/testing/factories/guardian_factory.rb +2 -4
- data/lib/gaku/testing/factories/lesson_plan_factory.rb +2 -2
- data/lib/gaku/testing/factories/preset_factory.rb +7 -7
- data/lib/gaku/testing/factories/program_factory.rb +0 -1
- data/lib/gaku/testing/factories/school_factory.rb +3 -3
- data/lib/gaku/testing/factories/semester_attendance_factory.rb +8 -0
- data/lib/gaku/testing/factories/semester_connectors_factory.rb +11 -0
- data/lib/gaku/testing/factories/semester_factory.rb +16 -0
- data/lib/gaku/testing/factories/simple_grade_type_factory.rb +1 -1
- data/lib/gaku/testing/factories/state_factory.rb +2 -1
- data/lib/gaku/testing/factories/student_exam_session_factory.rb +8 -0
- data/lib/gaku/testing/factories/student_factory.rb +15 -5
- data/lib/gaku/testing/factories/student_review_category_factory.rb +7 -0
- data/lib/gaku/testing/factories/student_review_factory.rb +13 -0
- data/lib/gaku/testing/factories/teacher_factory.rb +1 -1
- data/lib/gaku/testing/factories/template_factory.rb +5 -7
- data/lib/gaku/testing/factories/traits.rb +32 -4
- data/lib/gaku/testing/factories/user_factory.rb +0 -1
- data/lib/gaku_core.rb +1 -1
- data/lib/generators/gaku/dummy/dummy_generator.rb +5 -4
- data/lib/generators/gaku/install/install_generator.rb +16 -14
- data/lib/tasks/admin_user.rake +2 -1
- metadata +310 -264
- data/app/models/gaku/class_group_course_enrollment.rb +0 -17
- data/app/models/gaku/class_group_enrollment.rb +0 -31
- data/app/models/gaku/course_enrollment.rb +0 -23
- data/app/models/gaku/disposal.rb +0 -45
- data/app/models/gaku/extracurricular_activity_enrollment.rb +0 -15
- data/app/models/gaku/semester_class_group.rb +0 -21
- data/app/models/gaku/semester_course.rb +0 -21
- data/lib/gaku/grading/calculations.rb +0 -279
- data/lib/gaku/grading/grade.rb +0 -17
- data/lib/gaku/grading/japanese_hs_standard.rb +0 -8
- data/lib/gaku/testing/factories/class_group_course_enrollment_factory.rb +0 -8
- data/lib/gaku/testing/factories/class_group_enrollment_factory.rb +0 -9
- data/lib/gaku/testing/factories/semester_class_group_factory.rb +0 -8
- data/lib/gaku/testing/factories/semester_course.rb +0 -8
@@ -1,6 +1,5 @@
|
|
1
1
|
module Gaku
|
2
2
|
class ExamSyllabus < ActiveRecord::Base
|
3
|
-
|
4
3
|
belongs_to :syllabus, counter_cache: :exams_count
|
5
4
|
belongs_to :exam
|
6
5
|
|
@@ -8,10 +7,7 @@ module Gaku
|
|
8
7
|
|
9
8
|
validates :syllabus_id,
|
10
9
|
presence: true,
|
11
|
-
uniqueness: {
|
12
|
-
|
13
|
-
message: I18n.t(:'exam.already_added')
|
14
|
-
}
|
15
|
-
|
10
|
+
uniqueness: { scope: :exam_id,
|
11
|
+
message: I18n.t(:'exam.already_added') }
|
16
12
|
end
|
17
13
|
end
|
@@ -3,17 +3,10 @@ module Gaku
|
|
3
3
|
belongs_to :school
|
4
4
|
belongs_to :student, counter_cache: :external_school_records_count
|
5
5
|
|
6
|
-
# has_many :simple_grades,
|
7
|
-
# -> { where("school_id = #{school_id} AND student_id = #{student_id}") },
|
8
|
-
# class_name: 'Gaku::SimpleGrade',
|
9
|
-
# dependent: :destroy
|
10
|
-
|
11
6
|
validates :school, :student, presence: true
|
12
7
|
|
13
8
|
def attendance_rate
|
14
|
-
if units_values_present?
|
15
|
-
(presence_days.to_f / total_units) * 100
|
16
|
-
end
|
9
|
+
(presence_days.to_f / total_units) * 100 if units_values_present?
|
17
10
|
end
|
18
11
|
|
19
12
|
def presence_days
|
@@ -25,6 +18,5 @@ module Gaku
|
|
25
18
|
def units_values_present?
|
26
19
|
units_absent.present? && total_units.present?
|
27
20
|
end
|
28
|
-
|
29
21
|
end
|
30
22
|
end
|
@@ -1,8 +1,7 @@
|
|
1
1
|
module Gaku
|
2
2
|
class ExtracurricularActivity < ActiveRecord::Base
|
3
3
|
|
4
|
-
|
5
|
-
has_many :students, through: :enrollments
|
4
|
+
include Enrollmentable
|
6
5
|
|
7
6
|
validates :name, presence: true, uniqueness: true
|
8
7
|
|
data/app/models/gaku/faculty.rb
CHANGED
@@ -1,19 +1,31 @@
|
|
1
1
|
module Gaku
|
2
2
|
class GradingMethod < ActiveRecord::Base
|
3
|
-
|
4
3
|
has_one :exam
|
5
4
|
has_one :exam_portion
|
6
5
|
has_one :assignment
|
7
6
|
has_many :simple_grade_types
|
8
7
|
|
8
|
+
has_many :grading_method_connectors
|
9
|
+
|
9
10
|
has_many :grading_method_set_items
|
10
11
|
has_many :grading_method_sets, through: :grading_method_set_items
|
11
12
|
|
12
13
|
validates :name, presence: true, uniqueness: true
|
13
14
|
|
15
|
+
Types = %w( score percentage ordinal interval )
|
16
|
+
|
17
|
+
validates :grading_type, presence: true, inclusion: { in: Types }
|
18
|
+
|
19
|
+
serialize :criteria, Hash
|
20
|
+
|
21
|
+
Types.each do |type|
|
22
|
+
define_method "#{type}?" do
|
23
|
+
grading_type == type
|
24
|
+
end
|
25
|
+
end
|
26
|
+
|
14
27
|
def to_s
|
15
28
|
name
|
16
29
|
end
|
17
|
-
|
18
30
|
end
|
19
31
|
end
|
@@ -0,0 +1,35 @@
|
|
1
|
+
module Gaku
|
2
|
+
class GradingMethodConnector < ActiveRecord::Base
|
3
|
+
belongs_to :grading_method
|
4
|
+
belongs_to :gradable, polymorphic: true
|
5
|
+
|
6
|
+
validates :grading_method_id, :gradable_id, :gradable_type, presence: true
|
7
|
+
|
8
|
+
validates(
|
9
|
+
:gradable_type,
|
10
|
+
inclusion: {
|
11
|
+
in: %w(Gaku::Exam Gaku::Course),
|
12
|
+
message: '%value is not a valid'
|
13
|
+
}
|
14
|
+
)
|
15
|
+
|
16
|
+
validates :grading_method_id, uniqueness: { scope: [:gradable_type, :gradable_id] }
|
17
|
+
|
18
|
+
default_scope { order('position ASC') }
|
19
|
+
|
20
|
+
before_create :proper_position
|
21
|
+
after_destroy :refresh_positions
|
22
|
+
|
23
|
+
private
|
24
|
+
|
25
|
+
def proper_position
|
26
|
+
self.position = gradable.grading_method_connectors.count if gradable
|
27
|
+
end
|
28
|
+
|
29
|
+
def refresh_positions
|
30
|
+
gradable.grading_method_connectors.each_with_index do |id, index|
|
31
|
+
gradable.grading_method_connectors.where(id: id).update_all(position: index)
|
32
|
+
end
|
33
|
+
end
|
34
|
+
end
|
35
|
+
end
|
@@ -1,6 +1,5 @@
|
|
1
1
|
module Gaku
|
2
2
|
class GradingMethodSet < ActiveRecord::Base
|
3
|
-
|
4
3
|
has_many :grading_method_set_items, -> { order(:position) }
|
5
4
|
has_many :grading_methods, through: :grading_method_set_items
|
6
5
|
|
@@ -8,8 +7,12 @@ module Gaku
|
|
8
7
|
|
9
8
|
before_save :ensure_first_is_primary, on: :create
|
10
9
|
|
10
|
+
def self.primary
|
11
|
+
where(primary: true).first
|
12
|
+
end
|
13
|
+
|
11
14
|
def make_primary
|
12
|
-
GradingMethodSet.where.not(id: id).update_all(
|
15
|
+
GradingMethodSet.where.not(id: id).update_all(primary: false)
|
13
16
|
update_attribute(:primary, true)
|
14
17
|
end
|
15
18
|
|
@@ -24,8 +27,7 @@ module Gaku
|
|
24
27
|
end
|
25
28
|
|
26
29
|
def update_items_positions(id, index)
|
27
|
-
grading_method_set_items.update_all(
|
30
|
+
grading_method_set_items.update_all({ position: index }, { id: id })
|
28
31
|
end
|
29
|
-
|
30
32
|
end
|
31
33
|
end
|
@@ -7,9 +7,9 @@ module Gaku
|
|
7
7
|
|
8
8
|
validates :grading_method_id,
|
9
9
|
uniqueness: {
|
10
|
-
|
11
|
-
|
12
|
-
|
10
|
+
scope: :grading_method_set_id,
|
11
|
+
message: I18n.t(:'grading_method_set_item.already')
|
12
|
+
}
|
13
13
|
|
14
14
|
before_create :proper_position
|
15
15
|
after_destroy :refresh_positions
|
@@ -24,9 +24,8 @@ module Gaku
|
|
24
24
|
def refresh_positions
|
25
25
|
items = grading_method_set.grading_method_set_items
|
26
26
|
items.pluck(:id).each_with_index do |id, index|
|
27
|
-
items.update_all(
|
27
|
+
items.update_all(position: index, id: id)
|
28
28
|
end
|
29
29
|
end
|
30
|
-
|
31
30
|
end
|
32
31
|
end
|
data/app/models/gaku/guardian.rb
CHANGED
@@ -1,13 +1,12 @@
|
|
1
1
|
module Gaku
|
2
2
|
class Guardian < ActiveRecord::Base
|
3
|
-
|
4
3
|
include Person, Addresses, Contacts, Picture
|
5
4
|
|
6
5
|
belongs_to :user
|
7
6
|
has_many :student_guardians, dependent: :destroy
|
8
7
|
has_many :students, through: :student_guardians
|
9
8
|
|
10
|
-
after_create
|
9
|
+
after_create :reset_student_count
|
11
10
|
after_destroy :reset_student_count
|
12
11
|
|
13
12
|
private
|
@@ -17,6 +16,5 @@ module Gaku
|
|
17
16
|
Student.reset_counters(s.id, :guardians)
|
18
17
|
end
|
19
18
|
end
|
20
|
-
|
21
19
|
end
|
22
20
|
end
|
data/app/models/gaku/install.rb
CHANGED
data/app/models/gaku/lesson.rb
CHANGED
data/app/models/gaku/level.rb
CHANGED
data/app/models/gaku/preset.rb
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
module Gaku
|
2
2
|
class Preset < ActiveRecord::Base
|
3
|
-
|
3
|
+
store_accessor :time_format_24
|
4
4
|
store_accessor :pagination
|
5
5
|
store_accessor :person
|
6
6
|
store_accessor :student, :increment_foreign_id_code, :last_foreign_id_code
|
@@ -8,23 +8,23 @@ module Gaku
|
|
8
8
|
store_accessor :export_formats
|
9
9
|
|
10
10
|
store_accessor :chooser_fields,
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
11
|
+
:show_name,
|
12
|
+
:show_middle_name,
|
13
|
+
:show_surname,
|
14
|
+
:show_birth_date,
|
15
|
+
:show_gender,
|
16
|
+
:show_user,
|
17
|
+
:show_code,
|
18
|
+
:show_foreign_id_code,
|
19
|
+
:show_enrollment_status,
|
20
|
+
:show_class_name,
|
21
|
+
:show_specialty,
|
22
|
+
:show_admitted,
|
23
|
+
:show_graduated,
|
24
|
+
:show_primary_address,
|
25
|
+
:show_primary_contact,
|
26
|
+
:show_primary_email,
|
27
|
+
:show_personal_information
|
28
28
|
|
29
29
|
store_accessor :grading
|
30
30
|
|
data/app/models/gaku/program.rb
CHANGED
data/app/models/gaku/role.rb
CHANGED
data/app/models/gaku/schedule.rb
CHANGED
data/app/models/gaku/school.rb
CHANGED