gaku_admin 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e840a895799549aea22669598d77293d5d2e0dc
-  data.tar.gz: 421b4b72480934dd87a50523a8580255e32d0b8c
+  metadata.gz: 98be1e120b74736790a719245f7c3933199959b1
+  data.tar.gz: 3a16cf2a75da88531167f5b7fc25931fa1154b92
 SHA512:
-  metadata.gz: 62437e108a8062e65b41cb849f55fc1f7dae5f1dc66f61368c47f29bf566122b880942db66cdb03110a53ff22a77333c8603ba241f238dcc85c8c1629991abb8
-  data.tar.gz: 590da37e13b5ae407eec989496c79508e73dc18f97bda4bc1b221977ea5a604b20df83401832863616774340cc749fda3166e13c0816cd99f981b4131e7d4cbf
+  metadata.gz: a12244f88eec759da4ac8563b18fdb5d4e16621e015d999c9aae9ddd04c20e96e31d248815af8191f193bc35a17ba5c1c8de7978111d52977bfad8b1a21fe5bb
+  data.tar.gz: ab2570575dfe3874d8b06c8d13a8fab7c7d444bdbdb9a3bdc83e1fff5c328c61f1fd0fb0bddef8a4542a6f9d86f2c33de373c092253b39f46cdd04dcba283fa9

data/app/assets/javascripts/gaku/admin/admin.coffee

@@ -17,16 +17,15 @@ ready = ->
                             .find('.dynamicAttributeValue')
         value = nameElem.val()
 
-        valueElem.attr 'id', "grading_method_arguments_#{value}"
-        valueElem.attr 'name', "grading_method[arguments][#{value}]"
-        valueElem.attr 'placeholder', "value for #{value}"
+        valueElem.attr 'id', "grading_method_criteria_#{value}"
+        valueElem.attr 'name', "grading_method[criteria][#{value}]"
 
-      $(document).on 'click', '.remove-argument-row', (e)->
+      $(document).on 'click', '.remove-criteria-row', (e)->
         e.preventDefault()
         if confirm('Are you sure?')
           $(@).closest('.row').html ''
 
-      $(document).on 'click', '.add-argument-row', (e)->
+      $(document).on 'click', '.add-criteria-row', (e)->
         e.preventDefault()
 
         contents = "<div class='row'> #{$('.attribute-template').html()} </div>"
@@ -35,9 +34,10 @@ ready = ->
 
     edit: ->
       self.admin.country_dropdown()
+      self.admin.upload_picture_ajax()
 
     edit_master: ->
-      self.admin.upload_picture()
+      self.admin.upload_picture_ajax()
 
     new: ->
       self.admin.country_dropdown()

data/app/assets/javascripts/gaku/admin/base.js.coffee

@@ -3,7 +3,7 @@ window.showNotice = (notice)->
     $(@).html('').show()
 
 $.fn.enableValidations = ->
-  $(this).enableRails4ClientSideValidations()
+  $(this).enableClientSideValidations()
 
 $.fn.withAnimation = ->
   $(this).animate({height:"toggle", opacity:"toggle"})
@@ -88,9 +88,18 @@ ready = ->
       @edit()
 
     upload_picture: ->
-      $("#upload-picture-link").click ->
+      $(document).on 'click', '#upload-picture-link', ->
         $("#upload-picture").toggle()
 
+    upload_picture_ajax: ->
+      $('body').popover
+        selector: '.picture-upload'
+        html: true
+        content: ()->
+          return $('#upload-picture').html()
+        placement: 'bottom'
+        trigger: 'click'
+
     country_dropdown: ->
       $('body').on 'change', '#country_dropdown', ->
         window.load_states()

data/app/assets/javascripts/gaku/admin.js.coffee

@@ -14,7 +14,11 @@
 #= require bootstrap/button
 #= require bootstrap/tab
 #= require bootstrap/dropdown
+#= require bootstrap/collapse
+#= require bootstrap/transition
 #= require bootstrap/modal
+#= require bootstrap/tooltip
+#= require bootstrap/popover
 
 
 #= require nprogress
@@ -27,6 +31,8 @@
 #= require underscore
 #= require moment
 #= require rails.validations
+#= require jquery.remotipart
+
 #= require gaku/admin/slide.js.erb
 
 #= require gaku/admin/base

data/app/assets/stylesheets/gaku/admin/bootstrap_and_theme.css.scss

@@ -22,6 +22,12 @@
   max-width: 1900px;
 }
 
+
+#user_menu {
+   margin-right: 25px;
+}
+
+
 .alert-dismissable .close {
 position: relative;
 top: -2px;
@@ -302,6 +308,10 @@ font-size: 24px;
           box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 5px rgba(0, 0, 0, 0.075);
 }
 
+.navbar .navbarright {
+   margin-right: 0px;
+}
+
 .navbar .navbar-nav > .active > a {
   background-color: #f8f8f8;
 }
@@ -568,4 +578,9 @@ font-size: 24px;
       background-repeat: repeat-x;
       filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff357ebd', GradientType=0);    }
   }
-}
+}
+
+.modal-backdrop.in {
+  opacity: 0.70;
+  filter: alpha(opacity=70);
+}

data/app/assets/stylesheets/gaku/admin.css

@@ -1,7 +1,6 @@
 /*
  *= require gaku/admin/bootstrap_and_theme
  *= require bootstrap-datepicker
- * require font-awesome
  *= require jquery.ui.autocomplete
  *= require jquery.minicolors
  *= require nprogress

data/app/controllers/concerns/admin_picture_controller.rb

@@ -0,0 +1,28 @@
+module AdminPictureController
+  include Gaku::ClassNameDetector
+
+  def set_picture
+    @resource = set_resource
+    @resource.update params.require(param_name).permit(:picture)
+    flash.now[:notice] = t('notice.picture_update')
+    render 'gaku/admin/shared/set_picture'
+  end
+
+  def remove_picture
+    @resource = set_resource
+    @resource.update(picture: nil)
+    flash.now[:notice] = t('notice.picture_remove')
+    render 'gaku/admin/shared/remove_picture'
+  end
+
+  private
+
+  def set_resource
+    instance_variable_set("@#{class_name_underscored}", class_name.constantize.find(params[:id]))
+  end
+
+  def param_name
+    controller_name.singularize.to_sym
+  end
+
+end

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

@@ -1,17 +1,14 @@
 module Gaku
   class Admin::AttendanceTypesController < Admin::BaseController
 
-    #load_and_authorize_resource class: AttendanceType
-
     respond_to :json, only: :index
-    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_attendance_type, only: %i( edit update destroy )
 
     def index
       @attendance_types = AttendanceType.all
-      @count = AttendanceType.count
+      set_count
       respond_with @attendance_types
     end
 
@@ -23,7 +20,7 @@ module Gaku
     def create
       @attendance_type = AttendanceType.new(attendance_type_params)
       @attendance_type.save
-      @count = AttendanceType.count
+      set_count
       respond_with @attendance_type
     end
 
@@ -37,7 +34,7 @@ module Gaku
 
     def destroy
       @attendance_type.destroy
-      @count = AttendanceType.count
+      set_count
       respond_with @attendance_type
     end
 
@@ -55,6 +52,9 @@ module Gaku
       %i(name color_code counted_absent disable_credit credit_rate auto_credit)
     end
 
+    def set_count
+      @count = AttendanceType.count
+    end
+
   end
 end
-

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

@@ -1,10 +1,7 @@
 module Gaku
   class Admin::BadgeTypesController < Admin::BaseController
 
-    #load_and_authorize_resource class: Achievement
-
-    respond_to :js,   only: %i( new edit destroy )
-    respond_to :html, only: %i( index create update )
+    respond_to :js, only: %i( new create edit update destroy index )
 
     before_action :set_badge_type, only: %i( edit update destroy )
 
@@ -21,10 +18,12 @@ module Gaku
 
     def create
       @badge_type = BadgeType.new(badge_type_params)
-      @badge_type.save
-      set_count
-      flash[:notice] = t(:'notice.created', resource: t_resource)
-      respond_with [:admin, :badge_types]
+      if @badge_type.save
+        set_count
+        respond_with @badge_type
+      else
+        render :new
+      end
     end
 
     def edit
@@ -32,13 +31,11 @@ module Gaku
 
     def update
       @badge_type.update(badge_type_params)
-      flash[:notice] = t(:'notice.updated', resource: t_resource)
-      respond_with [:admin, :badge_types]
+      respond_with @badge_type
     end
 
     def destroy
       @badge_type.destroy
-      flash[:notice] = t(:'notice.destroyed', resource: t_resource)
       set_count
       respond_with @badge_type
     end
@@ -58,11 +55,7 @@ module Gaku
     end
 
     def attributes
-      %i(name description code authority url issuer badge_image )
-    end
-
-    def t_resource
-      t(:'badge_type.singular')
+      %i( name description code authority url issuer badge_image )
     end
 
   end

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

@@ -2,7 +2,7 @@ module Gaku
   module Admin
     class BaseController < CoreController
 
-      self.responder = AppResponder
+      self.responder = Gaku::AppResponder
       respond_to :html
 
       layout :resolve_layout

data/app/controllers/gaku/admin/{schools/campuses → campuses}/addresses_controller.rb

@@ -1,10 +1,9 @@
 module Gaku
-  class Admin::Schools::Campuses::AddressesController < Admin::BaseController
+  class Admin::Campuses::AddressesController < Admin::BaseController
 
     respond_to :js,   only: %i( new create destroy edit update )
 
     before_action :set_address,  only: %i( edit update destroy )
-    before_action :set_school
     before_action :set_campus
     before_action :set_countries, only: %i( new edit )
 
@@ -30,7 +29,7 @@ module Gaku
 
     def update
       @address.update(address_params)
-      respond_with @address, location: [:edit, :admin, @school, @campus]
+      respond_with @address
     end
 
     private
@@ -40,11 +39,7 @@ module Gaku
     end
 
     def attributes
-      %i( title address1 address2 city zipcode state state_id country country_id deleted primary past )
-    end
-
-    def set_school
-      @school = School.find(params[:school_id])
+      %i( title address1 address2 city zipcode state state_id country country_id primary past )
     end
 
     def set_campus
@@ -61,4 +56,3 @@ module Gaku
 
   end
 end
-

data/app/controllers/gaku/admin/{schools/campuses → campuses}/contacts_controller.rb

@@ -1,11 +1,10 @@
 module Gaku
-  class Admin::Schools::Campuses::ContactsController < Admin::BaseController
+  class Admin::Campuses::ContactsController < Admin::BaseController
 
     respond_to :js
 
     before_action :set_contact_types,    only: %i( new edit )
     before_action :set_contact,          only: %i( edit update destroy make_primary )
-    before_action :set_school
     before_action :set_campus
 
     def new
@@ -14,8 +13,9 @@ module Gaku
     end
 
     def create
-      @contact = @campus.contacts.new(contact_params)
-      @contact.save
+      creator = ContactCreation.new(contact_params.merge(contactable: @campus))
+      creator.save
+      @contact = creator.contact
       set_count
       respond_with @contact
     end
@@ -25,8 +25,9 @@ module Gaku
     end
 
     def update
+      ContactUpdation.new(@contact).update(contact_params)
       @contact.update(contact_params)
-      respond_with @contact, location: [:edit, :admin, @school, @campus]
+      respond_with @contact
     end
 
     def destroy
@@ -37,7 +38,6 @@ module Gaku
       respond_with @contact
     end
 
-
     def make_primary
       @contact.make_primary
       respond_with @contact
@@ -49,10 +49,6 @@ module Gaku
       @contact = Contact.find(params[:id])
     end
 
-    def set_school
-      @school = School.find(params[:school_id])
-    end
-
     def set_campus
       @campus = Campus.find(params[:campus_id])
     end

data/app/controllers/gaku/admin/{schools/campuses_controller.rb → campuses_controller.rb}

@@ -1,12 +1,12 @@
 module Gaku
-  class Admin::Schools::CampusesController < Admin::BaseController
+  class Admin::CampusesController < Admin::BaseController
+    include AdminPictureController
 
-    respond_to :js,   only: %i( new create destroy )
-    respond_to :html, only: %i( edit update show )
-
-    before_action :set_campus,  only: %i( edit show update destroy )
-    before_action :set_school
+    respond_to :js,   only: %i( new create destroy edit update index )
+    respond_to :html, only: %i( edit )
 
+    before_action :set_campus, only:   %i( edit update destroy )
+    before_action :set_school, except: %i( set_picture remove_picture )
 
     def destroy
       @campus.destroy
@@ -31,13 +31,9 @@ module Gaku
       respond_with @campus
     end
 
-    def show
-      respond_with @campus
-    end
-
     def update
       @campus.update(campus_params)
-      respond_with @campus, location: [:edit, :admin, @school, @campus]
+      respond_with @campus
     end
 
     def index

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

@@ -1,16 +1,13 @@
 module Gaku
   class Admin::CommuteMethodTypesController < Admin::BaseController
 
-    #load_and_authorize_resource class: CommuteMethodType
-
-    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_commute_method_type, only: %i( edit update destroy )
 
     def index
       @commute_method_types = CommuteMethodType.all
-      @count = CommuteMethodType.count
+      set_count
       respond_with @commute_method_types
     end
 
@@ -22,7 +19,7 @@ module Gaku
     def create
       @commute_method_type = CommuteMethodType.new(commute_method_type_params)
       @commute_method_type.save
-      @count = CommuteMethodType.count
+      set_count
       respond_with @commute_method_type
     end
 
@@ -36,7 +33,7 @@ module Gaku
 
     def destroy
       @commute_method_type.destroy
-      @count = CommuteMethodType.count
+      set_count
       respond_with @commute_method_type
     end
 
@@ -50,5 +47,9 @@ module Gaku
       params.require(:commute_method_type).permit(:name)
     end
 
+    def set_count
+      @count = CommuteMethodType.count
+    end
+
   end
 end

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

@@ -1,16 +1,13 @@
 module Gaku
   class Admin::ContactTypesController < Admin::BaseController
 
-    #load_and_authorize_resource class: ContactType
-
-    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_contact_type, only: %i( edit update destroy )
 
     def index
       @contact_types = ContactType.all
-      @count = ContactType.count
+      set_count
       respond_with @contact_types
     end
 
@@ -22,7 +19,7 @@ module Gaku
     def create
       @contact_type = ContactType.new(contact_type_params)
       @contact_type.save
-      @count = ContactType.count
+      set_count
       respond_with @contact_type
     end
 
@@ -36,7 +33,7 @@ module Gaku
 
     def destroy
       @contact_type.destroy
-      @count = ContactType.count
+      set_count
       respond_with @contact_type
     end
 
@@ -50,6 +47,9 @@ module Gaku
       params.require(:contact_type).permit(:name)
     end
 
+    def set_count
+      @count = ContactType.count
+    end
 
   end
 end

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

@@ -1,16 +1,13 @@
 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
+    respond_to :js,   only: %i( new create edit update destroy index )
 
     before_action :set_department, only: %i( edit update destroy )
 
     def index
       @departments = Department.all
-      @count = Department.count
+      set_count
       respond_with @departments
     end
 
@@ -22,7 +19,7 @@ module Gaku
     def create
       @department = Department.new(department_params)
       @department.save
-      @count = Department.count
+      set_count
       respond_with @department
     end
 
@@ -36,7 +33,7 @@ module Gaku
 
     def destroy
       @department.destroy
-      @count = Department.count
+      set_count
       respond_with @department
     end
 
@@ -50,6 +47,9 @@ module Gaku
       params.require(:department).permit(:name)
     end
 
+    def set_count
+      @count = Department.count
+    end
 
   end
 end

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

@@ -1,16 +1,13 @@
 module Gaku
   class Admin::EnrollmentStatusesController < Admin::BaseController
 
-    #load_and_authorize_resource class: EnrollmentStatus
-
-    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_enrollment_status, only: %i( edit update destroy )
 
     def index
       @enrollment_statuses = EnrollmentStatus.includes(:translations)
-      @count = EnrollmentStatus.count
+      set_count
       respond_with @enrollment_statuss
     end
 
@@ -22,7 +19,7 @@ module Gaku
     def create
       @enrollment_status = EnrollmentStatus.new(enrollment_status_params)
       @enrollment_status.save
-      @count = EnrollmentStatus.count
+      set_count
       respond_with @enrollment_status
     end
 
@@ -36,7 +33,7 @@ module Gaku
 
     def destroy
       @enrollment_status.destroy
-      @count = EnrollmentStatus.count
+      set_count
       respond_with @enrollment_status
     end
 
@@ -51,7 +48,11 @@ module Gaku
     end
 
     def attributes
-      %i(code name active immutable)
+      %i( code name active immutable )
+    end
+
+    def set_count
+      @count = EnrollmentStatus.count
     end
 
   end

data/app/controllers/gaku/admin/grading_method_sets/grading_method_set_items_controller.rb

@@ -63,7 +63,7 @@ module Gaku
     end
 
     def attributes
-      %i(position grading_method_id grading_method_set_id)
+      %i( position grading_method_id grading_method_set_id )
     end
 
   end

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

@@ -1,16 +1,14 @@
 module Gaku
   class Admin::GradingMethodSetsController < Admin::BaseController
 
-    #load_and_authorize_resource class: GradingMethodSet
-
-    respond_to :js,   only: %i( new create edit update destroy make_primary )
-    respond_to :html, only: %i( index show )
+    respond_to :js,   only: %i( new create edit update destroy make_primary index )
+    respond_to :html, only: %i( show )
 
     before_action :set_grading_method_set, only: %i( edit update show destroy make_primary )
 
     def index
       @grading_method_sets = GradingMethodSet.all
-      @count = GradingMethodSet.count
+      set_count
       respond_with @grading_method_sets
     end
 
@@ -22,7 +20,7 @@ module Gaku
     def create
       @grading_method_set = GradingMethodSet.new(grading_method_set_params)
       @grading_method_set.save
-      @count = GradingMethodSet.count
+      set_count
       respond_with @grading_method_set
     end
 
@@ -38,11 +36,9 @@ module Gaku
     end
 
     def destroy
-      if @grading_method_set.primary?
-        GradingMethodSet.first.try(:make_primary)
-      end
+      GradingMethodSet.first.try(:make_primary) if @grading_method_set.primary?
       @grading_method_set.destroy
-      @count = GradingMethodSet.count
+      set_count
       respond_with @grading_method_set
     end
 
@@ -62,7 +58,11 @@ module Gaku
     end
 
     def attributes
-      %i(display_deviation display_rank name primary rank_order)
+      %i( display_deviation display_rank name primary rank_order )
+    end
+
+    def set_count
+      @count = GradingMethodSet.count
     end
 
   end