Merge branch '2.1' into master

Author: cbaudouinjr

app/controllers/users_controller.rb

@@ -7,8 +7,6 @@ def logged_in
   end
 
   def show
-    respond_to do |format|
-      format.json { render json: current_user }
-    end
+    render json: current_user
   end
 end

app/models/message.rb

@@ -38,6 +38,7 @@ class Message < ApplicationRecord
     "questionnaire.rsvp_confirmed" => "Questionnaire Status: RSVP Confirmed",
     "questionnaire.rsvp_denied" => "Questionnaire Status: RSVP Denied",
     "questionnaire.rsvp_reminder" => "Questionnaire: RSVP Reminder",
+    "questionnaire.checked-in" => "Questionnaire: Checked in",
     "user.24hr_incomplete_application" => "User: Incomplete application (24 hours later)",
     "bus_list.new_captain_confirmation" => "Bus List: New captain confirmation",
     "bus_list.notes_update" => "Bus List: Updated notes (manually triggered)"

app/models/questionnaire.rb

@@ -11,6 +11,7 @@ class Questionnaire < ApplicationRecord
   after_create :queue_triggered_email_create
   after_update :queue_triggered_email_update
   after_update :queue_triggered_email_rsvp_reminder
+  after_update :queue_triggered_email_checked_in
   after_save :update_school_questionnaire_count
   after_destroy :update_school_questionnaire_count
 
@@ -257,6 +258,11 @@ def queue_triggered_email_create
     Message.queue_for_trigger("questionnaire.#{acc_status}", user_id)
   end
 
+  def queue_triggered_email_checked_in
+    return unless saved_change_to_checked_in_at && checked_in?
+    Message.queue_for_trigger("questionnaire.checked-in", user_id)
+  end
+
   def queue_triggered_email_rsvp_reminder
     return unless saved_change_to_acc_status? && acc_status == "accepted"
 

app/models/user.rb

@@ -90,4 +90,10 @@ def self.non_organizer
   def self.without_questionnaire
     non_organizer.left_outer_joins(:questionnaire).where(questionnaires: { id: nil })
   end
+
+  def as_json(options = {})
+    result = super
+    result['questionnaire_id'] = Questionnaire.where(user_id: id).any? ? Questionnaire.where(user_id: id).first.id : nil
+    result
+  end
 end

app/views/layouts/manage/application.html.haml

@@ -12,14 +12,16 @@
     = csrf_meta_tags
 
   %body
-    %nav.navbar.navbar-dark.fixed-top.bg-dark.flex-nowrap.p-0.shadow
+    %nav.navbar.navbar-expand.navbar-dark.fixed-top.bg-dark.flex-nowrap.p-0.shadow
       %a.navbar-brand.col-xs-6.col-sm-3.col-md-2.mr-0{href: manage_root_path} #{HackathonConfig['name']} Manager
       / %input.form-control.form-control-dark.w-100{"aria-label" => "Search", placeholder: "Search", type: "text"}/
-      %span.navbar-brand.navbar-mobile-toggle.mr-0.pl-3.pr-3{onclick: 'toggleMobileNav()'}
-        .fa.fa-bars.fa-fw.icon-space-r-half
-      %ul.navbar-nav.px-3
+      %ul.navbar-nav.ml-auto.px-3
+        %li.nav-item.text-nowrap
+          = link_to "Account", root_path, class: "nav-link"
         %li.nav-item.text-nowrap
           = link_to "Sign out", destroy_user_session_path, method: :delete, class: "nav-link"
+      %span.navbar-brand.navbar-mobile-toggle.mr-0.pl-3.pr-3{onclick: 'toggleMobileNav()'}
+        .fa.fa-bars.fa-fw.icon-space-r-half
 
     .container-fluid
       .row

test/models/questionnaire_test.rb

@@ -488,6 +488,21 @@ class QuestionnaireTest < ActiveSupport::TestCase
         create(:questionnaire, acc_status: "pending")
       end
     end
+
+    should "send triggered email on checked in" do
+      create(:message, trigger: "questionnaire.checked-in")
+      assert_difference "enqueued_jobs.size", 1 do
+        create(:questionnaire, checked_in_at: Time.now)
+      end
+    end
+
+    should "not send triggered email on checked out" do
+      create(:message, trigger: "questionnaire.checked-in")
+      questionnaire = create(:questionnaire, checked_in_at: Time.now)
+      assert_difference "enqueued_jobs.size", 0 do
+        questionnaire.update_attribute(:checked_in_at, nil)
+      end
+    end
   end
 
   should "clean up bus-related fields when changing RSVP" do