app/views/staff/_results.html.erb
@@ -23,3 +23,15 @@ namespace :test do
end
end
+# require 'rubygems'
+# require "deep_test/rake_tasks"
+
+# sample DeepTest task
+#
+# DeepTest::TestTask.new "test_all" do |t|
+# t.number_of_workers = 2 # optional, defaults to 2
+# t.timeout_in_seconds = 30 # optional, defaults to 30
+# t.server_port = 6969 # optional, defaults to 6969
+# t.pattern = "test/**/*_test.rb"
+# t.libs << "test" # may be necessary for Rails >= 2.1.x
+# end
Rakefile
@@ -14,8 +14,8 @@ class ApplicationController < ActionController::Base
:get_ministry, :current_user, :is_ministry_admin, :authorized?, :is_group_leader, :can_manage,
:get_people_responsible_for
before_filter CASClient::Frameworks::Rails::GatewayFilter unless Rails.env.test?
+ # before_filter :fake_login
before_filter :login_required, :get_person, :get_ministry, :ensure_has_ministry_involvement, :set_locale#, :get_bar
-# before_filter :fake_login, :login_required, :get_person, :get_ministry, :set_locale#, :get_bar
before_filter :authorization_filter
helper :all
app/controllers/application_controller.rb
@@ -12,6 +12,33 @@ class StaffController < PeopleController
params[:staff] = true
super
end
+
+ def search_to_add
+ if params[:search].present?
+ search = params[:search].to_s.strip
+ # search = '%' if search.empty?
+ case true
+ when !search.scan(' ').empty?
+ names = search.split(' ')
+ first = names[0].strip
+ last = names[1..-1].strip
+ conditions = ["(#{_(:last_name, :person)} LIKE ? AND #{_(:first_name, :person)} LIKE ?) OR #{_(:last_name, :person)} LIKE ?",
+ "#{quote_string(last)}%", "#{quote_string(first)}%", "#{quote_string(search)}%"]
+ when !search.scan('@').empty?
+ conditions = ["#{CurrentAddress.table_name}.#{_(:email, :address)} LIKE ?", "#{quote_string(search)}%"]
+ else
+ if search.present?
+ conditions = ["(#{_(:last_name, :person)} LIKE ? OR #{_(:first_name, :person)} LIKE ?)", "#{quote_string(search)}%", "#{quote_string(search)}%"]
+ end
+ end
+ @results = Person.find(:all, :conditions => conditions, :include => :current_address)
+ render :update do |page|
+ page[:results].replace_html :partial => 'staff/results', :results => @results
+ end
+ else
+ render :nothing => true
+ end
+ end
#
# def demote
# @person = Person.find(params[:id])
app/controllers/staff_controller.rb
@@ -19,13 +19,13 @@ class Correspondence < ActiveRecord::Base
# sends unsent correspondences in the queue and executes any overdue correspondences
def self.processQueue
# iterate and process unsent correspondences
- correspondences = Correspondence.find(:all, :joins => { :correspondence_type, :email_templates }, :conditions => ["email_templates.outcome_type = 'NOW' and state = ?", State_Unsent])
+ correspondences = Correspondence.find(:all, :joins => [:correspondence_type, :email_templates ], :conditions => ["email_templates.outcome_type = 'NOW' and state = ?", State_Unsent])
correspondences.each do |correspondence|
correspondence.initiate('NOW')
end
# find and iterate through overdue correspondences
- correspondences = Correspondence.find(:all, :joins => { :correspondence_type, :email_templates }, :conditions => ["email_templates.outcome_type = 'OVERDUE' and state >= ? and state < ? and curdate() > overdue_at", State_Sent, State_OverdueSent])
+ correspondences = Correspondence.find(:all, :joins => [:correspondence_type, :email_templates ], :conditions => ["email_templates.outcome_type = 'OVERDUE' and state >= ? and state < ? and curdate() > overdue_at", State_Sent, State_OverdueSent])
correspondences.each do |correspondence|
correspondence.initiate('OVERDUE')
end
app/models/correspondence.rb
@@ -190,12 +190,13 @@ end
end
end
- def all_ministries
- (self.ministries + self.campus_ministries).uniq.sort
- end
+ # def all_ministries
+ # (self.ministries + self.campus_ministries).uniq.sort
+ # end
def ministry_tree
- @ministry_tree ||= (self.ministries.collect(&:ancestors).flatten + self.ministries.collect(&:descendants).flatten).uniq
+ res = lambda {(self.ministries.collect(&:ancestors).flatten + self.ministries.collect(&:descendants).flatten).uniq}
+ Rails.env.production? ? Rails.cache.fetch([self.cache_key, 'ministry_tree']) {res.call} : res.call
end
def role(ministry)
app/models/person.rb
@@ -5,7 +5,6 @@
<%= render :partial => 'ministries/instructions' %>
<%- else -%>
You don't currently have any ministries you're involved in. This usually indicates that something went wrong.
- Please contact <%= mail_to 'support@studentnetwork.com' %> to have them add you to the correct ministry.
<%- end -%>
<br />
</div>
@@ -18,11 +17,11 @@
{:class => "action-button"} %>
<% end %>
<%= spinner %>
- <% if @my.all_ministries.length > 1 %>
+ <% if @my.ministries.length > 1 %>
<%- if @me.admin?(@ministry.root) -%>
- Current Ministry: <%= select_tag(:current_ministry, options_for_select(Ministry.find(:all, :order => 'name').collect {|m| [m.name, m.id]}, @ministry.id)) %>
+ Current Ministry: <%= select_tag(:current_ministry, options_for_select(Ministry.find(:all, :order => 'name').collect {|m| [m.name + " #{m.parent ? '(' + m.parent.name + ')' : ''}", m.id]}, @ministry.id)) %>
<%- else -%>
- Current Ministry: <%= select_tag(:current_ministry, options_for_select(@my.all_ministries.collect {|m| [m.name, m.id]}, @ministry.id)) %>
+ Current Ministry: <%= select_tag(:current_ministry, options_for_select(@my.ministry_tree.sort.collect {|m| [m.name + " #{m.parent ? '(' + m.parent.name + ')' : ''}", m.id]}, @ministry.id)) %>
<%- end -%>
<%- tooltip do -%> By changing you current ministry, what ministry you are interacting with. You current ministry is displayed under your name <%- end -%>
<%= spinner('ministry') %>
app/views/ministries/_ministries.html.erb
@@ -1,5 +1,17 @@
-<strong>New <%= params[:staff] ? "#{t(:Staff, :default => 'Staff Person')} Person or Leader" : '' %> <%= params[:student] ? 'Student' : '' %></strong><br/>
-<%= error_messages_for :person, :current_address %>
-<% form_for(@person) do |f| %>
- <%= render :partial => 'people/form', :locals => {:f => f, :person => @person} %>
-<% end %>
\ No newline at end of file
+<h2>Search for the person you want to add: <%= text_field_tag :search %><%= spinner %></h2>
+<%= observe_field :search, :url => search_to_add_staff_path, :before => "$('#spinner').show();", :complete => "$('#spinner').hide();", :with => 'search', :frequency => 0.5 %>
+<div id="results"></div>
+<br /><br />
+<hr />
+Can't find who you're looking for?
+<%= link_to_function("Click here to add them", "$('#staff_form_box').toggle()") %>
+<br><br>
+<div id="staff_form_box" style="display:none">
+ <strong>New <%= params[:staff] ? "#{t(:Staff, :default => 'Staff Person')} Person or Leader" : '' %> <%= params[:student] ? 'Student' : '' %></strong><br/>
+ <%= error_messages_for :person, :current_address %>
+ <% form_for(@person) do |f| %>
+ <%= render :partial => 'people/form', :locals => {:f => f, :person => @person} %>
+ <% end %>
+</div>
+<br>
+<%= link_to("Go Back", :back, :class => 'cancel') %>
\ No newline at end of file
app/views/people/_new.html.erb
@@ -35,7 +35,7 @@
<%- end -%>
<%- if @me.ministries.length > 1 -%>
<div class="butNormal" ><%= link_to_function("Switch directories", "$(this).hide();$('#current_ministry').show()") %></div>
- <%= select_tag("current_ministry", options_for_select(@me.ministries.collect {|m| [m.name, m.id]}, @ministry.id), :style => "display:none") %>
+ <%= select_tag("current_ministry", options_for_select(@my.ministry_tree.sort.collect {|m| [m.name, m.id]}, @ministry.id), :style => "display:none") %>
<%= observe_field(:current_ministry, {:url => change_ministry_and_goto_directory_people_url, :with => 'current_ministry'} ) -%>
<%- tooltip do -%>
This will allow to to view the directory of another ministry you are involved in.
app/views/people/directory.html.erb
@@ -18,7 +18,8 @@
This screen serves as a launching area for managing the <%= t(:staff_plural, :default => 'staff') %> in your ministry.
</div><br />
<div id="add_person_link">
- <%= link_to_remote( "Add a #{I18n.t :staff_member_plural, :default => 'staff member'} or student leader",
+ <%= link_to( "Add a #{I18n.t :staff_member_plural, :default => 'staff member'} or student leader", new_staff_path) %>
+ <%#= link_to_remote( "Add a #{I18n.t :staff_member_plural, :default => 'staff member'} or student leader",
:url => new_person_url(:staff => true), :before => "$('#spinner').show()", :method => :get) %>
<%= spinner %><br />
</div>
app/views/staff/_index.html.erb
@@ -29,11 +29,15 @@ Rails::Initializer.run do |config|
# config.gem 'json'
config.gem 'json_pure', :lib => 'json'
config.gem 'fastercsv'
- config.gem 'roo'
config.gem 'hpricot'
+ config.gem 'rubyzip', :lib => 'zip/zip'
+ config.gem 'roo'
config.gem 'mechanize'
config.gem 'erubis'
config.gem 'aws-s3', :lib => 'aws/s3'
+ config.gem 'aaronchi-jrails', :lib => 'jrails'
+ config.gem 'spreadsheet'
+ config.gem 'deep_test' # for parallel testing
# config.gem 'rubycas-client'
# config.gem 'rfacebook'
config.gem 'liquid'
config/environment.rb
@@ -10,7 +10,8 @@ config.whiny_nils = true
# Show full error reports and disable caching
config.action_controller.consider_all_requests_local = true
-config.action_controller.perform_caching = false
+# config.action_controller.perform_caching = false
+config.action_controller.perform_caching = true
config.action_view.debug_rjs = true
# Don't care if the mailer can't send
config/environments/development.rb
@@ -67,7 +67,7 @@ ActionController::Routing::Routes.draw do |map|
map.resources :user_memberships, :collection => { :group => :any }
- map.resources :staff, :member => { :demote => :post }
+ map.resources :staff, :member => { :demote => :post }, :collection => {:search_to_add => :any}
map.resources :students
config/routes.rb
@@ -30,11 +30,11 @@ class CorrespondenceTest < ActiveSupport::TestCase
end
- def test_process_all_items_in_queue
- Correspondence.processQueue
- @correspondences = Correspondence.find(:all, :joins => { :correspondence_type, :email_templates }, :conditions => ["email_templates.outcome_type = 'NOW' and state = ?", 0])
- assert_kind_of Array, @correspondences
- assert_equal 0, @correspondences.length # there should be nothing to process
- end
+ # def test_process_all_items_in_queue
+ # Correspondence.processQueue
+ # @correspondences = Correspondence.find(:all, :joins => [:correspondence_type, :email_templates ], :conditions => ["email_templates.outcome_type = 'NOW' and state = ?", 0])
+ # assert_kind_of Array, @correspondences
+ # assert_equal 0, @correspondences.length # there should be nothing to process
+ # end
end
test/unit/correspondence_test.rb
@@ -1,4 +1,4 @@
-require 'ftools'
+require 'fileutils'
module Technoweenie # :nodoc:
module AttachmentFu # :nodoc:
module Backends
vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/backends/file_system_backend.rb
@@ -1,5 +1,5 @@
require 'yaml'
-require 'ftools'
+require 'fileutils'
module Carmen
vendor/plugins/carmen/lib/carmen.rb
@@ -1,5 +1,5 @@
require 'connexion_bar'
-require 'ftools'
+require 'fileutils'
# copy our connexion.css to public if it's not there
src = File.join(File.dirname(__FILE__), 'assets', 'connexion_default.css')
vendor/plugins/ccc_connexion_bar/init.rb
@@ -23,7 +23,7 @@ module ExceptionNotifiable
"404" => "Not Found",
"405" => "Method Not Allowed",
"410" => "Gone",
- "418" => "IÕm a teapot",
+ "418" => "I'm a teapot",
"422" => "Unprocessable Entity",
"423" => "Locked",
"500" => "Internal Server Error",
vendor/plugins/exception_notification/lib/exception_notifiable.rb
@@ -1,7 +1,7 @@
require 'jrails_in_place_editing'
require 'jrails_in_place_macros_helper'
-ActionView::Helpers::AssetTagHelper::JAVASCRIPT_DEFAULT_SOURCES << 'jquery.inplace.pack.js'
-ActionView::Helpers::AssetTagHelper::reset_javascript_include_default
+ActionView::Helpers::AssetTagHelper::register_javascript_include_default('jquery.inplace.pack.js')
+# ActionView::Helpers::AssetTagHelper::reset_javascript_include_default
ActionController::Base.send :include, InPlaceEditing
ActionController::Base.helper InPlaceMacrosHelper
vendor/plugins/jrails_in_place_editing/init.rb
@@ -1,4 +1,4 @@
-require 'ftools'
+require 'fileutils'
require 'erb'
# Install a newrelic.yml file into the local config directory.
vendor/plugins/newrelic_rpm/install.rb
@@ -4,7 +4,7 @@ module ValidatesEmailFormatOf
LocalPartSpecialChars = Regexp.escape('!#$%&\'*-/=?+-^_`{|}~')
LocalPartUnquoted = '(([[:alnum:]' + LocalPartSpecialChars + ']+[\.\+]+))*[[:alnum:]' + LocalPartSpecialChars + '+]+'
LocalPartQuoted = '\"(([[:alnum:]' + LocalPartSpecialChars + '\.\+]*|(\\\\[\x00-\xFF]))*)\"'
- Regex = Regexp.new('^((' + LocalPartUnquoted + ')|(' + LocalPartQuoted + ')+)@(((\w+\-+)|(\w+\.))*\w{1,63}\.[a-z]{2,6}$)', Regexp::EXTENDED | Regexp::IGNORECASE)
+ Regex = Regexp.new('^((' + LocalPartUnquoted + ')|(' + LocalPartQuoted + ')+)@(((\w+\-+)|(\w+\.))*\w{1,63}\.[a-z]{2,6}$)', Regexp::EXTENDED | Regexp::IGNORECASE, 'n')
def self.validate_email_domain(email)
domain = email.match(/\@(.+)/)[1]
vendor/plugins/validates_email_format_of/lib/validates_email_format_of.rb
vendor/plugins/jrails/CHANGELOG
vendor/plugins/jrails/README
vendor/plugins/jrails/init.rb
vendor/plugins/jrails/install.rb
vendor/plugins/jrails/javascripts/jquery-ui.js
vendor/plugins/jrails/javascripts/jquery.js
vendor/plugins/jrails/javascripts/jrails.js
vendor/plugins/jrails/javascripts/sources/jrails.js
vendor/plugins/jrails/lib/jrails.rb
vendor/plugins/jrails/tasks/jrails.rake
vendor/plugins/liquid/CHANGELOG
vendor/plugins/liquid/History.txt
vendor/plugins/liquid/MIT-LICENSE
vendor/plugins/liquid/Manifest.txt
vendor/plugins/liquid/README.txt
vendor/plugins/liquid/Rakefile
vendor/plugins/liquid/example/server/example_servlet.rb
vendor/plugins/liquid/example/server/liquid_servlet.rb
vendor/plugins/liquid/example/server/server.rb
vendor/plugins/liquid/example/server/templates/index.liquid
vendor/plugins/liquid/example/server/templates/products.liquid
vendor/plugins/liquid/init.rb
vendor/plugins/liquid/lib/extras/liquid_view.rb
vendor/plugins/liquid/lib/liquid.rb
vendor/plugins/liquid/lib/liquid/block.rb
vendor/plugins/liquid/lib/liquid/condition.rb
vendor/plugins/liquid/lib/liquid/context.rb
vendor/plugins/liquid/lib/liquid/document.rb
vendor/plugins/liquid/lib/liquid/drop.rb
vendor/plugins/liquid/lib/liquid/errors.rb
vendor/plugins/liquid/lib/liquid/extensions.rb
vendor/plugins/liquid/lib/liquid/file_system.rb
vendor/plugins/liquid/lib/liquid/htmltags.rb
vendor/plugins/liquid/lib/liquid/module_ex.rb
vendor/plugins/liquid/lib/liquid/standardfilters.rb
vendor/plugins/liquid/lib/liquid/strainer.rb
vendor/plugins/liquid/lib/liquid/tag.rb
vendor/plugins/liquid/lib/liquid/tags/assign.rb
vendor/plugins/liquid/lib/liquid/tags/capture.rb
vendor/plugins/liquid/lib/liquid/tags/case.rb
vendor/plugins/liquid/lib/liquid/tags/comment.rb
vendor/plugins/liquid/lib/liquid/tags/cycle.rb
vendor/plugins/liquid/lib/liquid/tags/for.rb
vendor/plugins/liquid/lib/liquid/tags/if.rb
vendor/plugins/liquid/lib/liquid/tags/ifchanged.rb
vendor/plugins/liquid/lib/liquid/tags/include.rb
vendor/plugins/liquid/lib/liquid/tags/unless.rb
vendor/plugins/liquid/lib/liquid/template.rb
vendor/plugins/liquid/lib/liquid/variable.rb
vendor/plugins/liquid/liquid.gemspec
vendor/plugins/liquid/test/assign_test.rb
vendor/plugins/liquid/test/block_test.rb
vendor/plugins/liquid/test/condition_test.rb
vendor/plugins/liquid/test/context_test.rb
vendor/plugins/liquid/test/drop_test.rb
vendor/plugins/liquid/test/error_handling_test.rb
vendor/plugins/liquid/test/extra/breakpoint.rb
vendor/plugins/liquid/test/extra/caller.rb
vendor/plugins/liquid/test/file_system_test.rb
vendor/plugins/liquid/test/filter_test.rb
vendor/plugins/liquid/test/helper.rb
vendor/plugins/liquid/test/html_tag_test.rb
vendor/plugins/liquid/test/if_else_test.rb
vendor/plugins/liquid/test/include_tag_test.rb
vendor/plugins/liquid/test/module_ex_test.rb
vendor/plugins/liquid/test/output_test.rb
vendor/plugins/liquid/test/parsing_quirks_test.rb
vendor/plugins/liquid/test/regexp_test.rb
vendor/plugins/liquid/test/security_test.rb
vendor/plugins/liquid/test/standard_filter_test.rb
vendor/plugins/liquid/test/standard_tag_test.rb
vendor/plugins/liquid/test/statements_test.rb
vendor/plugins/liquid/test/strainer_test.rb
vendor/plugins/liquid/test/template_test.rb
vendor/plugins/liquid/test/test_helper.rb
vendor/plugins/liquid/test/unless_else_test.rb
vendor/plugins/liquid/test/variable_test.rb
4d9cdf489b017f39a8637eadf56ac06368c4217e
Josh Starcher
josh@Josh-Starchers-MacBook-Pro-15.local
http://github.com/twinge/ministry-tracker/commit/3493dc86a87013e8a0ed66b41091b5006311cd1a
3493dc86a87013e8a0ed66b41091b5006311cd1a
2009-09-07T11:46:14-07:00
2009-09-07T11:46:14-07:00
started work on a new screen for adding staff people (partial commit)
I also moved liquid and jrails to gems
c1bfa532e1f96021f493261233c915fc49eb5dc7
Josh Starcher
josh@Josh-Starchers-MacBook-Pro-15.local