hackathon_manager 0.12.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 175ea3d064207e89723ec62b6728adc537d29f195c2dff8fa203042e2dfe32ea
-  data.tar.gz: a32a72ffe843713f7313c8dec519e63114b74341c96863f924b6f1d8bbdce903
+  metadata.gz: 38ec6a89224e9425dbbf6a08e05dc282517ce6a9ecf6c5905967c7a71acbdd62
+  data.tar.gz: 461e4c1c853153cade1c635e92939e8f4207b06c13b39a5ba5559110d14beeb6
 SHA512:
-  metadata.gz: 3f12381081f623c54fcb89ede14b0518b7bf5f1ff143587cd7bbfc95c57fab04e9541aedf62ffae3fd244cb1d24f6402a53a0d91ca4d1295c5606e6f8676f208
-  data.tar.gz: 676fb9d13963f49b11b9b1015c387ace9176259149c03f2348fb76bf7112f239dcc0a29571492ab799ac5d0fd5268aa74ce11bd24c25345194977472d9af523b
+  metadata.gz: 787250f12418e9824e8a87ea77d026116623e4b1d56c5f1e1d00dbe2a43d94393adc48326e55590514ed7f08eb9fe0f4cf0e72277e8fc3085159b1f00b246633
+  data.tar.gz: a8572e718b57f1c3bc45b1854e9b6f9bf4a3b6c5b22b78c52069c0f277fd71e751fe7fb6386b7d4f92f459184eb0edc45c2e36e49597d536a8d587f78f078227

data/app/assets/javascripts/hackathon_manager/application.js

@@ -13,5 +13,7 @@
 //= require jquery
 //= require jquery_ujs
 //= require jquery.ui.autocomplete
+//= require highcharts
+//= require chartkick
 //= require_directory .
 //= require ./vendor/simplemde.min.js

data/app/controllers/manage/questionnaires_controller.rb

@@ -149,7 +149,7 @@ class Manage::QuestionnairesController < Manage::ApplicationController
       :phone, :can_share_info, :code_of_conduct_accepted,
       :travel_not_from_school, :travel_location, :data_sharing_accepted,
       :graduation_year, :race_ethnicity, :resume, :delete_resume, :why_attend,
-      :is_bus_captain
+      :bus_list_id, :is_bus_captain
     )
   end
 

data/app/datatables/questionnaire_datatable.rb

@@ -22,12 +22,21 @@ class QuestionnaireDatatable < AjaxDatatablesRails::Base
 
   private
 
+  def note(record)
+    output = ''
+    output += '<i class="fa fa-exclamation-triangle icon-space-r"></i> <small>Minor</small>' if record.minor?
+    output += '<i class="fa fa-bus icon-space-r" title="Bus Captain"></i>' if record.bus_list_id?
+    output += '<small>Captain</small>' if record.is_bus_captain?
+    output = '<div class="center">' + output + '</div>' if output.present?
+    output.html_safe
+  end
+
   def data
     records.map do |record|
       {
         bulk: current_user.admin_limited_access ? '' : "<input type=\"checkbox\" data-bulk-row-edit=\"#{record.id}\">".html_safe,
         link: link_to('<i class="fa fa-search"></i>'.html_safe, manage_questionnaire_path(record)),
-        note: record.minor? ? '<div class="center"><i class="fa fa-exclamation-triangle icon-space-r"></i> Minor</div>'.html_safe : '',
+        note: note(record),
         id: record.id,
         first_name: bold(record.first_name),
         last_name: bold(record.last_name),

data/app/views/application/_bus_list_stats.html.haml

@@ -1,9 +1,20 @@
-%p
-  - accepted = Questionnaire.joins(:school).where("bus_list_id = '#{bus_list.id}' AND acc_status = 'accepted'").count
-  = pluralize(accepted, 'person has', 'people have')
-  been accepted but not yet RSVP'd.
+- passengers = Questionnaire.joins(:school).group('schools.name').where(acc_status: 'rsvp_confirmed', bus_list_id: @bus_list.id).order("schools.name ASC").count
+= pie_chart passengers
 
-%p
-  - accepted = Questionnaire.joins(:school).where("bus_list_id = '#{bus_list.id}' AND acc_status = 'rsvp_confirmed'").count
-  = pluralize(accepted, 'person has', 'people have')
-  RSVP'd as attending but didn't sign up for the bus.
+%br
+
+:ruby
+  school_ids = Questionnaire.where(acc_status: 'rsvp_confirmed', bus_list_id: @bus_list.id).distinct.pluck(:school_id)
+  schools = Questionnaire.joins(:school).group('schools.name').where(school_id: school_ids, acc_status: 'rsvp_confirmed').order("schools.name ASC").count
+  schools_riding = Questionnaire.joins(:school).group('schools.name').where(school_id: school_ids, acc_status: 'rsvp_confirmed', bus_list_id: @bus_list.id).count
+  schools = schools.map do |name, count|
+    bus_count_row = schools_riding.select { |school_bus_name, _| school_bus_name == name }
+    bus_count = bus_count_row ? bus_count_row[name] || 0 : 0
+    count_without_bus = count - bus_count
+    [name, count_without_bus, bus_count]
+  end
+  data = [
+    { name: "Attending but not riding this bus", data: schools.sort_by { |_, no_bus, bus| [bus, no_bus] }.reverse },
+    { name: "Riding this bus", data: schools_riding }
+  ]
+= bar_chart data, stacked: true, height: '400px'

data/app/views/layouts/hackathon_manager/application.html.haml

@@ -15,10 +15,10 @@
     = render "layouts/hackathon_manager/header"
     = render "layouts/hackathon_manager/account_nav"
     = render "layouts/hackathon_manager/flashes"
+    = javascript_include_tag "hackathon_manager/application"
     #main
       %section.section
         .container
           = yield
     = render "layouts/hackathon_manager/footer"
-    = javascript_include_tag "hackathon_manager/application"
     = render "layouts/hackathon_manager/shared_footer"

data/app/views/manage/bus_lists/show.html.haml

@@ -109,5 +109,8 @@
                   - else
                     = link_to "Make Bus Captain", toggle_bus_captain_manage_bus_list_path(@bus_list, questionnaire_id: p.id, bus_captain: '1'), method: 'post', data: { confirm: 'Are you sure? This will send a confirmation email to the bus captain.' }
 
-    .alert.alert-info
-      = render partial: 'bus_list_stats', locals: { bus_list: @bus_list }
+.row.mt-2.mb-4
+  .col
+    %h4.border-bottom.pb-2.mb-4
+      Passenger Distribution
+    = render partial: 'bus_list_stats', locals: { bus_list: @bus_list }

data/app/views/manage/questionnaires/_form.html.haml

@@ -48,7 +48,7 @@
       = f.input :travel_not_from_school, label: "I will not be traveling from my school"
       = f.input :travel_location, input_html: { "data-validate" => "presence", disabled: !travel_state }, wrapper_html: { style: travel_state ? "" : "display: none" }, label: "Travel Location"
 
-      = f.input :bus_list_id, label: "Bus list"
+      = f.association :bus_list, label: "Bus list", include_blank: 'Not travelling on a sponsored bus'
       = f.input :is_bus_captain, label: "Is Bus Captain"
 
     %hr

data/app/views/manage/questionnaires/_overview.html.haml

@@ -95,6 +95,20 @@
               = @questionnaire.special_needs
             - else
               %span.text-muted (none)
+          %dt.col-md-4 Bus list
+          %dd.col-md-8
+            - if @questionnaire.bus_list_id?
+              = link_to @questionnaire.bus_list.name, manage_bus_list_path(@questionnaire.bus_list_id)
+            - else
+              %span.text-muted (none)
+          %dt.col-md-4 Bus captain
+          %dd.col-md-8
+            - if @questionnaire.is_bus_captain?
+              %strong.text-danger Is bus captain
+            - elsif @questionnaire.bus_captain_interest?
+              %strong.text-success Interested in being a captain
+            - else
+              %span.text-muted No
           %dt.col-md-4 Traveling from
           %dd.col-md-8
             = @questionnaire.travel_not_from_school ? "Somewhere else (#{@questionnaire.travel_location})" : "<span class=\"text-muted\">My school</span>".html_safe

data/lib/hackathon_manager/version.rb

@@ -1,3 +1,3 @@
 module HackathonManager
-  VERSION = '0.12.0'.freeze
+  VERSION = '0.12.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hackathon_manager
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
 platform: ruby
 authors:
 - Stuart Olivera