hackathon_manager 0.13.10 → 0.13.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aaa095607cc9ed17e594f173fcc0bd5ccc0826c3503d581b60a431b8e3816317
-  data.tar.gz: 2b46252b061915d80c1095246a3e78932765568cb55333b2e0b5c89df54aca35
+  metadata.gz: f53405ab4318feef8a9761d61a8caab8a3b15ee84040b1065b62633432adca1e
+  data.tar.gz: 9a67eded41cd30dc3d428098207aed0273581ef223858090453ddfcb1a72065f
 SHA512:
-  metadata.gz: 3f13ac65bb41516c115bd18d3de2925f66710500df32a559a9917211958f95b1ff7bad4fe4fc61cc4964124e6f02f4241e07780afc18c67a1de7d21f17d4ad19
-  data.tar.gz: f181edfd9e49c12405ed5bfa7733fb3628eac56f83456fd4707c2802f3426d7779be087ccec6593b23ef95f35fe420d11e159d5d9f9bd2d2a019f39ed5901144
+  metadata.gz: c161eee3d5f9d47e0d2f471e64ca9dd510ea1d37d2475e83cd5c8e418cda3b4bfde76162abbf195026bde120ab54b2d032427a59d3b77a710af34f33de11a1f1
+  data.tar.gz: 714a2191b9ccf482088f653b851c1605e80c4d9b7633ab638cd41186284ad2688ba76fe1b68d9b8f446c03a2a6f845535b7df2ad1f374ea1f1363930d00de350

data/app/controllers/manage/dashboard_controller.rb

@@ -30,6 +30,10 @@ class Manage::DashboardController < Manage::ApplicationController
     }
   end
 
+  def checkin_activity_data
+    render json: activity_chart_data(["Checked In", "Boarded Bus"], "hour", 3.days.ago..Time.zone.now)
+  end
+
   def confirmation_activity_data
     where_filter = nil
     if params[:school_id]
@@ -122,6 +126,10 @@ class Manage::DashboardController < Manage::ApplicationController
         data = Questionnaire.where(acc_status: "rsvp_denied").send("group_by_#{group_type}", :acc_status_date, range: range)
       when "Non-Applied Users"
         data = User.without_questionnaire.send("group_by_#{group_type}", "users.created_at", range: range)
+      when "Checked In"
+        data = Questionnaire.where("checked_in_at > 0").send("group_by_#{group_type}", :checked_in_at, range: range)
+      when "Boarded Bus"
+        data = Questionnaire.where("boarded_bus_at > 0").send("group_by_#{group_type}", :boarded_bus_at, range: range)
       end
       data = data.where(where_filter) if where_filter && type != "Non-Applied Users"
       chart_data << { name: type, data: data.count }

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

@@ -6,7 +6,8 @@
     %thead
       %tr
         %th Name
-        %th Capacity
+        %th Filled / Capacity
+        %th Boarded / Checked in
         %th Needs bus captain?
         %th Schools
 
@@ -16,5 +17,9 @@
           %td
             %strong= link_to(bus_list.name, manage_bus_list_path(bus_list))
           %td #{bus_list.passengers.count} / #{bus_list.capacity}
-          %td= bus_list.needs_bus_captain ? "<strong class=\"text-danger\">Needs bus captain</strong>".html_safe : "No"
+          %td #{bus_list.boarded_passengers.count} / #{bus_list.checked_in_passengers.count}
+          %td
+            = pluralize bus_list.captains.count, "captain"
+            &ndash;
+            = bus_list.needs_bus_captain ? "<strong class=\"text-danger\">Needs bus captain</strong>".html_safe : "No"
           %td= bus_list.schools.count

data/app/views/manage/dashboard/index.html.haml

@@ -26,12 +26,21 @@
     %h5.dashboard-container-title Today's Stats
     = pie_chart todays_stats_data_manage_dashboard_index_path, colors: [blue, green, red, grey]
 
+- if Questionnaire.where('checked_in_at > 0').any? || Questionnaire.where('boarded_bus_at > 0').any?
+  .row
+    .col
+      %h5.dashboard-container-title Check-in activity
+      .graph-overlay.double-metrics
+        %h3= Questionnaire.where('checked_in_at > 0').count
+        %p total checked in
+        %h3= Questionnaire.where('boarded_bus_at > 0').count
+        %p total boarded bus
+      = area_chart checkin_activity_data_manage_dashboard_index_path, colors: [orange, blue], library: { legend: { enabled: false } }
+
 .row
   .col
     %h5.dashboard-container-title Confirmation Activity
-    .graph-overlay.double-metrics
-      %h3= Questionnaire.where("checked_in_at != 0").count
-      %p total checked in
+    .graph-overlay
       %h3= Questionnaire.where(acc_status: "rsvp_confirmed").count
       %p total confirmed
     = area_chart confirmation_activity_data_manage_dashboard_index_path, colors: [green, red], library: { legend: { enabled: false } }

data/config/routes.rb

@@ -32,6 +32,7 @@ Rails.application.routes.draw do
       get :map_data, on: :collection
       get :todays_activity_data, on: :collection
       get :todays_stats_data, on: :collection
+      get :checkin_activity_data, on: :collection
       get :confirmation_activity_data, on: :collection
       get :application_activity_data, on: :collection
       get :schools_confirmed_data, on: :collection

data/lib/hackathon_manager/version.rb

@@ -1,3 +1,3 @@
 module HackathonManager
-  VERSION = '0.13.10'.freeze
+  VERSION = '0.13.11'.freeze
 end

metadata

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