app/models/task_customer.rb app/views/tasks/_task_customer.html.erb db/migrate/20090630082324_create_task_customers.rb lib/active_record_extensions.rb test/fixtures/task_customers.yml test/unit/task_customer_test.rb @@ -1480,6 +1480,18 @@ class TasksController < ApplicationController render(:partial => "notification", :locals => { :notification => user }) end + def add_client + @task = current_user.company.tasks.new + if !params[:id].blank? + @task = current_user.company.tasks.find(params[:id]) + end + + customer = current_user.company.customers.find(params[:client_id]) + @task.task_customers.build(:customer => customer) + + render(:partial => "task_customer", :locals => { :task_customer => customer }) + end + def update_work_log log = current_user.company.work_logs.find(params[:id]) updated = log.update_attributes(params[:work_log]) app/controllers/tasks_controller.rb @@ -14,6 +14,9 @@ class Customer < ActiveRecord::Base has_many :users, :order => "lower(name)" has_many :resources + has_many :task_customers, :dependent => :destroy + has_many :tasks, :through => :task_customers + has_many :organizational_units validates_length_of :name, :maximum=>200 app/models/customer.rb @@ -44,6 +44,10 @@ class Task < ActiveRecord::Base has_many :task_property_values, :dependent => :destroy + has_many :task_customers, :dependent => :destroy + has_many :customers, :through => :task_customers, :order => "customers.name asc" + adds_and_removes_using_params :customers + has_one :ical_entry has_many :todos, :order => "completed_at IS NULL desc, completed_at desc, position" app/models/task.rb @@ -3,6 +3,13 @@ <fieldset id="task_notify" style="padding-right:0;"> <legend><%=_ 'Notifications' %></legend> + <label for="clients"><%=_ "Clients" %></label> + <%= text_field_with_auto_complete(:customer, :name, + { :size => 12, :value => "" }, :after_update_element => "addCustomerToTask") %> + <div id="task_customers"> + <%= render :partial => "task_customer", :collection => @task.customers %> + </div> + <label for="task_requested_by"><%=_ 'Requested By' %></label> <%= text_field 'task', 'requested_by', {:size => 12}.merge(perms['edit']) %> <br/> app/views/tasks/_notifications.html.erb @@ -100,6 +100,7 @@ ActionController::Base.session_options[:session_expires]= Time.local(2015,"jan") # end require File.join(File.dirname(__FILE__), '../lib/rails_extensions') +require File.join("#{ RAILS_ROOT }/lib/active_record_extensions") load File.join(File.dirname(__FILE__), 'environment.local.rb') require File.join(File.dirname(__FILE__), '../lib/misc.rb') config/environment.rb @@ -9,7 +9,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20090626005038) do +ActiveRecord::Schema.define(:version => 20090630082324) do create_table "activities", :force => true do |t| t.integer "user_id", :default => 0, :null => false @@ -596,6 +596,16 @@ ActiveRecord::Schema.define(:version => 20090626005038) do add_index "tags", ["company_id", "name"], :name => "index_tags_on_company_id_and_name" + create_table "task_customers", :force => true do |t| + t.integer "customer_id" + t.integer "task_id" + t.datetime "created_at" + t.datetime "updated_at" + end + + add_index "task_customers", ["customer_id"], :name => "fk_task_customers_customer_id" + add_index "task_customers", ["task_id"], :name => "fk_task_customers_task_id" + create_table "task_owners", :force => true do |t| t.integer "user_id" t.integer "task_id" db/schema.rb @@ -684,11 +684,7 @@ function addUserToTask(input, li) { var userId = jQuery(li).find(".complete_value").text(); var taskId = jQuery("#task_id").val(); - var url = document.location.toString(); - url = url.replace("/edit/", "/add_notification/"); - url = url.replace("#", ""); var url = "/tasks/add_notification"; - var params = { user_id : userId, id : taskId } jQuery.get(url, params, function(data) { jQuery("#task_notify").append(data); @@ -697,6 +693,22 @@ function addUserToTask(input, li) { } /* + Adds the selected customer to the current task list of clients +*/ +function addCustomerToTask(input, li) { + jQuery(input).val(""); + + var clientId = jQuery(li).find(".complete_value").text(); + var taskId = jQuery("#task_id").val(); + + var url = "/tasks/add_client"; + var params = { client_id : clientId, id : taskId } + jQuery.get(url, params, function(data) { + jQuery("#task_customers").append(data); + }); +} + +/* Highlights any notification users who will be receiving an email about this task. */ public/javascripts/cit.js @@ -1420,7 +1420,13 @@ a.description { margin-top: 0px; padding: 0px; } -#taskform .user .removeLink { +#taskform #task_customers { + clear: both; +} +#taskform #task_customers .customer { + clear: both; +} +#taskform .user .removeLink, #taskform #task_customers .removeLink { float: right } #taskform .user.will_notify { public/stylesheets/cit.css @@ -3,6 +3,9 @@ require File.dirname(__FILE__) + '/../test_helper' class CustomerTest < ActiveRecord::TestCase fixtures :companies, :customers + should_have_many :task_customers, :dependent => :destroy + should_have_many :tasks, :through => :task_customers + def setup @internal = customers(:internal_customer) @external = customers(:external_customer) test/unit/customer_test.rb @@ -3,6 +3,9 @@ require File.dirname(__FILE__) + '/../test_helper' class TaskTest < ActiveRecord::TestCase fixtures :tasks, :projects, :users, :companies, :customers, :properties, :property_values + should_have_many :task_customers, :dependent => :destroy + should_have_many :customers, :through => :task_customers + def setup @task = tasks(:normal_task) end @@ -322,4 +325,29 @@ class TaskTest < ActiveRecord::TestCase @task.task_property_values.clear assert @task.valid? end + + context "a normal task" do + setup do + @task = Task.first + end + + should "add and remove task customers using customer_attributes=" do + c1 = Customer.first + c2 = Customer.last + assert_not_equal c1, c2 + + assert_equal 0, @task.customers.length + @task.customer_attributes = { + c1.id => { "member" => "1" }, + c2.id => { "member" => "1" } + } + assert_equal 2, @task.customers.length + + @task.customer_attributes = { + c1.id => { "add" => "1" } + } + assert_equal 1, @task.customers.length + assert_equal c1, @task.task_customers.first.customer + end + end end test/unit/task_test.rb ee4358382d3e7aaaeea4afbebe58d2bfe7c76bf4 Brad Wilson brad@lucky-dip.net http://github.com/ari/clockingit/commit/1f2579583a934138381f21e711a575a96af3637d 1f2579583a934138381f21e711a575a96af3637d 2009-07-01T01:02:49-07:00 2009-07-01T01:02:49-07:00 can add/remove customers to tasks be25cdad4a7046400dc7cf4e435f80ec15438b09 Brad Wilson brad@lucky-dip.net