hackathon_manager 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4cc3f7d2686f6f8c6ef43edde9822405515135d4
-  data.tar.gz: d56facacbfd9b47a5982219314d21ea0df5911ae
+  metadata.gz: e93acd032a5487abac9bafef88d9dbde33faf550
+  data.tar.gz: 41432ab2aad72cecdcf868ed570da44985063f57
 SHA512:
-  metadata.gz: b5279168bef47676d692e045c9e3ff9ea17cf343efc3cb6bf264dd87816ee60b149f81447be866399b5f63f3179a50e0c60c5493c553b5e2ea817509b8b7f843
-  data.tar.gz: 94b98a0f6d13a0100ab5eb53064646091792230626b00bd8d6dcbfce5dc2e868473f343efeef69df129b2ac43e10978260483475b85e45164f969d6f9f905975
+  metadata.gz: ff8de464d340aa82f77a4b907dce92727bb9c1a3c0af8fb633ce574aff2e66b261af977358fb83d2f030213ca122e733feaba65d88be9e9148a486653be4be93
+  data.tar.gz: 8841655b88c7a9f1100dcfa5f44389da7e3c3e9d53af848f1142a62b5ce3527f66adbad2e24baa3d8931527c39ede46d9418ebc6b552390a580d837d4be07123

data/app/controllers/manage/questionnaires_controller.rb

@@ -109,7 +109,9 @@ class Manage::QuestionnairesController < Manage::ApplicationController
     @questionnaire.acc_status_author_id = current_user.id
     @questionnaire.acc_status_date = Time.now
 
-    unless @questionnaire.save(validate: false)
+    if @questionnaire.save(validate: false)
+      flash[:notice] = "Updated acceptance status to \"#{Questionnaire::POSSIBLE_ACC_STATUS[new_status]}\""
+    else
       flash[:notice] = "Failed to update acceptance status"
     end
 

data/app/controllers/manage/stats_controller.rb

@@ -52,13 +52,16 @@ class Manage::StatsController < Manage::ApplicationController
 
   def mlh_info
     data = Rails.cache.fetch(cache_key_for_questionnaires("mlh_info")) do
-      attributes = [:first_name,
-                    :last_name,
-                    :email,
-                    :phone]
-      select_attributes = Array.new(attributes) << :user_id
-      data = Questionnaire.select(select_attributes)
-      to_json_array(data, attributes)
+      attributes = [
+        :first_name,
+        :last_name,
+        :email,
+        :phone
+      ]
+      select_attributes = Array.new(attributes) << [:user_id, :school_id]
+      json_attribute = Array.new(attributes) << :school_name
+      data = Questionnaire.joins(:school).select(select_attributes)
+      to_json_array(data, json_attribute)
     end
     render json: { data: data }
   end

data/app/models/questionnaire.rb

@@ -93,6 +93,10 @@ class Questionnaire < ApplicationRecord
     School.find(school_id) if school_id
   end
 
+  def school_name
+    school.name if school_id
+  end
+
   def full_name
     "#{first_name} #{last_name}"
   end
@@ -193,10 +197,10 @@ class Questionnaire < ApplicationRecord
   end
 
   def queue_triggered_email_update
-    Message.queue_for_trigger("questionnaire.#{acc_status}", id) if saved_change_to_acc_status?
+    Message.queue_for_trigger("questionnaire.#{acc_status}", user_id) if saved_change_to_acc_status?
   end
 
   def queue_triggered_email_create
-    Message.queue_for_trigger("questionnaire.#{acc_status}", id)
+    Message.queue_for_trigger("questionnaire.#{acc_status}", user_id)
   end
 end

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

@@ -49,4 +49,5 @@
           %th Last name
           %th Email
           %th Phone Number
+          %th School Name
       %tbody

data/lib/hackathon_manager/version.rb

@@ -1,3 +1,3 @@
 module HackathonManager
-  VERSION = '0.6.1'.freeze
+  VERSION = '0.6.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hackathon_manager
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Stuart Olivera
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-23 00:00:00.000000000 Z
+date: 2018-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails