gaku_admin 0.1.1 → 0.2.0

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

@@ -1,71 +1,68 @@
 module Gaku
-  module Admin
-    class TemplatesController < Admin::BaseController
+  class Admin::TemplatesController < Admin::BaseController
 
-      responders :collection
+    responders :collection
 
-      respond_to :js,   only: %i( destroy )
-      respond_to :html, only: %i( new edit index update create )
+    respond_to :js,   only: %i( new create edit update destroy index )
+    respond_to :html, only: :download
 
-      before_action :set_template, only: %i( download edit update destroy )
+    before_action :set_template, only: %i( download edit update destroy )
 
-      def new
-        @template = Template.new
-      end
-
-      def create
-        @template = Template.new(template_params)
-        if @template.save
-          set_count
-          respond_with @template, location: admin_templates_path
-        else
-          render :new
-        end
-      end
+    def new
+      @template = Template.new
+    end
 
-      def edit
+    def create
+      @template = Template.new(template_params)
+      if @template.save
+        set_count
         respond_with @template
+      else
+        render :new
       end
+    end
 
-      def update
-        @template.update(template_params)
-        respond_with @template, location: admin_templates_path
-      end
+    def edit
+      respond_with @template
+    end
 
-      def download
-        send_file @template.file.path
-      end
+    def update
+      @template.update(template_params)
+      respond_with @template
+    end
 
-      def index
-        @templates = Template.all
-        set_count
-        respond_with @templates
-      end
+    def download
+      send_file @template.file.path
+    end
 
-      def destroy
-        @template.destroy
-        set_count
-        respond_with @template
-      end
+    def index
+      @templates = Template.all
+      set_count
+      respond_with @templates
+    end
 
-      private
+    def destroy
+      @template.destroy
+      set_count
+      respond_with @template
+    end
 
-      def set_count
-        @count = Template.count
-      end
+    private
 
-      def set_template
-        @template = Template.find(params[:id])
-      end
+    def set_count
+      @count = Template.count
+    end
 
-      def template_params
-        params.require(:template).permit(attributes)
-      end
+    def set_template
+      @template = Template.find(params[:id])
+    end
 
-      def attributes
-        %i( name context locked file )
-      end
+    def template_params
+      params.require(:template).permit(attributes)
+    end
 
+    def attributes
+      %i( name context locked file )
     end
 
   end

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

@@ -1,10 +1,7 @@
 module Gaku
   class Admin::UsersController < Admin::BaseController
 
-    #load_and_authorize_resource class: User
-
-    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_user, only: %i( edit update destroy )
     before_action :set_roles
@@ -21,8 +18,9 @@ module Gaku
     end
 
     def create
-      @user = User.new(user_params)
-      @user.save
+      user_creator = UserCreator.new(user_params)
+      user_creator.save
+      @user = user_creator.get_user
       save_user_roles
       @count = User.count
       respond_with @user
@@ -55,7 +53,7 @@ module Gaku
     end
 
     def attributes
-      [:login, :username, :email, :password, :password_confirmation, :remember_me, :locale, { role_ids: [] } ]
+      [:login, :username, :email, :password, :password_confirmation, :remember_me, :locale, { role_ids: [] }]
     end
 
     def set_roles

data/app/controllers/gaku/states_controller.rb

@@ -1,5 +1,6 @@
 module Gaku
   class StatesController < CoreController
+
     respond_to :js, :json
 
     def index
@@ -13,5 +14,6 @@ module Gaku
 
       respond_with @states
     end
+
   end
 end

data/app/helpers/gaku/admin_helper.rb

@@ -8,5 +8,20 @@ module Gaku
       content_tag :h4, text
     end
 
+    def grading_methods_with_i18n
+      Hash[*Gaku::GradingMethod::Types.map do |k|
+        [I18n.t("grading_method.#{k}"), k.to_s]
+      end.flatten]
+
+    end
+
+    def badge_count(count, text, css_class)
+      if count != 0
+        "#{text}<span class='badge pull-right #{css_class}'>#{count}</span>".html_safe
+      else
+        "#{text}<span class='badge pull-right #{css_class}'></span>".html_safe
+      end
+    end
+
   end
-end
+end

data/app/helpers/gaku/shared_helper.rb

@@ -2,7 +2,7 @@ module Gaku
   module SharedHelper
 
     def can_edit?
-      %w( edit create update ).include? controller.action_name
+      %w( edit create update ).include? action_name
     end
 
     def genders
@@ -22,4 +22,4 @@ module Gaku
     end
 
   end
-end
+end

data/app/overrides/admin_menu.rb

@@ -1,6 +1,7 @@
-Deface::Override.new(:virtual_path => "gaku/shared/menu/_global",
-                     :name => "admin_menu",
-                     :insert_bottom => "[data-hook='menu']",
-                     :partial => "gaku/shared/menu/admin",
-                     :disabled => false
-                     )
+Deface::Override.new(
+                      virtual_path: 'gaku/shared/menu/_global',
+                      name: 'admin_menu',
+                      insert_bottom: "[data-hook='menu']",
+                      partial: 'gaku/shared/menu/admin',
+                      disabled: false
+                    )

data/app/views/gaku/admin/attendance_types/{index.html.slim → _attendance_types.html.slim}

@@ -1,12 +1,13 @@
-= content_for :index_header do
-  .pull-left
-    = count_div 'admin-attendance-types-count' do
-      = print_count @count, t(:'attendance_type.list')
-  .pull-right
-    = ajax_link_to_new t(:'attendance_type.add'), [:new, :admin, :attendance_type], id: 'new-admin-attendance-type-link'
+.row
+  .col-md-12
+    #new-admin-attendance-type.d-none
+    .pull-left
+      = count_div 'admin-attendance-types-count' do
+        = print_count @count, t(:'attendance_type.list')
+    .pull-right
+      = ajax_link_to_new t(:'attendance_type.add'), [:new, :admin, :attendance_type], id: 'new-admin-attendance-type-link'
 
-= content_for :new_form do
-  #new-admin-attendance-type.d-none
+hr
 
 #admin-attendance-types
   = table_for 'admin-attendance-types-index' do

data/app/views/gaku/admin/attendance_types/index.js.erb

@@ -0,0 +1 @@
+$('#ajax-load').html('<%=j render "attendance_types" %>')

data/app/views/gaku/admin/attendance_types/index.json.rb

@@ -1 +1 @@
-@attendance_types.to_json(root: false)
+@attendance_types.to_json(root: false)

data/app/views/gaku/admin/badge_types/{index.html.slim → _badge_types.html.slim}

@@ -1,12 +1,13 @@
-= content_for :index_header do
-  .pull-left
-    = count_div 'admin-badge-types-count' do
-      = print_count @count, t(:'badge_type.list')
-  .pull-right
-    = ajax_link_to_new t(:'badge_type.add'), [:new, :admin, :badge_type], id: 'new-admin-badge-type-link'
+.row
+  .col-md-12
+    #new-admin-badge-type.d-none
+    .pull-left
+      = count_div 'admin-badge-types-count' do
+        = print_count @count, t(:'badge_type.list')
+    .pull-right
+      = ajax_link_to_new t(:'badge_type.add'), [:new, :admin, :badge_type], id: 'new-admin-badge-type-link'
 
-= content_for :new_form do
-  #new-admin-badge-type.d-none
+hr
 
 #admin-badge-types
   = table_for 'admin-badge-types-index' do

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

@@ -1,3 +1,3 @@
-= normal_form_for [:admin, @badge_type], resource: 'admin-badge-type' do |f|
+= remote_form_for [:admin, @badge_type], resource: 'admin-badge-type' do |f|
   = render 'form_fields', f: f
   = buttons_for @badge_type, resource: 'admin-badge-type'

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

@@ -1,4 +1,4 @@
 = modal_for 'edit-badge-type-modal' do
-  = normal_modal_form_for [:admin, @badge_type], resource: 'admin-badge-type' do |f|
+  = modal_form_for [:admin, @badge_type], resource: 'admin-badge-type' do |f|
     = render 'form_fields', f: f
     = buttons_for @badge_type, resource: 'admin-badge-type'

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

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

data/app/views/gaku/admin/badge_types/index.js.erb

@@ -0,0 +1 @@
+$('#ajax-load').html('<%=j render "badge_types" %>')

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

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

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

@@ -0,0 +1,3 @@
+$('tr#badge-type-<%= @badge_type.id %>').html('<%= j render("fields", {badge_type: @badge_type}) %>');
+$("#edit-badge-type-modal").modal("hide");
+showNotice("<%= render_flash %>");

data/app/views/gaku/admin/campuses/_campus.html.slim

@@ -0,0 +1,4 @@
+tr id="campus-#{campus.id}"
+  td
+  td = campus.name
+  td = link_to_edit [:edit, :admin, @school, campus]

data/app/views/gaku/admin/{schools/campuses → campuses}/_campuses.html.slim

@@ -6,7 +6,7 @@
       = count_div 'admin-school-campuses-count' do
         = print_count @school.campuses.count, t(:'campus.list')
     .pull-right
-      = ajax_link_to_new t(:'campus.add'), [:new, :admin, @school, :campus], id: 'new-admin-school-campus-link' if can_edit?
+      = ajax_link_to_new t(:'campus.add'), [:new, :admin, @school, :campus], id: 'new-admin-school-campus-link'
   = hr
 
   = index_body do
@@ -15,9 +15,7 @@
         tr
           = th_icon 'home'
           = th t(:'campus.name')
-          - if can_edit?
-            = th_actions 2
-          - else
-            = th_actions 1
+          = th_actions 1
+
       tbody
-        = render partial: 'gaku/admin/schools/campuses/campus', collection: @school.campuses, as: 'campus'
+        = render partial: 'gaku/admin/campuses/campus', collection: @school.campuses, as: 'campus'

data/app/views/gaku/admin/campuses/_edit_form.html.slim

@@ -0,0 +1,3 @@
+= remote_form_for [:admin, @school, @campus], label: t(:'campus.singular') do |f|
+  = render 'form_fields', f: f, school: @school
+  = buttons_for @campus, resource: 'admin-school-campus'

data/app/views/gaku/admin/campuses/addresses/_address.html.slim

@@ -0,0 +1,6 @@
+- unless address.nil?
+  tr id="address-#{address.id}"
+    = render 'gaku/admin/campuses/addresses/fields', address: address
+    td
+      = ajax_link_to_edit [:edit, :admin, @school, @campus, address]
+      = ajax_link_to_delete [:admin, @school, @campus, address]

data/app/views/gaku/admin/{schools/campuses → campuses}/addresses/_address_row_fields.html.slim

@@ -1,4 +1,4 @@
-= render 'gaku/admin/schools/campuses/addresses/fields', address: address
+= render 'gaku/admin/campuses/addresses/fields', address: address
 td
   = ajax_link_to_edit [:edit, :admin, @school, @campus, address]
   = ajax_link_to_delete [:admin, @school, @campus, address]

data/app/views/gaku/admin/{schools/campuses → campuses}/addresses/_addresses.html.slim

@@ -5,8 +5,7 @@
       = count_div '' do
         = t(:'address.singular')
     .pull-right
-      = ajax_link_to_new t(:'address.add'), [:new, :admin, @school, @campus, :address], id: 'new-admin-school-campus-address-link', class: @campus.address.nil? ? "btn btn-primary" : 'btn btn-primary d-none' if can_edit?
-  = hr
+      = ajax_link_to_new t(:'address.add'), [:new, :admin, @school, @campus, :address], id: 'new-admin-school-campus-address-link', class: @campus.address.nil? ? "btn btn-primary" : 'btn btn-primary d-none'
 
   = index_body do
     = table_for 'admin-school-campus-addresses-index' do
@@ -19,6 +18,6 @@
             = th t(:'address.city')
             = th t(:'address.address1')
             = th t(:'address.address2')
-            = th_actions 2 if can_edit?
+            = th_actions 2
         tbody
-          = render partial: 'gaku/admin/schools/campuses/addresses/address', locals: {address: @campus.address}
+          = render partial: 'gaku/admin/campuses/addresses/address', locals: {address: @campus.address}

data/app/views/gaku/admin/campuses/addresses/index.js.erb

@@ -0,0 +1 @@
+$('#ajax-load').html('<%=j render "addresses" %>')

data/app/views/gaku/admin/{schools/campuses → campuses}/addresses/update.js.erb

@@ -1,4 +1,4 @@
 //edit from index
-$('tr#address-<%= @address.id %>').html('<%= j render("gaku/admin/schools/campuses/addresses/address_row_fields", {address: @address, target: [@student, @guardian, @address]}) %>');
+$('tr#address-<%= @address.id %>').html('<%= j render("gaku/admin/campuses/addresses/address_row_fields", {address: @address, target: [@student, @guardian, @address]}) %>');
 $("#edit-address-modal").modal("hide");
 showNotice("<%= render_flash %>");

data/app/views/gaku/admin/campuses/contacts/_contact.html.slim

@@ -0,0 +1,3 @@
+tr id="contact-#{contact.id}"
+  = render 'gaku/admin/campuses/contacts/fields', contact: contact
+

data/app/views/gaku/admin/{schools/campuses → campuses}/contacts/_contacts.html.slim

@@ -4,9 +4,9 @@
     #new-admin-school-campus-contact.d-none
     .pull-left
       = count_div "admin-school-campus-contacts-count" do
-        = print_count campus.contacts_count, t(:'contact.list')
+        = print_count @campus.contacts_count, t(:'contact.list')
     .pull-right
-      = ajax_link_to_new t(:'contact.add'), [:new, :admin, @school, campus, :contact], id: 'new-admin-school-campus-contact-link' if can_edit?
+      = ajax_link_to_new t(:'contact.add'), [:new, :admin, @school, @campus, :contact], id: 'new-admin-school-campus-contact-link'
 
   = index_body do
     = table_for "admin-school-campus-contacts-index" do
@@ -17,6 +17,6 @@
           = th t(:'contact.data')
           = th t(:'contact.details')
           = th t(:'contact.emergency')
-          = th_actions 2 if can_edit?
+          = th_actions 2
       tbody
-        = render partial: 'gaku/admin/schools/campuses/contacts/contact', collection: campus.contacts, as: :contact
+        = render partial: 'gaku/admin/campuses/contacts/contact', collection: @campus.contacts, as: :contact

data/app/views/gaku/admin/campuses/contacts/_fields.html.slim

@@ -0,0 +1,11 @@
+= render 'gaku/admin/campuses/contacts/primary_field', contact: contact
+
+td = contact.name
+td = contact.data
+td = contact.details
+td
+  = t(:'contact.emergency') if contact.emergency?
+
+td
+  = ajax_link_to_edit [:edit, :admin, @school, @campus, contact]
+  = render 'gaku/admin/campuses/contacts/delete_link', contact: contact

data/app/views/gaku/admin/campuses/contacts/_primary_field.html.slim

@@ -0,0 +1,6 @@
+td class="primary-contact" width="28px"
+  - if contact.primary?
+    = ajax_link_to_make_primary [:make_primary, :admin, @school, @campus, contact], method: :patch, id: 'set-primary-link', class: 'btn btn-xs btn-primary make-primary'
+  - else
+    = ajax_link_to_make_primary [:make_primary, :admin, @school, @campus, contact], method: :patch, id: 'set-primary-link', class: 'btn btn-xs btn-default'
+

data/app/views/gaku/admin/{schools/campuses → campuses}/contacts/create.js.erb

@@ -5,7 +5,7 @@ $("#new-admin-school-campus-contact-link").show();
 $('#new-admin-school-campus-contact').slide();
 
 $('.admin-school-campus-contacts-count').html("<%= print_count(@count, t(:'contact.list')) %>");
-$('#admin-school-campus-contacts-tab-link').html("<%= print_count(@count, t(:'contact.plural')) %>");
+$('.contacts-count').html("<%= @count %>");
 
 <% if @contact.primary? %>
   $('#admin-school-campus-contacts-index tbody tr').each(function(){

data/app/views/gaku/admin/{schools/campuses → campuses}/contacts/destroy.js.erb

@@ -5,4 +5,4 @@ showNotice("<%= render_flash %>");
 <% end %>
 
 $('.admin-school-campus-contacts-count').html("<%= print_count(@count, t(:'contact.list')) %>");
-$('#admin-school-campus-contacts-tab-link').html("<%= print_count(@count, t(:'contact.plural')) %>");
+$('.contacts-count').html("<%= @count %>");

data/app/views/gaku/admin/{schools/campuses → campuses}/contacts/edit.js.erb

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

data/app/views/gaku/admin/campuses/contacts/index.js.erb

@@ -0,0 +1 @@
+$('#ajax-load').html('<%=j render "contacts" %>')

data/app/views/gaku/admin/campuses/edit.html.slim

@@ -0,0 +1,34 @@
+.row
+  .col-md-2
+    .panel-group#accordion
+      .panel
+        .picture-upload
+          = render 'gaku/admin/shared/ajax_picture', resource: @campus
+
+
+      .panel.panel-default
+        .panel-heading
+          h4#campus-name.panel-title
+            = @campus.name
+        .panel-body
+          ul.list-unstyled
+            li = link_to t(:'edit'), [:edit, :admin, @school, @campus], remote: true
+            li#addresses-menu
+              = link_to badge_count(@campus.addresses_count, t(:'address.plural'), 'addresses-count'), [:admin, @campus, :addresses], remote: true
+            li#contacts-menu
+              = link_to badge_count(@campus.contacts_count, t(:'contact.plural'), 'contacts-count'), [:admin, @campus, :contacts], remote: true
+
+      .panel.panel-default
+        .panel-heading
+           h4.panel-title
+             = link_to t(:'admin.back_to_school'), [:edit, :admin, @school]
+
+
+      .panel.panel-default
+        .panel-heading
+           h4.panel-title
+             = link_to t(:'admin.back'), [:admin, :root]
+
+  .col-md-10#ajax-load
+
+    = render 'edit_form'

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

@@ -0,0 +1 @@
+$('#ajax-load').html('<%=j render "edit_form" %>')

data/app/views/gaku/admin/campuses/index.js.erb

@@ -0,0 +1 @@
+$('#ajax-load').html('<%=j render "campuses" %>')

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

@@ -0,0 +1,2 @@
+$('#campus-name').html('<%= @campus.name %>');
+showNotice("<%= render_flash %>");

data/app/views/gaku/admin/commute_method_types/_commute_method_types.html.slim

@@ -0,0 +1,18 @@
+.row
+  .col-md-12
+    #new-admin-commute-method-type.d-none
+  	.pull-left
+  		= count_div 'admin-commute-method-types-count' do
+  			= print_count @count, t(:'commute_method_type.list')
+  	.pull-right
+  		= ajax_link_to_new t(:'commute_method_type.new'), [:new, :admin, :commute_method_type], id: 'new-admin-commute-method-type-link'
+hr
+
+#admin-commute-method-types
+	= table_for 'admin-commute-method-types-index' do
+	  thead
+	    tr
+	      = th t(:'commute_method_type.plural')
+	      = th_actions 2
+	    tbody
+	    	= render partial: 'commute_method_type', collection: @commute_method_types, as: :commute_method_type

data/app/views/gaku/admin/commute_method_types/index.js.erb

@@ -0,0 +1 @@
+$('#ajax-load').html('<%=j render "commute_method_types" %>')

data/app/views/gaku/admin/contact_types/_contact_types.html.slim

@@ -0,0 +1,18 @@
+.row
+  .col-md-12
+    #new-admin-contact-type.d-none
+    .pull-left
+      = count_div 'admin-contact-types-count' do
+        = print_count @count, t(:'contact_type.list')
+    .pull-right
+      = ajax_link_to_new t(:'contact_type.add'), [:new, :admin, :contact_type], id: 'new-admin-contact-type-link'
+hr
+
+#admin-contact-types
+  = table_for 'admin-contact-types-index' do
+    thead
+      tr
+        = th t(:'contact_type.singular')
+        = th_actions 2
+    tbody
+      = render partial: 'contact_type', collection: @contact_types, as: 'contact_type'

data/app/views/gaku/admin/contact_types/index.js.erb

@@ -0,0 +1 @@
+$('#ajax-load').html('<%=j render "contact_types" %>')

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

@@ -0,0 +1,21 @@
+.row
+  .col-md-12
+    #new-admin-department.d-none
+    .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'
+
+hr
+
+#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/index.js.erb

@@ -0,0 +1 @@
+$('#ajax-load').html('<%=j render "departments" %>')

data/app/views/gaku/admin/enrollment_statuses/{index.html.slim → _enrollment_statuses.html.slim}

@@ -1,13 +1,12 @@
-= content_for :index_header do
-  .pull-left
-    = count_div 'admin-enrollment-statuses-count' do
-      = print_count @count, t(:'enrollment_status.list')
-  .pull-right
-    = ajax_link_to_new t(:'enrollment_status.add'), [:new, :admin, :enrollment_status], id: 'new-admin-enrollment-status-link'
-
-= content_for :new_form do
-  #new-admin-enrollment-status.d-none
-
+.row
+  .col-md-12
+    #new-admin-enrollment-status.d-none
+    .pull-left
+      = count_div 'admin-enrollment-statuses-count' do
+        = print_count @count, t(:'enrollment_status.list')
+    .pull-right
+      = ajax_link_to_new t(:'enrollment_status.add'), [:new, :admin, :enrollment_status], id: 'new-admin-enrollment-status-link'
+hr
 #admin-enrollment-statuses
   = table_for 'admin-enrollment-statuses-index' do
     thead

data/app/views/gaku/admin/enrollment_statuses/index.js.erb

@@ -0,0 +1 @@
+$('#ajax-load').html('<%=j render "enrollment_statuses" %>')

data/app/views/gaku/admin/grading_method_sets/_fields.html.slim

@@ -4,6 +4,6 @@ td = boolean_image grading_method_set.display_deviation
 td = boolean_image grading_method_set.display_rank
 td = boolean_image grading_method_set.rank_order
 td
-  = link_to_show [:admin, grading_method_set]
+  = ajax_link_to_show [:admin, grading_method_set]
   = ajax_link_to_edit [:edit, :admin, grading_method_set]
   = ajax_link_to_delete [:admin, grading_method_set]