Merge pull request #630 from codeRIT/2.2.1

develop <- 2.2.1

Author: cbaudouinjr

app/assets/javascripts/manage/lib/setupDataTables.js

@@ -132,7 +132,8 @@ var setupDataTables = function () {
       { orderable: true, data: 'last_name' },
       { orderable: true, data: 'email' },
       { orderable: true, data: 'phone', visible: false },
-      { orderable: true, data: 'school_name' }
+      { orderable: true, data: 'school_name' },
+      { orderable: true, data: 'country' },
     ]
   });
 
@@ -144,7 +145,8 @@ var setupDataTables = function () {
       { orderable: true, data: 'last_name' },
       { orderable: true, data: 'email' },
       { orderable: true, data: 'phone' },
-      { orderable: true, data: 'school_name' }
+      { orderable: true, data: 'school_name' },
+      { orderable: true, data: 'country' }
     ]
   });
 

app/controllers/application_controller.rb

@@ -8,8 +8,7 @@ def after_sign_in_path_for(resource)
     elsif current_user.questionnaire.nil?
       new_questionnaires_path
     else
-      @questionnaire = current_user.questionnaire
-      @questionnaire.can_rsvp? ? rsvp_path : questionnaires_path
+      questionnaires_path
     end
   end
 end

app/controllers/manage/events_controller.rb

@@ -1,5 +1,6 @@
 class Manage::EventsController < Manage::ApplicationController
-  before_action :require_director
+  before_action :require_director_or_organizer, only: :index
+  before_action :require_director, except: :index
   respond_to :html, :json
 
   def index

app/controllers/manage/questionnaires_controller.rb

@@ -66,34 +66,43 @@ def update
   end
 
   def check_in
-    redirect_to_checkins = params[:redirect_to_checkins] || false
-    show_redirect_path = redirect_to_checkins ? manage_checkin_path(@questionnaire) : manage_questionnaire_path(@questionnaire)
-    index_redirect_path = redirect_to_checkins ? manage_checkins_path : manage_questionnaires_path
-    if params[:check_in] == "true"
-      if params[:questionnaire]
-        q_params = params.require(:questionnaire).permit(:phone, :can_share_info, :email)
-        email = q_params.delete(:email)
-        @questionnaire.update_attributes(q_params)
-        @questionnaire.user.update_attributes(email: email)
+    respond_to do |format|
+      format.json do
+        if params[:check_in] == "true"
+          check_in_attendee
+        elsif params[:check_in] == "false"
+          check_out_attendee
+        end
       end
-      unless @questionnaire.valid?
-        flash[:alert] = @questionnaire.errors.full_messages.join(", ")
-        redirect_to show_redirect_path
-        return
+      format.html do
+        redirect_to_checkins = params[:redirect_to_checkins] || false
+        show_redirect_path = redirect_to_checkins ? manage_checkin_path(@questionnaire) : manage_questionnaire_path(@questionnaire)
+        index_redirect_path = redirect_to_checkins ? manage_checkins_path : manage_questionnaires_path
+        if params[:check_in] == "true"
+          if params[:questionnaire]
+            q_params = params.require(:questionnaire).permit(:phone, :can_share_info, :email)
+            email = q_params.delete(:email)
+            @questionnaire.update_attributes(q_params)
+            @questionnaire.user.update_attributes(email: email)
+          end
+          unless @questionnaire.valid?
+            flash[:alert] = @questionnaire.errors.full_messages.join(", ")
+            redirect_to show_redirect_path
+            return
+          end
+          check_in_attendee
+          flash[:notice] = t(:checked_in, scope: 'messages', user_full_name: @questionnaire.user.full_name)
+        elsif params[:check_in] == "false"
+          check_out_attendee
+          flash[:notice] = t(:checked_out, scope: 'messages', user_full_name: @questionnaire.user.full_name)
+        else
+          flash[:alert] = t(:missing_check_in, scope: 'messages')
+          redirect_to show_redirect_path
+          return
+        end
+        redirect_to index_redirect_path
       end
-      @questionnaire.update_attribute(:checked_in_at, Time.now)
-      @questionnaire.update_attribute(:checked_in_by_id, current_user.id)
-      flash[:notice] = "Checked in #{@questionnaire.user.full_name}."
-    elsif params[:check_in] == "false"
-      @questionnaire.update_attribute(:checked_in_at, nil)
-      @questionnaire.update_attribute(:checked_in_by_id, current_user.id)
-      flash[:notice] = "#{@questionnaire.user.full_name} no longer checked in."
-    else
-      flash[:alert] = "No check-in action provided!"
-      redirect_to show_redirect_path
-      return
     end
-    redirect_to index_redirect_path
   end
 
   def destroy
@@ -147,6 +156,16 @@ def bulk_apply
 
   private
 
+  def check_in_attendee
+    @questionnaire.update_attribute(:checked_in_at, Time.now)
+    @questionnaire.update_attribute(:checked_in_by_id, current_user.id)
+  end
+
+  def check_out_attendee
+    @questionnaire.update_attribute(:checked_in_at, nil)
+    @questionnaire.update_attribute(:checked_in_by_id, current_user.id)
+  end
+
   def questionnaire_params
     # Note that this ONLY considers parameters for the questionnaire, not the user.
     # TODO: Refactor "email" out to user as first_name and last_name were

app/datatables/applied_datatable.rb

@@ -8,6 +8,7 @@ def view_columns
       last_name: { source: "User.last_name" },
       email: { source: "User.email" },
       phone: { source: "Questionnaire.phone" },
+      country: { source: "Questionnaire.country" },
       school_name: { source: "School.name" }
     }
   end
@@ -22,6 +23,7 @@ def data
         last_name: record.user.last_name,
         email: record.user.email,
         phone: record.phone,
+        country: record.country,
         school_name: record.school_name
       }
     end

app/datatables/checked_in_datatable.rb

@@ -8,6 +8,7 @@ def view_columns
       last_name: { source: "User.last_name" },
       email: { source: "User.email" },
       phone: { source: "Questionnaire.phone" },
+      country: { source: "Questionnaire.country" },
       school_name: { source: "School.name" }
     }
   end
@@ -22,6 +23,7 @@ def data
         last_name: record.user.last_name,
         email: record.user.email,
         phone: record.phone,
+        country: record.country,
         school_name: record.school_name
       }
     end

app/datatables/questionnaire_datatable.rb

@@ -15,6 +15,7 @@ def view_columns
       checked_in: { source: "Questionnaire.checked_in_at", searchable: false },
       boarded_bus: { source: "Questionnaire.boarded_bus_at", searchable: false },
       bus_captain: { source: "Questionnaire.is_bus_captain", searchable: false },
+      country: { source: "Questionnaire.country" },
       school: { source: "School.name" },
       created_at: { source: "Questionnaire.created_at", searchable: false },
       dietary_restrictions: { source: "Questionnaire.dietary_restrictions", searchable: true },
@@ -62,6 +63,7 @@ def data
         boarded_bus: yes_no_display(record.boarded_bus?),
         bus_captain: bus_captain(record),
         school: link_to(record.school.name, manage_school_path(record.school)),
+        country: record.country,
         created_at: record.created_at.present? ? display_datetime(record.created_at) : "",
         dietary_restrictions: record.dietary_restrictions,
         special_needs: record.special_needs,

app/jobs/generate_data_export_job.rb

@@ -54,10 +54,10 @@ def generate__sponsor_dump(data_export, attendee_type)
       resume_paths = []
       questionnaires.each do |q|
         csv_row = [
-          q.first_name,
-          q.last_name,
+          q.user.first_name,
+          q.user.last_name,
+          q.user.email,
           q.school_name,
-          q.email,
           q.vcs_url,
           q.portfolio_url,
         ]
@@ -81,7 +81,7 @@ def generate__sponsor_dump(data_export, attendee_type)
       csvfile_name = "000-Attendees.csv"
       csvfile_path = File.join(folder_path, csvfile_name)
       CSV.open(csvfile_path, "wb") do |csv|
-        csv << ["Fist name", "Last name", "School", "Email", "VCS URL", "Portfolio URL", "Resume filename"]
+        csv << ["First name", "Last name", "Email", "School", "VCS URL", "Portfolio URL", "Resume Filename"]
         csv_data.each do |row|
           csv << row
         end

app/models/data_export.rb

@@ -40,8 +40,8 @@ def queued?
   def enqueue!
     raise "Data export has already been queued" unless status == "created_not_queued"
 
-    GenerateDataExportJob.perform_later(self)
     update_attribute(:queued_at, Time.now)
+    GenerateDataExportJob.perform_later(self)
   end
 
   def status

app/models/questionnaire.rb

@@ -22,8 +22,7 @@ class Questionnaire < ApplicationRecord
   validates_uniqueness_of :user_id
 
   validates_presence_of :phone, :date_of_birth, :school_id, :experience, :shirt_size, :interest
-  validates_presence_of :gender, :major, :level_of_study, :graduation_year, :race_ethnicity
-  validates :country, presence:  { message: %[information is missing from application. Please update your <a href="#{Rails.application.routes.url_helpers.edit_questionnaires_path}">Application</a>] }
+  validates_presence_of :gender, :major, :level_of_study, :graduation_year, :race_ethnicity, :country
 
   DIETARY_SPECIAL_NEEDS_MAX_LENGTH = 500
   validates_length_of :dietary_restrictions, maximum: DIETARY_SPECIAL_NEEDS_MAX_LENGTH