gaku_admin 0.1.1 → 0.2.0

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

@@ -1,16 +1,13 @@
 module Gaku
   class Admin::GradingMethodsController < Admin::BaseController
 
-    #load_and_authorize_resource class: GradingMethod
-
-    respond_to :js,   only: %i( new create edit update destroy )
-    respond_to :html, only: :index
+    respond_to :js,   only: %i( new create edit update destroy index )
 
     before_action :set_grading_method, only: %i( edit update destroy )
 
     def index
       @grading_methods = GradingMethod.all
-      @count = GradingMethod.count
+      set_count
       respond_with @grading_methods
     end
 
@@ -22,7 +19,7 @@ module Gaku
     def create
       @grading_method = GradingMethod.new(grading_method_params)
       @grading_method.save
-      @count = GradingMethod.count
+      set_count
       respond_with @grading_method
     end
 
@@ -36,7 +33,7 @@ module Gaku
 
     def destroy
       @grading_method.destroy
-      @count = GradingMethod.count
+      set_count
       respond_with @grading_method
     end
 
@@ -48,12 +45,16 @@ module Gaku
 
     def grading_method_params
       params.require(:grading_method).permit(attributes).tap do |whitelisted|
-        whitelisted['arguments'] = params[:grading_method][:arguments]
+        whitelisted['criteria'] = params[:grading_method][:criteria]
       end
     end
 
     def attributes
-      %i( description method name curved arguments )
+      %i( description grading_type name curved criteria )
+    end
+
+    def set_count
+      @count = GradingMethod.count
     end
 
   end

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

@@ -0,0 +1,11 @@
+module Gaku
+  class Admin::HomeController < Admin::BaseController
+
+    def index
+      @contact_types = ContactType.all
+      @count = ContactType.count
+      respond_with @contact_types
+    end
+
+  end
+end

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

@@ -1,7 +1,7 @@
 module Gaku
   class Admin::PresetsController < Admin::BaseController
 
-    respond_to :html, only: %i( index edit update )
+    respond_to :js,            only: %i( index edit update )
     before_action :set_preset, except: :index
 
     def index
@@ -28,7 +28,7 @@ module Gaku
 
     def preset_attr
       [
-        :name, :default, :active, :locale, :names_order,
+        :name, :default, :active, :locale, :names_order, :time_format_24,
         pagination: pagination_attr,
         grading: grading_attr,
         person: person_attr,
@@ -59,12 +59,10 @@ module Gaku
     end
 
     def chooser_fields_attr
-      %i(
-          show_name show_middle_name show_surname show_birth_date show_gender
+      %i( show_name show_middle_name show_surname show_birth_date show_gender
           show_user show_code show_foreign_id_code show_enrollment_status
           show_admitted show_graduated show_class_name show_specialty
-          show_primary_address show_primary_contact show_primary_email show_personal_information
-        )
+          show_primary_address show_primary_contact show_primary_email show_personal_information )
     end
 
     def set_preset

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

@@ -1,16 +1,13 @@
 module Gaku
   class Admin::RolesController < Admin::BaseController
 
-    #load_and_authorize_resource class: Role
-
-    respond_to :js,   only: %i( new create edit update destroy )
-    respond_to :html, only: :index
+    respond_to :js, only: %i( new create edit update destroy index )
 
     before_action :set_role, only: %i( edit update destroy )
 
     def index
       @roles = Role.all
-      @count = Role.count
+      set_count
       respond_with @roles
     end
 
@@ -22,7 +19,7 @@ module Gaku
     def create
       @role = Role.new(role_params)
       @role.save
-      @count = Role.count
+      set_count
       respond_with @role
     end
 
@@ -36,7 +33,7 @@ module Gaku
 
     def destroy
       @role.destroy
-      @count = Role.count
+      set_count
       respond_with @role
     end
 
@@ -50,5 +47,9 @@ module Gaku
       params.require(:role).permit(:name)
     end
 
+    def set_count
+      @count = Role.count
+    end
+
   end
 end

data/app/controllers/gaku/admin/school_years/semesters_controller.rb

@@ -6,7 +6,6 @@ module Gaku
     before_action :set_school_year
     before_action :set_semester, only: %i( edit update destroy )
 
-
     def new
       @semester = Semester.new
     end

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

@@ -1,10 +1,10 @@
 module Gaku
   class Admin::SchoolYearsController < Admin::BaseController
 
-    respond_to :html, only: %i( index show )
-    respond_to :js, only: %i( new create destroy edit update )
+    respond_to :html, only: %i( edit )
+    respond_to :js,   only: %i( index new create destroy edit update )
 
-    before_action :set_school_year, only: %i( show edit update destroy )
+    before_action :set_school_year, only: %i( edit update destroy )
 
     def index
       @school_years = SchoolYear.all
@@ -23,9 +23,6 @@ module Gaku
       respond_with @school_year
     end
 
-    def show
-    end
-
     def edit
     end
 
@@ -40,7 +37,6 @@ module Gaku
       respond_with @school_year
     end
 
-
     private
 
     def school_year_params

data/app/controllers/gaku/admin/schools/programs_controller.rb

@@ -1,12 +1,19 @@
 module Gaku
   class Admin::Schools::ProgramsController < Admin::BaseController
-    
-    respond_to :js,   only: %i( new create destroy edit update show_program_levels show_program_specialties show_program_syllabuses )
+
+    respond_to :js,   only: %i( index new create destroy edit update
+                                show_program_levels show_program_specialties show_program_syllabuses )
 
     before_action :set_school
-    before_action :set_program, only: %i( show_program_levels show_program_specialties show_program_syllabuses destroy edit show update )
+    before_action :set_program, only: %i( show_program_levels show_program_specialties show_program_syllabuses
+                                          destroy edit show update )
     before_action :load_data,   only: %i( new edit )
 
+    def index
+      @programs = @school.programs
+      respond_with @programs
+    end
+
     def new
       @program = Program.new
       respond_with @program
@@ -50,7 +57,7 @@ module Gaku
     end
 
     def attributes
-      #permit :id for update nested attributes
+      # permit :id for update nested attributes
       [:id, :name, :description,
        { program_specialties_attributes: [:id, :specialty_id, :_destroy] },
        { program_levels_attributes: [:id, :level_id, :_destroy] },

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

@@ -1,84 +1,87 @@
 module Gaku
-  class Admin::SchoolsController < Admin::BaseController
-
-    respond_to :js,   only: %i( new create destroy )
-    respond_to :html, only: %i( index edit edit_master update update_master show show_master )
-
-    before_action :set_school,  only: %i( edit show update destroy )
-    before_action :set_master_school, only: %i( show_master edit_master update_master )
-
-    def show_master
-      respond_with @school
-    end
-
-    def edit_master
-      respond_with @school
-    end
-
-    def destroy
-      @school.destroy
-      set_count
-      respond_with @school
-    end
-
-    def new
-      @school = School.new
-      respond_with @school
-    end
-
-    def create
-      @school = School.new(school_params)
-      @school.save
-      set_count
-      respond_with @school
-    end
-
-    def edit
-      respond_with @school
-    end
-
-    def show
-      respond_with @school
-    end
-
-    def update
-      @school.update(school_params)
-      respond_with @school, location: [:edit, :admin, @school]
-    end
-
-    def update_master
-      @school.update(school_params)
-      respond_with @school, location: admin_school_details_edit_path
-    end
-
-    def index
-      @schools = School.all
-      set_count
-      respond_with @schools
-    end
-
-    private
-
-    def school_params
-      params.require(:school).permit(attributes)
-    end
-
-    def attributes
-      [:name, :primary, :slogan, :description, :founded, :principal, :vice_principal, :grades, :code, { levels_attributes: [ :name, :'_destroy', :id ] }, :picture ]
-    end
-
-    def set_school
-      @school = School.find(params[:id])
-    end
-
-    def set_count
-      @count = School.count
-    end
-
-    def set_master_school
-      @school = School.primary
+  module Admin
+    class SchoolsController < BaseController
+      include AdminPictureController
+
+      respond_to :js,   only: %i( new create destroy index edit update )
+      respond_to :html, only: %i( edit_master edit update_master show )
+
+      before_action :set_school,  only: %i( edit show update destroy set_picture remove_picture )
+      before_action :set_master_school, only: %i( edit_master update_master )
+
+      def edit_master
+        respond_with @school
+      end
+
+      def destroy
+        @school.destroy
+        set_count
+        respond_with @school
+      end
+
+      def new
+        @school = School.new
+        respond_with @school
+      end
+
+      def create
+        @school = School.new(school_params)
+        @school.save
+        set_count
+        respond_with @school
+      end
+
+      def edit
+        respond_with @school
+      end
+
+      def show
+        respond_with @school
+      end
+
+      def update
+        @school.update(school_params)
+        respond_with @school
+      end
+
+      def update_master
+        @school.update(school_params)
+        respond_with @school, location: admin_school_details_edit_path
+      end
+
+      def index
+        @schools = School.all
+        set_count
+        respond_with @schools
+      end
+
+      private
+
+      def school_params
+        params.require(:school).permit(attributes)
+      end
+
+      def attributes
+        [:name, :primary, :slogan, :description, :founded, :principal, :vice_principal, :grades, :code, :picture,
+         { levels_attributes: level_attributes }]
+      end
+
+      def level_attributes
+        [:name, :'_destroy', :id]
+      end
+
+      def set_school
+        @school = School.find(params[:id])
+      end
+
+      def set_count
+        @count = School.count
+      end
+
+      def set_master_school
+        @school = School.primary
+      end
     end
 
   end
-
 end

data/app/controllers/gaku/admin/{achievements/simple_grade_types_controller.rb → simple_grade_types_controller.rb}

@@ -1,7 +1,7 @@
 module Gaku
-  class Admin::Achievements::SimpleGradeTypesController < Admin::BaseController
-    respond_to :js,   only: %i( new create update edit destroy )
-    respond_to :html, only: %i( index  )
+  class Admin::SimpleGradeTypesController < Admin::BaseController
+
+    respond_to :js, only: %i( new create update edit destroy index )
 
     before_action :set_simple_grade_type, only: %i( edit update destroy )
     before_action :load_data, only: %i( new edit )
@@ -66,5 +66,6 @@ module Gaku
     def t_resource
       t(:'simple_grade_type.singular')
     end
+
   end
 end

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

@@ -1,13 +1,10 @@
 module Gaku
   class Admin::SpecialtiesController < Admin::BaseController
 
-    #load_and_authorize_resource class: Specialty
-
-    respond_to :js,   only: %i( new create edit update destroy )
-    respond_to :html, only: :index
+    respond_to :js, only: %i( new create edit update destroy index )
 
     before_action :set_specialty, only: %i( edit update destroy )
-    before_action :load_data, only: %i( new edit )
+    before_action :load_data,     only: %i( new edit )
 
     def index
       @specialties = Specialty.all

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

@@ -1,92 +1,92 @@
 module Gaku
-  module Admin
-    class StatesController < Admin::BaseController
-
-      #load_and_authorize_resource class: State
-
-      respond_to :js,   only: %i( new create edit update destroy country_states )
-      respond_to :html, only: %i( index edit update )
-
-      before_action :set_state, only: %i( edit show update destroy )
-      before_action :set_countries
-
-      def country_states
-        if params[:state][:country_iso].empty?
-          @country = set_default_country
-          set_count @country
-          if @country
-            respond_with @country
-          else
-            render nothing: true
-          end
-        else
-          @country = Country.where(iso: params[:state][:country_iso]).first
-          @states = @country.states
-          set_count @country
-          respond_with @country
-        end
-      end
+  class Admin::StatesController < Admin::BaseController
 
-      def destroy
-        @state.destroy
-        respond_with @state
-      end
+    respond_to :js,   only: %i( new create edit update destroy country_states index )
+    respond_to :html, only: %i( edit update )
 
-      def new
-        @state = State.new
-        respond_with @state
-      end
+    before_action :set_state, only: %i( edit show update destroy )
+    before_action :set_countries
 
-      def create
-        @state = State.new(state_params)
-        @state.save
-        respond_with @state
+    def country_states
+      if params[:state][:country_iso].empty?
+        states_for_default_country
+      else
+        @country = Country.where(iso: params[:state][:country_iso]).first
+        @states = @country.states
+        set_count @country
+        respond_with @country
       end
+    end
 
-      def edit
-      end
+    def destroy
+      @state.destroy
+      respond_with @state
+    end
 
-      def update
-        @state.update(state_params)
-        respond_with @state
-      end
+    def new
+      @state = State.new
+      respond_with @state
+    end
 
-      def index
-        @country = set_default_country
-        set_count @country
-        respond_with @country
-      end
+    def create
+      @state = State.new(state_params)
+      @state.save
+      respond_with @state
+    end
 
-      private
+    def edit
+    end
 
-      def state_params
-        params.require(:state).permit(attributes)
-      end
+    def update
+      @state.update(state_params)
+      respond_with @state
+    end
 
-      def attributes
-        %i( name abbr name_ascii code country_iso )
-      end
+    def index
+      @country = set_default_country
+      set_count @country
+      respond_with @country
+    end
 
-      def set_state
-        @state = State.find(params[:id])
-      end
+    private
 
-      def set_countries
-        @countries = Country.all
+    def states_for_default_country
+      @country = set_default_country
+      set_count @country
+      if @country
+        respond_with @country
+      else
+        render nothing: true
       end
+    end
 
-      def set_count(object)
-        @count = object.states.count unless object.nil?
-      end
+    def state_params
+      params.require(:state).permit(attributes)
+    end
 
-      def country_preset
-        Preset.address('country')
-      end
+    def attributes
+      %i( name abbr name_ascii code country_iso )
+    end
 
-      def set_default_country
-        Country.where(iso: country_preset).first
-      end
+    def set_state
+      @state = State.find(params[:id])
+    end
+
+    def set_countries
+      @countries = Country.all
+    end
+
+    def set_count(object)
+      @count = object.states.count unless object.nil?
+    end
+
+    def country_preset
+      Preset.address('country')
+    end
 
+    def set_default_country
+      Country.where(iso: country_preset).first
     end
+
   end
 end

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

@@ -0,0 +1,57 @@
+module Gaku
+  class Admin::StudentReviewCategoriesController < Admin::BaseController
+
+    respond_to :js
+
+    before_action :set_student_review_category, only: %i( edit update destroy )
+
+    def index
+      @student_review_categories = StudentReviewCategory.all
+      set_count
+      respond_with @student_review_categories
+    end
+
+    def new
+      @student_review_category = StudentReviewCategory.new
+      respond_with @student_review_category
+    end
+
+    def create
+      @student_review_category = StudentReviewCategory.create(student_review_category_params)
+      set_count
+      respond_with @student_review_category
+    end
+
+    def edit
+    end
+
+    def update
+      @student_review_category.update(student_review_category_params)
+      respond_with @student_review_category
+    end
+
+    def destroy
+      @student_review_category.destroy!
+      set_count
+      respond_with @student_review_category
+    end
+
+    private
+
+    def student_review_category_params
+      params.require(:student_review_category).permit(student_review_category_attrs)
+    end
+
+    def student_review_category_attrs
+      %i( name )
+    end
+
+    def set_student_review_category
+      @student_review_category = StudentReviewCategory.find(params[:id])
+    end
+
+    def set_count
+      @count = StudentReviewCategory.count
+    end
+  end
+end