hackathon_manager 0.13.8 → 0.13.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e19ab7e38fc596fcef9abf2ce3022aaf39bd89df79376781b37de78460032b82
-  data.tar.gz: ba676426b9a47d85ea061072c8b11fa2626eb24feb281174beb4207b0776f570
+  metadata.gz: d2a08f6072d0cd24110a7713e93b2d51f638d6d5db69b4161a5ac3b435ff110a
+  data.tar.gz: dd293ca99e1691f209cc2805b16d4622eea6873fafeefba89b1037d0b8191898
 SHA512:
-  metadata.gz: c69617993bdddbc4ea0976e4268adf0e7cd243d4b29fcd74bc167820c569540a99050c746edd2f83dfdc2c2eb2f309bd7499916326cde3708cdd1aaa60094bb5
-  data.tar.gz: 86a66ad0595e7f8800032eef2f1d14f8daf8fad9891d5560ea246e03f1fac038927e26b6f87bebc504a534fc0ba749419a8b86a70604eda4a5970e5fe41a7c21
+  metadata.gz: 245becf5bdc9914218fcc6f20e4f00a19b6ff1dc5e4f66221e053d032070c8ac9917b64b929ebc32ff59516909d441ff6919bc5f8763981177f6ea7ef9970774
+  data.tar.gz: e376e3324f1ce9bf63a1706ef22f0f637a6252e42c9e96cb08b6a2e2135259a89815742116eccc44260140eafeee440dd44affbed1760aa466ac41be8df4bd47

data/app/controllers/manage/dashboard_controller.rb

@@ -10,7 +10,14 @@ class Manage::DashboardController < Manage::ApplicationController
   end
 
   def todays_activity_data
-    render json: activity_chart_data(["Applications", "Confirmations", "Denials", "Non-Applied Users"], "hour", Time.zone.today.beginning_of_day..Time.zone.today.end_of_day)
+    where_filter = nil
+    types = ["Applications", "Confirmations", "Denials"]
+    if params[:school_id]
+      where_filter = { school_id: params[:school_id] }
+    else
+      types << "Non-Applied Users"
+    end
+    render json: activity_chart_data(types, "hour", Time.zone.today.beginning_of_day..Time.zone.today.end_of_day, where_filter)
   end
 
   def todays_stats_data
@@ -24,7 +31,11 @@ class Manage::DashboardController < Manage::ApplicationController
   end
 
   def confirmation_activity_data
-    render json: activity_chart_data(["Confirmations", "Denials"], "day", 3.week.ago..Time.zone.now)
+    where_filter = nil
+    if params[:school_id]
+      where_filter = { school_id: params[:school_id] }
+    end
+    render json: activity_chart_data(["Confirmations", "Denials"], "day", 3.week.ago..Time.zone.now, where_filter)
   end
 
   def application_activity_data
@@ -95,24 +106,25 @@ class Manage::DashboardController < Manage::ApplicationController
 
   private
 
-  def activity_chart_data(types, group_type, range)
+  def activity_chart_data(types, group_type, range, where_filter = nil)
     chart_data = []
     types.each do |type|
       case type
       when "Applications"
-        data = Questionnaire.send("group_by_#{group_type}", :created_at, range: range).count
+        data = Questionnaire.send("group_by_#{group_type}", :created_at, range: range)
       when "RIT Applications"
-        data = Questionnaire.where("school_id = \"2304\"").send("group_by_#{group_type}", :created_at, range: range).count
+        data = Questionnaire.where("school_id = \"2304\"").send("group_by_#{group_type}", :created_at, range: range)
       when "Non-RIT Applications"
-        data = Questionnaire.where("school_id != \"2304\"").send("group_by_#{group_type}", :created_at, range: range).count
+        data = Questionnaire.where("school_id != \"2304\"").send("group_by_#{group_type}", :created_at, range: range)
       when "Confirmations"
-        data = Questionnaire.where(acc_status: "rsvp_confirmed").send("group_by_#{group_type}", :acc_status_date, range: range).count
+        data = Questionnaire.where(acc_status: "rsvp_confirmed").send("group_by_#{group_type}", :acc_status_date, range: range)
       when "Denials"
-        data = Questionnaire.where(acc_status: "rsvp_denied").send("group_by_#{group_type}", :acc_status_date, range: range).count
+        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).count
+        data = User.without_questionnaire.send("group_by_#{group_type}", "users.created_at", range: range)
       end
-      chart_data << { name: type, data: data }
+      data = data.where(where_filter) if where_filter && type != "Non-Applied Users"
+      chart_data << { name: type, data: data.count }
     end
     chart_data
   end

data/app/controllers/manage/trackable_tags_controller.rb

@@ -8,7 +8,7 @@ class Manage::TrackableTagsController < Manage::ApplicationController
 
   # GET /manage/trackable_tags
   def index
-    @trackable_tags = TrackableTag.all
+    @trackable_tags = TrackableTag.all.order("name ASC")
     respond_with(:manage, @trackable_tags)
   end
 

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

@@ -22,7 +22,7 @@
   .col-7
     %h5.dashboard-container-title  Today's Activity
     = area_chart todays_activity_data_manage_dashboard_index_path, colors: [blue, green, red, grey]
-  .col
+  .col-5
     %h5.dashboard-container-title Today's Stats
     = pie_chart todays_stats_data_manage_dashboard_index_path, colors: [blue, green, red, grey]
 

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

@@ -1,3 +1,9 @@
+- blue = "#4886C2"
+- green = "#7FEC8D"
+- red = "#E44646"
+- orange = "#F49C54"
+- grey = "#A6A6A6"
+
 = render "layouts/manage/page_title", title: @school.name, subtitle: "School" do
   .btn-group
     = link_to 'Edit', edit_manage_school_path(@school), class: 'btn btn-sm btn-outline-secondary'
@@ -56,9 +62,24 @@
       %span.fa.fa-info-circle.icon-space-l.icon-space-r-half
       If someone attempts to apply using a name above, they'll automatically be converted to this school.
 
+.row.mt-2.mb-4
+  .col-7
+    %h4.border-bottom.pb-2.mb-4 Today's Activity
+    = area_chart todays_activity_data_manage_dashboard_index_path(school_id: @school.id), colors: [blue, green, red, grey]
+  .col-5
+    %h4.border-bottom.pb-2.mb-4 Total Distribution
+    = pie_chart @school.questionnaires.group('acc_status').count
+
+.row.mt-2.mb-4
+  .col
+    %h4.border-bottom.pb-2.mb-4 Confirmation Activity
+    = area_chart confirmation_activity_data_manage_dashboard_index_path(school_id: @school.id), colors: [green, red], library: { legend: { enabled: false } }
+
 .row.mt-2
   .col
-    %h4.pb-0 Questionnaires
+    %h4.pb-0
+      Questionnaires
+      %small.text-muted (#{@school.questionnaires.count} total)
     %table.table
       %caption #{@school.questionnaires.count} total
       %thead

data/lib/hackathon_manager/version.rb

@@ -1,3 +1,3 @@
 module HackathonManager
-  VERSION = '0.13.8'.freeze
+  VERSION = '0.13.9'.freeze
 end

metadata

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