hackathon_manager 0.12.1 → 0.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38ec6a89224e9425dbbf6a08e05dc282517ce6a9ecf6c5905967c7a71acbdd62
-  data.tar.gz: 461e4c1c853153cade1c635e92939e8f4207b06c13b39a5ba5559110d14beeb6
+  metadata.gz: 220ec7094ad0a190a71e4064736d8c707558cbd48775941022294f9aa6b4b14f
+  data.tar.gz: 36170ae1c9b391f39aa44a0abd3aeefec5eed045b3bfd24822114d76e5ee5392
 SHA512:
-  metadata.gz: 787250f12418e9824e8a87ea77d026116623e4b1d56c5f1e1d00dbe2a43d94393adc48326e55590514ed7f08eb9fe0f4cf0e72277e8fc3085159b1f00b246633
-  data.tar.gz: a8572e718b57f1c3bc45b1854e9b6f9bf4a3b6c5b22b78c52069c0f277fd71e751fe7fb6386b7d4f92f459184eb0edc45c2e36e49597d536a8d587f78f078227
+  metadata.gz: 87b23b3213fe9e6be20e4abb2d9649d615dbf48ff01c2a711bd938e4b15f5076f311ee524e5470f46ada7119a3bd952034f2d8b58ba4699cc17b908578a97df9
+  data.tar.gz: 259d7ca3386713bc78a14d09ff8f0610833d14fd606c3ca36389204be3d9a5681604bdebb1089e9b5f90fa2f988e2ea16608caae2bc41f9f2ec5a3da609d1176

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

@@ -1,6 +1,12 @@
 $(document).ready(function() {
+
   $checkboxes = $('[data-boarded-bus]');
 
+  function updateCount() {
+    var count = $checkboxes.filter(':checked').length
+    $('#boarded-bus-count').text(count + ' boarded')
+  }
+
   if ($checkboxes.length < 1) {
     return;
   }
@@ -24,6 +30,7 @@ $(document).ready(function() {
       alert("Request failed, please refresh the page or try again later.");
     }).always(function() {
       $('[type=submit][data-bulk-row-edit]').prop('disabled', false);
+      updateCount()
     });
   });
 });

data/app/datatables/questionnaire_datatable.rb

@@ -25,7 +25,7 @@ class QuestionnaireDatatable < AjaxDatatablesRails::Base
   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 += '<i class="fa fa-bus icon-space-r" title="Riding bus"></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

data/app/models/bus_list.rb

@@ -22,6 +22,10 @@ class BusList < ApplicationRecord
     passengers.select(&:checked_in?)
   end
 
+  def boarded_passengers
+    passengers.select(&:boarded_bus?)
+  end
+
   def captains
     passengers.where(is_bus_captain: true)
   end

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

@@ -22,7 +22,9 @@
 
   %p
     %strong Passengers:
-    = "(#{@bus_list.passengers.count} total, #{@bus_list.checked_in_passengers.count} checked in)"
+    (#{@bus_list.passengers.count} total,
+    <span id="boarded-bus-count">#{@bus_list.boarded_passengers.count} boarded</span>,
+    #{@bus_list.checked_in_passengers.count} checked in)
 
   %table.table
     %thead

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

@@ -46,7 +46,7 @@
   .col
     %h4.pb-2
       Passengers
-      %small.text-muted (#{@bus_list.passengers.count} total, #{@bus_list.checked_in_passengers.count} checked in)
+      %small.text-muted (#{@bus_list.passengers.count} total, #{@bus_list.boarded_passengers.count} boarded, #{@bus_list.checked_in_passengers.count} checked in)
 
     %table.table
       %thead

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

@@ -101,6 +101,13 @@
               = link_to @questionnaire.bus_list.name, manage_bus_list_path(@questionnaire.bus_list_id)
             - else
               %span.text-muted (none)
+          - if @questionnaire.bus_list_id?
+            %dt.col-md-4 Boarded bus?
+            %dd.col-md-8
+              - if @questionnaire.boarded_bus?
+                Yes
+              - else
+                No
           %dt.col-md-4 Bus captain
           %dd.col-md-8
             - if @questionnaire.is_bus_captain?

data/lib/hackathon_manager/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hackathon_manager
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.12.2
 platform: ruby
 authors:
 - Stuart Olivera
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-16 00:00:00.000000000 Z
+date: 2019-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails