Merged WebPredict/tech-screen into master

Author: scottshidlovsky

Gemfile

@@ -22,6 +22,10 @@ gem 'newrelic_rpm'
 gem 'chartkick'
 gem 'groupdate'
 
+gem 'font-awesome-rails'
+gem 'jquery-ui-rails'
+gem "wysiwyg-rails"
+
 group :development, :test do
  gem 'sqlite3', '1.3.9'
  gem 'byebug', '3.4.0'

Gemfile.lock

@@ -105,6 +105,8 @@ GEM
  fog-softlayer (0.4.1)
  fog-core
  fog-json
+ font-awesome-rails (4.3.0.0)
+ railties (>= 3.2, < 5.0)
  formatador (0.2.5)
  globalid (0.3.3)
  activesupport (>= 4.1.0)
@@ -134,6 +136,8 @@ GEM
  rails-dom-testing (~> 1.0)
  railties (>= 4.2.0)
  thor (>= 0.14, < 2.0)
+ jquery-ui-rails (5.0.3)
+ railties (>= 3.2.16)
  json (1.8.2)
  listen (2.8.5)
  celluloid (>= 0.15.2)
@@ -259,6 +263,9 @@ GEM
  railties (~> 4.0)
  sprockets-rails (>= 2.0, < 4.0)
  will_paginate (3.0.7)
+ wysiwyg-rails (1.2.6)
+ font-awesome-rails (>= 4.2.0.0)
+ railties (>= 3.2, < 5.0)
 
 PLATFORMS
  ruby
@@ -275,10 +282,12 @@ DEPENDENCIES
  coffee-rails (= 4.1.0)
  faker (= 1.4.2)
  fog (= 1.23.0)
+ font-awesome-rails
  groupdate
  guard-minitest (= 2.3.1)
  jbuilder (= 2.2.3)
  jquery-rails (= 4.0.3)
+ jquery-ui-rails
  mini_backtrace (= 0.1.3)
  mini_magick (= 3.8.0)
  minitest-reporters (= 1.0.5)
@@ -295,3 +304,4 @@ DEPENDENCIES
  uglifier (= 2.5.3)
  web-console (= 2.0.0.beta3)
  will_paginate (= 3.0.7)
+ wysiwyg-rails

app/assets/javascripts/application.js

@@ -14,4 +14,27 @@
 //= require jquery_ujs
 //= require bootstrap
 //= require turbolinks
+//= require jquery-ui
+//= require froala_editor.min.js
+//= require plugins/font_family.min.js
+//= require plugins/font_size.min.js
+//= require plugins/file_upload.min.js
+//= require plugins/lists.min.js
 //= require_tree .
+
+var ready;
+ready = (function() {
+ $('a[href="' + this.location.pathname + '"]').parent().addClass('active');
+ $("#navbar-search-input").autocomplete({
+ source: '/categories/autocomplete.json',
+ });
+});
+
+// $('#search-questions-form').bind("change keyup",function() {
+// alert('change keyup called');
+// $('#search-questions-form').submit();
+// });
+
+$(document).ready(ready);
+$(document).on('page:load', ready);
+

app/assets/stylesheets/application.css

@@ -10,6 +10,10 @@
  * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
  * file per style scope.
  *
+ *= require jquery-ui
+ *= require froala_editor.min.css
+ *= require froala_style.min.css
+ *= require font-awesome
  *= require_tree .
  *= require_self
  */

app/assets/stylesheets/custom.css.scss

@@ -98,12 +98,18 @@ footer {
  float: left;
  }
  ul {
- float: right;
  list-style: none;
  li {
- float: left;
- margin-left: 15px;
- }
+ float: left;
+ margin-left: 8px;
+ }
+ }
+
+ .centered_list {
+ width: 100%;
+ float: none;
+ text-align: center;
+ margin-left: 15px;
  }
 }
 
@@ -152,13 +158,13 @@ aside {
 }
 
 .row {
- margin-left: 5%;
- margin-right: 5%;
+ margin-left: 2%;
+ margin-right: 2%;
 }
 
 .page-header {
- margin-left: 5%;
- margin-right: 5%;
+ margin-left: 2%;
+ margin-right: 2%;
 }
 
 .padded-col {
@@ -167,6 +173,12 @@ aside {
  font-size: 1.2em;
 }
 
+.btn-table {
+ td {
+ padding: 1px;
+ }
+}
+
 @media (min-width: 993px) {
  .mobile-section {
  display: none;
@@ -190,14 +202,6 @@ aside {
  display: none;
  }
 
- footer {
- ul {
- li {
- margin-left: 8px;
- }
- }
- }
- 
  .responsive-image {
  width: 300px;
  }
@@ -308,6 +312,10 @@ input[type="radio"] {
  vertical-align: middle;
 }
 
+input[type="checkbox"] {
+ width: 15px; 
+}
+
 #error_explanation {
  color: red;
  ul {
@@ -444,6 +452,11 @@ span.picture {
  margin-right: 5%;
 }
 
+.min-padded-row {
+ margin-left: 1%;
+ margin-right: 1%;
+}
+
 .padded-bottom-row {
  padding-bottom: 40px;
 }

app/controllers/application_controller.rb

@@ -5,8 +5,8 @@ class ApplicationController < ActionController::Base
  include SessionsHelper
 
  def admin_user
-  redirect_to(root_url) unless current_user.admin?
-  end
+ redirect_to(root_url) unless current_user.admin?
+ end
 
  private 
  def logged_in_user

app/controllers/candidates_controller.rb

@@ -10,7 +10,7 @@ class CandidatesController < ApplicationController
  def index
  query = ''
  searchparam = ""
- if params[:search] && params[:search] != ''
+ if !params[:search].blank?
  query += ' lower(name) LIKE ? '
  searchparam = "%#{params[:search].downcase}%"
  end
@@ -76,7 +76,7 @@ def select_candidate
 
  def create
  if params[:commit] == "Cancel"
- redirect_to root_url
+ redirect_to candidates_path
  else 
  if current_user.membership_level_id == 1 && current_user.candidates.any? && 
  current_user.candidates.count > Limits::MAX_CANDIDATES_FREE
@@ -121,6 +121,12 @@ def create
  end
  end
 
+ def add_note
+ @note = Note.new
+ @note.candidate_id = params[:id]
+ render 'notes/new'
+ end 
+
  def update
  @candidate = Candidate.find(params[:id])
  respond_to do |format|
@@ -159,6 +165,7 @@ def edit
  def show
  @candidate = Candidate.find(params[:id])
  @candidate_test_submissions = @candidate.test_submissions.paginate(page: params[:page]).order(sort_column + " " + sort_direction)
+ @candidate_notes = @candidate.notes.paginate(page: params[:page])
  end
 
  def destroy

app/controllers/categories_controller.rb

@@ -22,30 +22,37 @@ def index
 
  def create
  if params[:commit] == "Cancel"
- redirect_to root_url
+ redirect_to all_categories_path
  else 
- @candidate = current_user.candidates.build(candidate_params)
- if @candidate.save
- flash[:success] = "Candidate created!"
+ @category = Category.new(category_params)
+ if @category.save
+ flash[:success] = "Category " + @category.name + " created!"
 
- if params[:commit] == "Save And Send Test"
- flash[:info] = "Select test to send to candidate:"
- @single_test_select = true
- redirect_to tests_path
- else 
- redirect_to root_url
- end
+ redirect_to all_categories_path
  else
  render 'new'
  end
  end
  end
 
+ def autocomplete
+ @categories = Category.order(:name).where("lower(name) like ?", "%#{params[:term].downcase}%")
+ respond_to do |format|
+ format.html
+ format.json { 
+ render json: @categories.map(&:name)
+ }
+ end
+ end
+ 
  def update
  @category = Category.find(params[:id])
  respond_to do |format|
  if @category.update_attributes(category_params)
- format.html { redirect_to @category, notice: 'Category was successfully updated.' }
+ format.html { 
+ flash[:success] = "Category was successfully updated."
+ redirect_to @category
+ }
  format.json { render :show, status: :ok, location: @category }
  else
  format.html { render :edit }
@@ -74,9 +81,8 @@ def destroy
  end
 
  private
-
  def category_params
- params.require(:category).permit(:name)
+ params.require(:category).permit(:name, :term)
  end
 
  def admin_user

app/controllers/notes_controller.rb

@@ -0,0 +1,56 @@
+class NotesController < ApplicationController
+ before_action :logged_in_user, only: [:create, :destroy, :edit, :update, :show, :index]
+ before_action :correct_user, only: [:destroy, :edit, :update, :show, :index]
+ 
+ helper_method :sort_column, :sort_direction
+ 
+ add_breadcrumb "Dashboard", :root_path
+ add_breadcrumb "Notes", :notes_path
+
+ def index
+ query = ''
+ searchparam = ""
+ if !params[:search].blank?
+ query += ' lower(content) LIKE ? '
+ searchparam = "%#{params[:search].downcase}%"
+ end
+
+ @notes = Note.where(query, searchparam).paginate(page: params[:page], per_page: 10).order(sort_column + " " + sort_direction)
+
+ @searched = query != ''
+ end
+
+ def create
+ @candidate = Candidate.find(params[:note][:candidate_id])
+ if params[:commit] == "Cancel"
+ redirect_to @candidate
+ else
+ @candidate.notes.build(note_params)
+ if @candidate.save
+ flash[:success] = "Note added."
+ redirect_to @candidate 
+ else
+ render 'new'
+ end 
+ end 
+ end 
+
+ private 
+ def note_params
+ params.require(:note).permit(:content, :candidate_id)
+ end 
+ 
+ def correct_user
+ @candidate = current_user.candidates.find_by(id: params[:candidate_id])
+ redirect_to root_url if @candiate.nil?
+ end
+ 
+ def sort_column
+ Note.column_names.include?(params[:sort]) ? params[:sort] : "created_at"
+ end
+
+ def sort_direction
+ %w[asc desc].include?(params[:direction]) ? params[:direction] : "desc"
+ end
+
+end