@@ -10,7 +10,8 @@ class ApplicationController < ActionController::Base
# Pick a unique cookie name to distinguish our session data from others'
helper_method :format_date, :_, :receipt, :is_ministry_leader, :is_ministry_leader_somewhere, :team_admin,
- :get_ministry, :current_user, :is_ministry_admin, :authorized?, :is_group_leader, :can_manage
+ :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?
# use this line for production
before_filter :login_required, :get_person, :get_ministry, :set_locale#, :get_bar
@@ -153,6 +154,20 @@ class ApplicationController < ActionController::Base
Person.table_name + '.' + _(:first_name, :person))
end
+ def get_people_responsible_for
+ @people_responsible_for = @person.people_responsible_for
+ end
+
+ def get_people_in_ministry_campus
+ @people_in_ministry_campus = []
+ peeps_in_m = get_ministry.people.find(:all)
+ peeps_in_m.each do |person|
+ if person.campus_involvements.find(:first) == @person.campus_involvements.find(:first) #Needs to be changed when person.primary_campus is working
+ @people_in_ministry_campus << person
+ end
+ end
+ end
+
# ===========
# = Filters =
# ===========
@@ -249,10 +264,6 @@ class ApplicationController < ActionController::Base
request.format = :facebook if iphone_request?
end
- def get_people_responsible_for
- @people_responsible_for = @person.people_responsible_for.find(:all)
- end
-
private
# Ensures that the _person_ is involved in the 'No Ministry' ministry
# BUG 1857
app/controllers/application_controller.rb
@@ -230,6 +230,7 @@ class PeopleController < ApplicationController
# GET /people/1;edit
def edit
+ get_people_in_ministry_campus
setup_vars
setup_campuses
setup_states
@@ -313,8 +314,15 @@ class PeopleController < ApplicationController
# PUT /people/1
# PUT /people/1.xml
def update
+ #throw params.inspect
setup_states
+ get_people_responsible_for
+ get_ministry_involvement(get_ministry)
@person = Person.find(params[:id])
+ if params[:responsible_person_id]
+ @ministry_involvement.responsible_person = Person.find(params[:responsible_person_id])
+ @ministry_involvement.save
+ end
if params[:current_address]
@person.current_address ||= CurrentAddress.new(:email => params[:current_address][:email])
@person.current_address.update_attributes(params[:current_address])
app/controllers/people_controller.rb
@@ -20,7 +20,9 @@ class Person < ActiveRecord::Base
has_one :responsible_person, :class_name => "Person", :through => :ministry_involvements
has_many :involvements_responsible_for, :class_name => "MinistryInvolvement", :foreign_key => "responsible_person_id"
has_many :people_responsible_for, :class_name => "Person", :through => :involvements_responsible_for, :source => :person
-
+
+
+
# Address Relationships
has_many :addresses, :class_name => "Address", :foreign_key => _(:person_id, :address)
has_one :current_address, :class_name => "CurrentAddress", :foreign_key => _(:person_id, :address), :conditions => _(:address_type, :address) + " = 'current'"
app/models/person.rb
@@ -19,7 +19,7 @@
</table>
<%- end -%>
</td>
- </tr>
+ </tr>s
</table>
@@ -33,6 +33,11 @@
<tr><th>Email</th><td><%= text_field :current_address, :email %></td></tr>
<tr><th>Date of Birth</th><td class="date"><%= f.date_select :birth_date, date_options(1920) %></td></tr>
<tr><th>Gender</th><td><%= f.select :gender, [['Male', 1],['Female', 0]], {}, :selected => @person.gender %></td></tr>
+
+ <tr><th>Responsible Person</th><td>
+ <%= select_tag :responsible_person_id, options_from_collection_for_select(@people_in_ministry_campus, 'id', 'full_name') %>
+ </td></tr>
+
<tr><th> </th><td> </td> </tr>
</table>
</td>
app/views/people/_edit.html.erb
@@ -15,13 +15,17 @@
<td><%= @person.user.facebook_username.present? ? @person.user.facebook_username : 'Click "Edit Information" to link your Facebook Account' %></td>
</tr>
<%- end -%>
- <tr><th>People Responsible For</th><td>
- <%- if @people_responsible_for -%>
- <%- @people_responsible_for.each do |person| -%>
- <%= person.full_name %>
- <%- end -%>
- <%- end -%>
- </td></tr>
+
+ <tr><th>People Responsible For</th><td>
+ <%- if @people_responsible_for -%>
+ <%- @people_responsible_for.each do |person| -%>
+ <%= link_to person.full_name, person_url(person.id) %>
+ <br>
+ <%- end -%>
+ <%- end -%>
+ </td></tr>
+
+
</table>
</td>
@@ -33,10 +37,10 @@
<tr><th>Graduation Date</th><td><%= format_date(@person.most_recent_involvement.try(:graduation_date)) %></td></tr>
<tr><th>Major</th><td><%= @person.most_recent_involvement.try(:major) %></td></tr>
<tr><th>Minor</th><td><%= @person.most_recent_involvement.try(:minor) %></td></tr>
- <tr><th>Responsible Person<th><td>
- <%- if @person.responsible_person -%>
- <%= link_to '#{@person.responsible_person.full_name}', person_url(@person.responsible_person['person_id']) %>
- <%- end -%>
+ <tr><th>Responsible Person<th><td>
+ <% if @person.responsible_person %>
+ <%= link_to @person.responsible_person.full_name, person_url(@person.responsible_person.id) %>
+ <% end %>
</td></tr>
<%- if !@person.url.blank?
app/views/people/_view.html.erb
29ae19fe716f819059bc21cbd793cc36ba3f3fbb
Eric Bendall
ebendall@gmail.com
http://github.com/twinge/ministry-tracker/commit/76238bcedafda400cdde90f2a5d7dd203092e902
76238bcedafda400cdde90f2a5d7dd203092e902
2009-06-02T14:38:11-07:00
2009-06-02T14:38:11-07:00
Links work, dropdown menu works, everything so far works. Currently what we have is a link on a profile to the responsible Person's profile, a list of links to the profiles of who the user is those responsible for, and a dropdown menu that allows the user to change his RP
7d14acf22028487cbfc21a8578c00d3f1f643ff7
Eric Bendall
ebendall@gmail.com