gaku_frontend 0.1.1 → 0.2.0

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

@@ -5,11 +5,16 @@ module Gaku
 
     before_action :set_syllabus
 
+    def new
+      @exam_syllabus = ExamSyllabus.new
+      respond_with @exam_syllabus
+    end
+
     def create
       @exam_syllabus = ExamSyllabus.new(exam_syllabus_params)
       @exam_syllabus.save
       set_count
-      flash[:now] = t(:'notice.added', resource: t(:'exam.singular'))
+      #flash[:notice] = t(:'notice.added', resource: t(:'exam.singular'))
       respond_with @exam_syllabus
     end
 

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

@@ -44,7 +44,9 @@ module Gaku
     end
 
     def attributes
-      [:name, :description, :adjustments, :grading_method_id, exam_portions_attributes: [:id, :name, :weight, :problem_count, :max_score, :description, :adjustments]]
+      [:name, :description, :adjustments, :grading_method_id,
+       exam_portions_attributes: [:id, :name, :weight, :problem_count, :max_score, :description, :adjustments]
+      ]
     end
 
     def set_exam
@@ -63,6 +65,5 @@ module Gaku
       @exams_count = @syllabus.reload.exams_count
     end
 
-
   end
 end

data/app/controllers/gaku/syllabuses_controller.rb

@@ -1,8 +1,6 @@
 module Gaku
   class SyllabusesController < GakuController
 
-    # respond_to :js,   only: %i( new create destroy recovery )
-    # respond_to :html, only: %i( index edit update soft_delete show_deleted )
     respond_to :html, :js
 
     before_action :set_syllabus, only: %i( edit update destroy )
@@ -21,7 +19,7 @@ module Gaku
     end
 
     def index
-      @syllabuses = Syllabus.all
+      @syllabuses = Syllabus.includes(:department).all
       set_count
       respond_with @syllabuses
     end
@@ -33,7 +31,7 @@ module Gaku
 
     def update
       @syllabus.update(syllabus_params)
-      respond_with @syllabus, location: [:edit, @syllabus]
+      respond_with @syllabus
     end
 
     def destroy

data/app/controllers/gaku/teachers_controller.rb

@@ -1,13 +1,12 @@
 module Gaku
   class TeachersController < GakuController
+    include PictureController
 
     decorates_assigned :teacher
 
-    #respond_to :js,   only: %i( new create destroy )
-    #respond_to :html, only: %i( index edit update show )
     respond_to :html, :js
 
-    before_action :set_teacher,          only: %i( edit show update destroy )
+    before_action :set_teacher, only: %i( edit show update destroy )
 
     def destroy
       @teacher.destroy
@@ -50,6 +49,10 @@ module Gaku
 
     private
 
+    def includes
+      [[contacts: :contact_type, addresses: :country]]
+    end
+
     def teacher_params
       params.require(:teacher).permit(attributes)
     end
@@ -59,7 +62,7 @@ module Gaku
     end
 
     def set_teacher
-      @teacher = Teacher.find(params[:id])
+      @teacher = Teacher.includes(includes).find(params[:id])
       set_notable
     end
 

data/app/helpers/gaku/autocomplete_helper.rb

@@ -22,7 +22,7 @@ module Gaku::AutocompleteHelper
       concat form.select(
         options[:object_name],
         options[:collection],
-        {prompt: options[:prompt], selected: options[:selected]},
+        { prompt: options[:prompt], selected: options[:selected] },
         class: 'form-control input-sm'
       )
     end

data/app/helpers/gaku/exam_helper.rb

@@ -10,4 +10,4 @@ module Gaku
       "#{t(:'exam.completion')}:#{percentage} #{t(:'exam.graded')}:#{total - ungraded} #{t(:'exam.ungraded')}:#{ungraded} #{t(:'exam.total')}:#{total}"
     end
   end
-end
+end

data/app/helpers/gaku/frontend_helper.rb

@@ -8,12 +8,19 @@ module Gaku
     include Gaku::StudentChooserHelper
     include Gaku::StudentsHelper
 
+    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
 
     def ajax_link_to_search(text, resource, options = {})
       name = ("<span class='glyphicon glyphicon-search'></span> " + text).html_safe
       attributes = {
-        :remote => true,
-        :class => "btn btn-primary"
+        remote: true,
+        class: 'btn btn-primary'
       }.merge(options)
       link_to name, resource, attributes
     end
@@ -23,20 +30,29 @@ module Gaku
       [nested_resource, address].flatten
     end
 
-
     def show_field?(field)
-      ActiveRecord::ConnectionAdapters::Column.value_to_boolean(field.to_i)
+      ActiveRecord::Type::Boolean.new.type_cast_from_database(field.to_i)
     end
 
-
     def prepare_resource_name(nested_resources, resource)
-      @resource_name = [nested_resources.map {|r| r.is_a?(Symbol) ? r.to_s : get_class(r) }, resource.to_s].flatten.join '-'
+      @resource_name = [nested_resources.map { |r| r.is_a?(Symbol) ? r.to_s : get_class(r) }, resource.to_s].flatten.join '-'
     end
 
     def extract_grouped(grouped, resource)
       grouped.map(&resource.to_sym)
     end
 
+    def sort_handler
+      content_tag :td, class: 'sort-handler' do
+        content_tag :i, nil, class: 'glyphicon glyphicon-move'
+      end
+    end
+
+    def sortable_tbody(path, &block)
+      content_tag(:tbody, class: 'sortable', data: { 'sort-url' => url_for(path) }) do
+        block.call
+      end
+    end
 
   end
-end
+end

data/app/helpers/gaku/person_helper.rb

@@ -15,8 +15,8 @@ module Gaku
 
     def name_and_ruby_for(person)
       name_elements = [
-        {word: person.surname,  reading: person.surname_reading},
-        {word: person.name,     reading: person.name_reading}
+        { word: person.surname,  reading: person.surname_reading },
+        { word: person.name,     reading: person.name_reading }
       ]
 
       name_elements.map do |element|
@@ -25,13 +25,13 @@ module Gaku
             content_tag(:rb) do
               element[:word]
             end,
-            content_tag(:rp, "( "),
+            content_tag(:rp, '( '),
             content_tag(:rt) do
               element[:reading]
             end,
-            content_tag(:rp, " )"),
+            content_tag(:rp, ' )'),
             unless name_elements.last == element
-              " "
+              ' '
             end
           ].join.html_safe
         end
@@ -56,9 +56,8 @@ module Gaku
     def student_names(student, options = {})
       @names_preset ||= Gaku::Preset.names
       reading = options[:reading]
-      if @names_preset.blank?
-        return reading ? student.surname : student.name
-      end
+      return reading ? student.surname : student.names if @names_preset.blank?
+
       result = @names_preset.gsub(/%(\w+)/) do |name|
         case name
         when '%first' then proper_name(student, :name, reading)

data/app/helpers/gaku/shared_helper.rb

@@ -2,11 +2,7 @@ module Gaku
   module SharedHelper
 
     def can_edit?
-      if controller.action_name.include?('edit')
-        true
-      else
-        false
-      end
+      action_name.include? 'edit'
     end
 
     def genders
@@ -26,4 +22,4 @@ module Gaku
     end
 
   end
-end
+end

data/app/helpers/gaku/students_helper.rb

@@ -1,24 +1,22 @@
 module Gaku
   module StudentsHelper
 
-
     def surname_reading_label
-      t(:phonetic_reading) + ' ('+t(:surname)+')'
+      t(:phonetic_reading) + ' (' + t(:surname) + ')'
     end
 
     def name_reading_label
-      t(:phonetic_reading) + ' ('+t(:name)+')'
+      t(:phonetic_reading) + ' (' + t(:name) + ')'
     end
 
     def surname_label
-      t(:name)+' ('+t(:surname)+')'
+      t(:name) + ' (' + t(:surname) + ')'
     end
 
     def name_label
-      t(:name)+' ('+t(:name)+')'
+      t(:name) + ' (' + t(:name) + ')'
     end
 
-
     def guardian_icon
       content_tag :span, nil, class: 'glyphicon glyphicon-user'
     end

data/app/overrides/frontend_menu.rb

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

data/app/views/gaku/addresses/_addresses.html.slim

@@ -1,4 +1,5 @@
 - prepare_resource_name(nested_resources, :address)
+
 div id="#{@resource_name.pluralize}"
   = index_header do
     .d-none id="new-#{@resource_name}"
@@ -6,7 +7,7 @@ div id="#{@resource_name.pluralize}"
       = count_div "#{@resource_name.pluralize}-count" do
         = print_count nested_resources.last.addresses_count, t(:'address.list')
     .pull-right
-      = ajax_link_to_new t(:'address.add'), [:new, nested_resources, :address].flatten, id: "new-#{@resource_name}-link" if can_edit?
+      = ajax_link_to_new t(:'address.add'), [:new, nested_resources, :address].flatten, id: "new-#{@resource_name}-link"
 
   = index_body do
     = table_for "#{@resource_name.pluralize}-index" do
@@ -20,6 +21,6 @@ div id="#{@resource_name.pluralize}"
           = 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/addresses/address', collection: nested_resources.last.addresses, as: :address, locals: {nested_resources: nested_resources}

data/app/views/gaku/addresses/_fields.html.slim

@@ -8,7 +8,6 @@ td = address.city
 td = address.address1
 td = address.address2
 - unless address.campus_address?
-  - if can_edit?
-    td
-      = ajax_link_to_edit [:edit, target].flatten
-      = render 'gaku/addresses/delete_link', target: target
+  td
+    = ajax_link_to_edit [:edit, target].flatten
+    = render 'gaku/addresses/delete_link', target: target

data/app/views/gaku/addresses/_form_fields.html.slim

@@ -4,22 +4,20 @@
 
 .row
   .col-md-3
-    = f.select :country_id, options_from_collection_for_select(@countries, :id, :name) , { prompt: t(:'address.choose_country'), selected: f.object.country_id || Gaku::Preset.address('country') }, id: "country_dropdown", label: t(:'address.country')
+    = f.select :country_id, options_from_collection_for_select(@countries, :id, :name, (f.object.country_id || @default_country.try(:id))) , { prompt: t(:'address.choose_country') }, { id: "country_dropdown", label: t(:'address.country') }
   .col-md-3
     #state-dropdown
-      = f.collection_select :state_id, state_load(f.object), :id, :name, { prompt: t(:'address.state.choose')} , disabled: disabled?(f.object), label: t(:'address.state')
+      = f.select :state_id, options_from_collection_for_select(state_load(f.object), :id, :name, (f.object.state_id || @default_state.try(:id))), { prompt: t(:'address.state.choose') }, { class: 'form-control', disabled: disabled?(f.object), label: t(:'address.state') }
 
   .col-md-3
     = f.text_field :zipcode, label: t(:'address.zipcode')
-  .col-md-3
-    button.col-md-12.btn.btn-primary = t(:'address.search')
 
-.row
   .col-md-3
     = f.text_field :city, value: f.object.city ||  Gaku::Preset.address('city'), label: t(:'address.city')
-  .col-md-3
+.row
+  .col-md-6
     = f.text_field :address1, label: t(:'address.address1')
-  .col-md-3
+  .col-md-6
     = f.text_field :address2, label: t(:'address.address2')
 
 javascript:

data/app/views/gaku/addresses/_primary_field.html.slim

@@ -1,12 +1,5 @@
 td class='primary_address'
-
-  - if can_edit?
-    - if address.primary?
-      = link_to ok_icon, [:make_primary] + target, method: :patch, remote: true, class: 'col-md-12 btn btn-xs btn-primary make-primary-address', data: { confirm: t('confirm') }, id: 'set_primary_link'
-    - else
-      = link_to ok_icon, [:make_primary] + target, remote: true, id: 'set_primary_link', class: 'col-md-12 btn btn-xs btn-default make-primary-address', method: :patch, data: {confirm: t('confirm')}
-
+  - if address.primary?
+    = link_to ok_icon, [:make_primary] + target, method: :patch, remote: true, class: 'col-md-12 btn btn-xs btn-primary make-primary-address', data: { confirm: t('confirm') }, id: 'set_primary_link'
   - else
-    - if address.primary?
-      span.btn.btn-xs.btn-primary
-        = primary_checkbox
+    = link_to ok_icon, [:make_primary] + target, remote: true, id: 'set_primary_link', class: 'col-md-12 btn btn-xs btn-default make-primary-address', method: :patch, data: {confirm: t('confirm')}

data/app/views/gaku/addresses/create.js.erb

@@ -9,4 +9,5 @@ $('#new-<%= @polymorphic_resource_name %>-link').show();
 
 
 $('.<%= @polymorphic_resource_name.pluralize %>-count').html("<%= print_count(@count, t(:'address.list')) %>");
-$("#<%= @polymorphic_resource_name.pluralize %>-tab-link").html("<%= print_count(@count, t(:'address.plural')) %>");
+//$("#<%= @polymorphic_resource_name.pluralize %>-tab-link").html("<%= print_count(@count, t(:'address.plural')) %>");
+$('.addresses-count').html("<%= @count %>");

data/app/views/gaku/addresses/destroy.js.erb

@@ -5,4 +5,5 @@ showNotice("<%= render_flash %>");
 <% end %>
 
 $('.<%= @polymorphic_resource_name.pluralize %>-count').html("<%= print_count(@count, t(:'address.list')) %>");
-$("#<%= @polymorphic_resource_name.pluralize %>-tab-link").html("<%= print_count(@count, t(:'address.plural')) %>");
+//$("#<%= @polymorphic_resource_name.pluralize %>-tab-link").html("<%= print_count(@count, t(:'address.plural')) %>");
+$('.addresses-count').html("<%= @count %>");

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

@@ -0,0 +1 @@
+$('#ajax-load').html('<%=j render "gaku/addresses/addresses", nested_resources: [@polymorphic_resource] %>')

data/app/views/gaku/addresses/show/_address.html.slim

@@ -0,0 +1,9 @@
+- target ||= prepare_target(nested_resources, address) if defined?(nested_resources)
+tr id="address-#{address.id}"
+  td = address.title
+  td = address.country
+  td = address.state
+  td = address.zipcode
+  td = address.city
+  td = address.address1
+  td = address.address2

data/app/views/gaku/addresses/show/_addresses.html.slim

@@ -0,0 +1,19 @@
+- prepare_resource_name(nested_resources, :address)
+
+= panel_for "#{@resource_name.pluralize}-panel" do
+  .panel-heading
+    = print_count nested_resources.last.addresses_count, t(:'address.plural')
+  .panel-body
+    .table-responsive
+    table.table.table-condensed.table-hover
+      thead
+        tr
+          th = t(:'address.title')
+          th = t(:'address.country')
+          th = t(:'address.state.singular')
+          th = t(:'address.zipcode')
+          th = t(:'address.city')
+          th = t(:'address.address1')
+          th = t(:'address.address2')
+      tbody
+       = render partial: 'gaku/addresses/show/address', collection: nested_resources.last.addresses, as: :address, locals: {nested_resources: nested_resources}

data/app/views/gaku/addresses/soft_delete.js.erb

@@ -1,7 +1,8 @@
 showNotice("<%= render_flash %>");
 
-$("#<%= @polymorphic_resource_name.pluralize %>-tab-link").html("<%= print_count(@count, t(:'address.plural')) %>");
+//$("#<%= @polymorphic_resource_name.pluralize %>-tab-link").html("<%= print_count(@count, t(:'address.plural')) %>");
 $(".<%= @polymorphic_resource_name.pluralize %>-count").html("<%= print_count(@count, t(:'address.list')) %>");
+$('.addresses-count').html("<%= @count %>");
 
 <%- if @polymorphic_resource.addresses.reload.any? & @primary_address %>
 	$('#address-<%= @polymorphic_resource.addresses.first.id %> td a').addClass('btn-primary');

data/app/views/gaku/attachments/_attachment.html.slim

@@ -0,0 +1,2 @@
+= tr_for attachment do
+  = render 'gaku/attachments/table_fields', attachment: attachment, nested_resources: nested_resources

data/app/views/gaku/attachments/_attachments.html.slim

@@ -0,0 +1,20 @@
+= index_header do
+  = content_tag(:div,nil,  id: "new-#{@attachable_resource}", class: 'd-none')
+  .pull-left
+    = count_div "#{@attachable_resource.pluralize}-count" do
+      = print_count @exam_portion.attachments.count, t(:'attachment.list')
+  .pull-right
+    = ajax_link_to_new t(:'attachment.new'), [:new, @exam, @attachable, :attachment], id: "new-#{@attachable_resource}-link"
+
+= index_body do
+  = table_for "#{@attachable_resource.pluralize}-index" do
+    thead
+      tr
+        = th t(:'attachment.name')
+        = th t(:'attachment.description')
+        = th t(:'attachment.file_name')
+        = th t(:'attachment.file_type')
+        = th t(:'attachment.file_size')
+        = th_actions 3
+    tbody
+      =render partial: 'gaku/attachments/attachment', collection: @attachable.attachments, as: :attachment, locals: { nested_resources: nested_resources }