gaku_core 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14faad0cf0f85f1e88fd5c68b66340052d1965d9
-  data.tar.gz: 2f51003756ab6cba95b33d8633bd4af029977bb2
+  metadata.gz: b8ec2a924579efe2c5e618e4ebf79066ffd3bc19
+  data.tar.gz: dd6421683b81443905db7df3b1ea9bfd43acc09b
 SHA512:
-  metadata.gz: f80add224aa2321f0aca9615ac847994831072983da47a050c7fba7f783bb094ee7fc8cd785ab95a7b0d3f5b5acd182269799dc26fe2a21798b2e11f39e5c17c
-  data.tar.gz: 273ec20c3a8fc976c82ecc392507581d234b6bc41e774aed271f8e15ccf240c4d79d78e69770438f3b0530c63cf9bed7b81104e7cee284c480c89fa816c8a92f
+  metadata.gz: 43e5b0dfef9b6856697da0fc162ce9948ff44534d0eddcde86bff31bf46a2aed4c941a7e79c96a532187f08e8abe6ab6467122dee914ea4a9587dc036afeaf7d
+  data.tar.gz: 5126158bc5f912f6f5e716fa53f3c6eec2c4d4dd9efd91e1bb9b5a65f96fd4f4488f4bde7b04d931eec3a9a58c3a302127f40ae2c9cbcd508e6ff97fe57e6611

data/app/controllers/gaku/admin/departments_controller.rb

@@ -0,0 +1,55 @@
+module Gaku
+  class Admin::DepartmentsController < Admin::BaseController
+
+    #load_and_authorize_resource class: Department
+
+    respond_to :js,   only: %i( new create edit update destroy )
+    respond_to :html, only: :index
+
+    before_action :set_department, only: %i( edit update destroy )
+
+    def index
+      @departments = Department.all
+      @count = Department.count
+      respond_with @departments
+    end
+
+    def new
+      @department = Department.new
+      respond_with @department
+    end
+
+    def create
+      @department = Department.new(department_params)
+      @department.save
+      @count = Department.count
+      respond_with @department
+    end
+
+    def edit
+    end
+
+    def update
+      @department.update(department_params)
+      respond_with @department
+    end
+
+    def destroy
+      @department.destroy
+      @count = Department.count
+      respond_with @department
+    end
+
+    private
+
+    def set_department
+      @department = Department.find(params[:id])
+    end
+
+    def department_params
+      params.require(:department).permit(:name)
+    end
+
+
+  end
+end

data/app/controllers/gaku/admin/disposals_controller.rb

@@ -8,74 +8,47 @@ module Gaku
     end
 
     def students
-      @students = Student.deleted
-                         .page(params[:page])
-                         .per(Preset.default_per_page)
+      @students = Disposal.students.page(params[:page])
     end
 
     def teachers
-      @teachers = Teacher.deleted
-                         .page(params[:page])
-                         .per(Preset.default_per_page)
+      @teachers = Disposal.teachers.page(params[:page])
     end
 
     def guardians
-      @guardians = Guardian.deleted
-                           .page(params[:page])
-                           .per(Preset.default_per_page)
+      @guardians = Disposal.guardians.page(params[:page])
     end
 
     def exams
-      @exams = Exam.deleted
-                   .page(params[:page])
-                   .per(Preset.default_per_page)
+      @exams = Disposal.exams.page(params[:page])
     end
 
     def course_groups
-      @course_groups = CourseGroup.deleted
-                                  .page(params[:page])
-                                  .per(Preset.default_per_page)
+      @course_groups = Disposal.course_groups.page(params[:page])
     end
 
     def attachments
-      @attachments = Attachment.includes(:attachable)
-                               .deleted
-                               .page(params[:page])
-                               .per(Preset.default_per_page)
+      @attachments = Disposal.attachments.page(params[:page])
+
     end
 
     def addresses
-      @student_addresses = Address.includes(:addressable, :country)
-                                  .deleted
-                                  .students
-                                  .page(params[:page])
-                                  .per(Preset.default_per_page)
-
-      @teacher_addresses = Address.includes(:addressable, :country)
-                                  .deleted
-                                  .teachers
-                                  .page(params[:page])
-                                  .per(Preset.default_per_page)
-
-      @students_count = Address.deleted.students.count
-      @teachers_count = Address.deleted.teachers.count
+      @student_addresses = Disposal.student_addresses.page(params[:page])
+      @teacher_addresses = Disposal.teacher_addresses.page(params[:page])
+      set_student_and_teacher_count('Gaku::Address')
     end
 
     def contacts
-      @student_contacts = Contact.includes(:contactable, :contact_type)
-                                 .deleted
-                                 .students
-                                 .page(params[:page])
-                                 .per(Preset.default_per_page)
+      @student_contacts = Disposal.student_contacts.page(params[:page])
+      @teacher_contacts = Disposal.teacher_contacts.page(params[:page])
+      set_student_and_teacher_count('Gaku::Contact')
+    end
 
-      @teacher_contacts = Contact.includes(:contactable, :contact_type)
-                                 .deleted
-                                 .teachers
-                                 .page(params[:page]).
-                                 per(Preset.default_per_page)
+    private
 
-      @students_count = Contact.deleted.students.count
-      @teachers_count = Contact.deleted.teachers.count
+    def set_student_and_teacher_count(klass)
+      @students_count = klass.constantize.deleted.students.count
+      @teachers_count = klass.constantize.deleted.teachers.count
     end
 
   end

data/app/controllers/gaku/exams_controller.rb

@@ -131,9 +131,9 @@ module Gaku
 
     def find_exams
       if params[:id] != nil
-        @exams = Exam.find_all_by_id(params[:id])
+        @exams = Exam.where(id: params[:id])
       else
-        @exams = @course.syllabus.exams.all
+        @exams = @course.syllabus.exams
       end
     end
   end

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

@@ -37,7 +37,7 @@ module Gaku
     end
 
     def load_data
-      @grading_methods = GradingMethod.all.map { |s| [s.name, s.id] }
+      @grading_methods = GradingMethod.pluck(:name, :id)
     end
 
     def syllabus
@@ -45,7 +45,7 @@ module Gaku
     end
 
     def exam_syllabus
-      @exam_syllabus = ExamSyllabus.find_by_exam_id_and_syllabus_id(params[:id], params[:syllabus_id])
+      @exam_syllabus = ExamSyllabus.find_by(exam_id: params[:id], syllabus_id: params[:syllabus_id])
     end
 
 

data/app/helpers/gaku/gaku_helper.rb

@@ -5,6 +5,13 @@ module Gaku
     include TranslationsHelper
     include FlashHelper
 
+    def tr_for(resource, &block)
+      content_tag :tr, id: "#{resource.class.to_s.demodulize.underscore.dasherize}-#{resource.id}" do
+        block.call
+      end
+    end
+
+
     def current_parent_controller
       controller.controller_path.split('/').second
     end

data/app/helpers/gaku/translations_helper.rb

@@ -177,5 +177,9 @@ module Gaku
       t(:'template.list')
     end
 
+    def t_department_list
+      t(:'department.list')
+    end
+
   end
 end

data/app/models/gaku/address.rb

@@ -18,7 +18,7 @@ module Gaku
 
     default_scope -> { where(deleted: false) }
 
-    validates :address1, :country_id, :city, presence: true
+    validates :address1, :country, :city, presence: true
 
     accepts_nested_attributes_for :country
 

data/app/models/gaku/department.rb

@@ -0,0 +1,13 @@
+module Gaku
+  class Department < ActiveRecord::Base
+
+    translates :name
+
+    validates :name, presence: true, uniqueness: true
+
+    def to_s
+      name
+    end
+
+  end
+end

data/app/models/gaku/disposal.rb

@@ -0,0 +1,45 @@
+module Gaku
+  class Disposal
+
+    def self.students
+      Student.deleted
+    end
+
+    def self.teachers
+      Teacher.deleted
+    end
+
+    def self.guardians
+      Guardian.deleted
+    end
+
+    def self.exams
+      Exam.deleted
+    end
+
+    def self.course_groups
+      CourseGroup.deleted
+    end
+
+    def self.attachments
+      Attachment.includes(:attachable).deleted
+    end
+
+    def self.student_addresses
+      Address.includes(:addressable, :country).deleted.students
+    end
+
+    def self.teacher_addresses
+      Address.includes(:addressable, :country).deleted.teachers
+    end
+
+    def self.student_contacts
+      Contact.includes(:contactable, :contact_type).deleted.students
+    end
+
+    def self.teacher_contacts
+      Contact.includes(:contactable, :contact_type).deleted.teachers
+    end
+
+  end
+end

data/app/models/gaku/exam_portion.rb

@@ -78,7 +78,7 @@ module Gaku
     def refresh_positions
       exam_portions = exam.exam_portions
       exam_portions.pluck(:id).each_with_index do |id, index|
-        exam_portions.update_all({position: index}, {id: id})
+        exam_portions.where(id: id).update_all(position: index)
       end
     end
 

data/app/models/gaku/student.rb

@@ -78,11 +78,11 @@ module Gaku
     end
 
     def set_scholarship_status
-      self.scholarship_status = ScholarshipStatus.find_by_default(true)
+      self.scholarship_status = ScholarshipStatus.find_by(default: true)
     end
 
     def active
-      enrollment_status = EnrollmentStatus.find_by_code(enrollment_status_code)
+      enrollment_status = EnrollmentStatus.find_by(code: enrollment_status_code)
       if enrollment_status
         enrollment_status.active?
       else

data/app/models/gaku/user.rb

@@ -33,7 +33,7 @@ module Gaku
     end
 
     def role?(role)
-      !!self.roles.find_by_name(role.to_s.camelize)
+      !!self.roles.find_by(name: role.to_s.camelize)
     end
 
     private

data/app/models/gaku/versioning/student_version.rb

@@ -21,9 +21,9 @@ module Gaku::Versioning
         when 'enrollment_status_code'
           enrollment_status_code_change(key0, key1)
         when 'commute_method_type_id'
-          commute_method_change(key0, key1)
+          common_change('CommuteMethodType', key0, key1)
         when 'scholarship_status_id'
-          scholarship_status_change(key0, key1)
+          common_change('ScholarshipStatus', key0, key1)
         else
           @human_changes[key] = [key0, key1]
         end
@@ -38,16 +38,11 @@ module Gaku::Versioning
       @human_changes[:enrollment_status] = [from, to]
     end
 
-    def commute_method_change(key0, key1)
-      from = Gaku::CommuteMethodType.find(key0).to_s if key0
-      to = Gaku::CommuteMethodType.find(key1).to_s if key1
-      @human_changes[:commute_method_type] = [from, to]
-    end
-
-    def scholarship_status_change(key0, key1)
-      from = Gaku::ScholarshipStatus.find(key0).to_s if key0
-      to = Gaku::ScholarshipStatus.find(key1).to_s if key1
-      @human_changes[:scholarship_status] = [from, to]
+    def common_change(klass_name, key0, key1)
+      klass = "Gaku::#{klass_name}".constantize
+      from = klass.find(key0).to_s if key0
+      to = klass.find(key1).to_s if key1
+      @human_changes[klass_name.underscore.to_sym] = [from, to]
     end
 
   end

data/app/views/gaku/admin/departments/_department.html.slim

@@ -0,0 +1,2 @@
+=tr_for department do
+  = render 'table_fields', department: department

data/app/views/gaku/admin/departments/_form.html.slim

@@ -0,0 +1,3 @@
+= remote_form_for [:admin, @department] do |f|
+  = render 'form_fields', f: f
+  = buttons_for @department, nested_id: 'admin-department'

data/app/views/gaku/admin/departments/_form_fields.html.slim

@@ -0,0 +1 @@
+= f.text_field :name,          label: t(:'department.name')

data/app/views/gaku/admin/departments/_modal.html.slim

@@ -0,0 +1,6 @@
+= modal_for 'edit-department-modal' do
+  = modal_header t(:'department.edit')
+  = modal_form_for [:admin, @department] do |f|
+    = modal_body do
+      = render 'form_fields', f: f
+      = modal_buttons_for @department, nested_id: 'admin-department'

data/app/views/gaku/admin/departments/_table_fields.html.slim

@@ -0,0 +1,5 @@
+td = department.name
+td
+  = ajax_link_to_edit [:edit, :admin, department]
+  = ajax_link_to_delete [:admin, department]
+

data/app/views/gaku/admin/departments/create.js.erb

@@ -0,0 +1,7 @@
+$('#admin-departments-index tbody').append('<%= j render("department", {department: @department}) %>');
+
+$('#new-admin-department').slide();
+$('#new-admin-department-link').show();
+
+$('.admin-departments-count').html('<%= print_count(@count, t_department_list) %>');
+showNotice("<%= render_flash %>");

data/app/views/gaku/admin/departments/destroy.js.erb

@@ -0,0 +1,2 @@
+$('.admin-departments-count').html('<%= print_count(@count, t_department_list) %>');
+showNotice("<%= render_flash %>");

data/app/views/gaku/admin/departments/edit.js.erb

@@ -0,0 +1,3 @@
+$('#modal-dialogs').html('<%= j render("modal", {department: @department}) %>');
+$('#edit-department-modal').modal('show');
+$('.remote-form').enableValidations();

data/app/views/gaku/admin/departments/index.html.slim

@@ -0,0 +1,20 @@
+= content_for :index_header do
+  .pull-left
+    = count_div 'admin-departments-count' do
+      = print_count @count, t_department_list
+  .pull-right
+    = ajax_link_to_new t(:'department.add'), [:new, :admin, :department], id: 'new-admin-department-link'
+
+= content_for :new_form do
+  #new-admin-department.hide
+
+#admin-departments
+  = table_for 'admin-departments-index' do
+    thead
+      tr
+        = th t(:'department.name')
+
+        = th_actions 2
+    tbody
+      = render partial: 'gaku/admin/departments/department', collection: @departments, as: :department
+

data/app/views/gaku/admin/departments/new.js.erb

@@ -0,0 +1,3 @@
+$('#new-admin-department').html('<%= j render("form") %>').slide();
+$('#new-admin-department-link').hide();
+$('.remote-form').enableValidations();

data/app/views/gaku/admin/departments/update.js.erb

@@ -0,0 +1,4 @@
+$('tr#department-<%= @department.id %>').html('<%= j render("table_fields", {department: @department}) %>');
+$("#edit-department-modal").modal("hide");
+showNotice("<%= render_flash %>");
+

data/app/views/gaku/shared/menu/_admin.html.erb

@@ -10,6 +10,7 @@
     <li data-hook="specialties"><%= link_to t('menu.admin.specialties'), admin_specialties_path %></li>
     <li data-hook="achievement"><%= link_to t('menu.admin.achievements'), admin_achievements_path %></li>
     <li data-hook="template"><%= link_to t('menu.admin.templates'), admin_templates_path %></li>
+    <li data-hook="deparment"><%= link_to t('menu.admin.departments'), admin_departments_path %></li>
 
     <li class="dropdown-submenu" data-hook="grading_sub_menu">
       <a tabindex='-1' href='#'><%= t('menu.admin.grading.grading') %></a>

data/app/views/gaku/students/index.html.slim

@@ -6,7 +6,7 @@
       = print_count @count, t(:'student.list')
   .pull-right
     = ajax_link_to_new t(:'student.new'), new_student_path, id: "new-student-link"
-    = link_to_import t(:'import'), importer_index_path, id: "import-students-link"
+    = render 'gaku/shared/overrides/students/import_link'
 
 = content_for :new_form do
   #new-student.hide

data/app/views/gaku/syllabuses/index.html.slim

@@ -6,7 +6,7 @@
       = print_count @count, t_syllabus_list
   .pull-right
     = ajax_link_to_new t(:'syllabus.new'), [:new, :syllabus], id: "new-syllabus-link"
-    = button t(:'syllabus.import'), "syllabuses/importer", id: "import-syllabuses-link"
+    = render 'gaku/shared/overrides/syllabuses/import_link'
 
 = content_for :new_form do
   #new-syllabus.hide

data/config/initializers/active_record.rb

@@ -19,7 +19,7 @@ class ActiveRecord::Associations::HasManyThroughAssociation
   def delete_records(records, method)
     ensure_not_nested
 
-    scope = through_association.scoped.where(construct_join_attributes(*records))
+    scope = through_association.scope.where(construct_join_attributes(*records))
 
     case method
     when :destroy

data/config/locales/en.yml

@@ -245,6 +245,13 @@ en:
     singular: Course Group
   course_group_enrollment:
     save: Save to Course Group
+  department:
+    singular: Department
+    add: Add department
+    list: Departments list
+    name: Department name
+    edit: Edit department
+    save: Save department
   date:
     formats:
       default: '%Y-%m-%d'
@@ -538,6 +545,7 @@ en:
         student_addresses: Student Addresses
         student_contacts: Student Contacts
         students: Students
+      departments: Departments
       disposals:
         address: Addresses Disposals
         attachment: Attachment Disposals

data/config/routes.rb

@@ -1,7 +1,5 @@
 Gaku::Core::Engine.routes.draw do
 
-  mount Sidekiq::Web => '/sidekiq'
-
   concern :addressable do
     resources :addresses do
       member do
@@ -124,7 +122,6 @@ Gaku::Core::Engine.routes.draw do
     resources :exams, controller: 'syllabuses/exams'
     resources :exam_syllabuses, controller: 'syllabuses/exam_syllabuses'
     resources :notes
-    resources :importer, controller: 'syllabuses/importer'
   end
 
   resources :teachers, concerns: %i( addressable contactable ) do
@@ -150,12 +147,7 @@ Gaku::Core::Engine.routes.draw do
       get 'page/:page', action: :index
       get :load_autocomplete_data
 
-      resources :importer, controller: 'students/importer' do
-        collection do
-          get :get_roster
-          get :get_registration_roster
-        end
-      end
+
     end
 
     resources :simple_grades, controller: 'students/simple_grades'
@@ -230,6 +222,7 @@ Gaku::Core::Engine.routes.draw do
     resources :contact_types
     resources :enrollment_statuses
     resources :attendance_types
+    resources :departments
     resources :users do
       get 'page/:page', action: :index, on: :collection
     end

data/db/default/gaku/attendance_types.rb

@@ -1,6 +1,7 @@
 types = [
   {
     name: 'Present',
+    name_ja: 'Japanese Present',
     color_code: '#006e54',
     counted_absent: false,
     disable_credit: false,
@@ -10,6 +11,7 @@ types = [
 
   {
     name: 'Present for Credit',
+    name_ja: 'Japanese Present for Credit',
     color_code: '#00a497',
     counted_absent: false,
     disable_credit: false,
@@ -19,6 +21,7 @@ types = [
 
   {
     name: 'Excused',
+    name_ja: 'Japanese Excused',
     color_code: '#2c4f54',
     counted_absent: false,
     disable_credit: false,
@@ -28,6 +31,7 @@ types = [
 
   {
     name: 'Illness',
+    name_ja: 'Japanese Illness',
     color_code: '#4d4398',
     counted_absent: true,
     disable_credit: false,
@@ -37,6 +41,7 @@ types = [
 
   {
     name: 'Injury',
+    name: 'Japanese Injury',
     color_code: '#c85179',
     counted_absent: true,
     disable_credit: false,
@@ -46,6 +51,7 @@ types = [
 
   {
     name: 'Mourning',
+    name_ja: 'Japanese Mourning',
     color_code: '#7d7d7d',
     counted_absent: true,
     disable_credit: false,
@@ -55,6 +61,7 @@ types = [
 
   {
     name: 'Absent',
+    name_ja: 'Japanese Absent',
     color_code: '#e60033',
     counted_absent: true,
     disable_credit: true,
@@ -62,16 +69,19 @@ types = [
     auto_credit: false
   }
 ]
-japanese_attendance_types = ['Japanese Present', 'Japanese Present for Credit',
-                             'Japanese Excused', 'Japanese Illness',
-                             'Japanese Injury', 'Japanese Mourning',
-                             'Japanese Absent'
-                            ]
 
-types.each_with_index do |type, index|
+
+types.each do |type|
   I18n.locale = :en
-  attendance_type = Gaku::AttendanceType.where(type).first_or_create!
+  attendance_type = Gaku::AttendanceType.create!(
+                                                  name:           type[:name],
+                                                  color_code:     type[:color_code],
+                                                  counted_absent: type[:counted_absent],
+                                                  disable_credit: type[:disable_credit],
+                                                  credit_rate:    type[:credit_rate],
+                                                  auto_credit:    type[:auto_credit]
+                                                )
 
   I18n.locale = :ja
-  attendance_type.update_attributes(name: japanese_attendance_types[index])
+  attendance_type.update_attributes(name: type[:name_ja])
 end