@@ -401,7 +401,15 @@ class ApplicationController < ActionController::Base :user => current_user) title = highlight_all(title, highlight_keys) - html = { :class => "tooltip#{task.css_classes}", :title => title } + html = { + :class => "tooltip tasklink #{task.css_classes}", + :title => title + } + + if @ajax_task_links + html[:onclick] = "showTaskInPage(#{ task.task_num }); return false;" + end + text = truncate ? task.name : self.class.helpers.truncate(task.name, :length => 80) text = highlight_all(text, highlight_keys) app/controllers/application_controller.rb @@ -209,6 +209,9 @@ class TasksController < ApplicationController def edit @task = current_user.company.tasks.find_by_task_num(params[:id]) + @ajax_task_links = request.xhr? # want to use ajax task loads if this page was loaded by ajax + + if @task.nil? or !current_user.can_view_task?(@task) flash['notice'] = _("You don't have access to that task, or it doesn't exist.") redirect_from_last @@ -1115,9 +1118,6 @@ class TasksController < ApplicationController task.due_at = tz.utc_to_local(@task.due_at) unless task.due_at.nil? @tags = {} - @logs = WorkLog.find(:all, :order => "work_logs.started_at desc,work_logs.id desc", :conditions => ["work_logs.task_id = ? #{"AND (work_logs.comment = 1 OR work_logs.log_type=6)" if session[:only_comments].to_i == 1}", task.id], :include => [:user, :task, :project]) - @logs ||= [] - @projects = User.find(current_user.id).projects.find(:all, :order => 'name', :conditions => ["completed_at IS NULL"]).collect {|c| [ "#{c.name} / #{c.customer.name}", c.id ] if current_user.can?(c, 'create') }.compact unless current_user.projects.nil? @notify_targets = current_projects.collect{ |p| p.users.collect(&:name) }.flatten.uniq @@ -1166,7 +1166,8 @@ class TasksController < ApplicationController def list_init # Subscribe to the juggernaut channel for Task updates session[:channels] += ["tasks_#{current_user.company_id}"] - @tasks = current_task_filter.tasks + # @tasks = current_task_filter.tasks + @ajax_task_links = true end end app/controllers/tasks_controller.rb @@ -213,10 +213,6 @@ module ApplicationHelper text end -# def link_to_task(task) -# "<strong>#{task.issue_num}</strong> <a href=\"/tasks/edit/#{task.task_num}\" class=\"tooltip#{task.css_classes}\" title=\"#{task.to_tip({ :duration_format => current_user.duration_format, :workday_duration => current_user.workday_duration, :days_per_week => current_user.days_per_week, :user => current_user })}\">#{h(truncate(task.name, :length => 80))}</a>" -# end - def milestone_classes(m) return " complete_milestone" unless m.completed_at.nil? app/helpers/application_helper.rb @@ -1,5 +1,5 @@ class Keyword < ActiveRecord::Base - belongs_to :task_filter + belongs_to :task_filter, :touch => true belongs_to :company validates_presence_of :company app/models/keyword.rb @@ -2,7 +2,7 @@ class Notification < ActiveRecord::Base belongs_to :user - belongs_to :task + belongs_to :task, :touch => true named_scope :unread, :conditions => { :unread => true } end app/models/notification.rb @@ -1043,7 +1043,7 @@ class Task < ActiveRecord::Base user_notifications = notifications.select { |n| n.user == user } user_notifications.each do |n| - n.update_attribute(:unread, !read) + n.update_attributes(:unread => !read) end end app/models/task.rb @@ -102,14 +102,24 @@ class TaskFilter < ActiveRecord::Base end end + def cache_key + key = super + last_task_update = user.company.tasks.maximum(:updated_at, + :conditions => conditions, + :include => to_include) + "#{ key }/#{ last_task_update.to_i }/#{ user.id }" + end + private def to_include - to_include = [ :users, :tags, :sheets, :todos, :dependencies, - :milestone, :notifications, :watchers, - :customers, :task_property_values ] - to_include << { :company => :properties } - to_include << { :project => :customer } + to_include = [ :project, :users, :notifications, :watchers ] + + to_include << :tags if qualifiers.for("Tag").any? + to_include << :task_property_values if qualifiers.for("PropertyValue").any? + to_include << :customers if qualifiers.for("Customer").any? + + return to_include end def set_company_from_user app/models/task_filter.rb @@ -1,12 +1,15 @@ class TaskFilterQualifier < ActiveRecord::Base attr_accessor :task_num - belongs_to :task_filter + belongs_to :task_filter, :touch => true belongs_to :qualifiable, :polymorphic => true validates_presence_of :qualifiable before_validation :set_qualifiable_from_task_num + named_scope :for, lambda { |type| + { :conditions => { :qualifiable_type => type } } } + private def set_qualifiable_from_task_num app/models/task_filter_qualifier.rb @@ -1,7 +1,7 @@ # A user who is assigned to a task class TaskOwner < ActiveRecord::Base belongs_to :user - belongs_to :task + belongs_to :task, :touch => true named_scope :unread, :conditions => { :unread => true } end app/models/task_owner.rb @@ -19,7 +19,7 @@ class WorkLog < ActiveRecord::Base has_many :work_log_notifications, :dependent => :destroy has_many :users, :through => :work_log_notifications - named_scope :comments, :conditions => [ "work_logs.comment = 1 or work_logs.log_type = 6" ] + named_scope :comments, :conditions => [ "work_logs.comment = ? or work_logs.log_type = ?", true, 6 ] validates_presence_of :started_at app/models/work_log.rb @@ -4,7 +4,9 @@ <% end %> <% if dependency.done? %> - <img src="/images/tick.png" border=0><% else %> <% end %><%= link_to_task(dependency) %> - <input name="dependencies[]" type="hidden" value="<%=dependency.task_num%>"> - <span class="divider"></span> + <img src="/images/tick.png" border=0> + <% end %> + <%= link_to_task(dependency) %> + <%= hidden_field_tag :dependencies, dependency.task_num, :index => nil %> + <span class="divider"></span> </div> app/views/tasks/_dependency.html.erb @@ -43,5 +43,3 @@ }); jQuery('#comment').focus(); </script> - - app/views/tasks/_form.html.erb @@ -1,3 +1,5 @@ +<% cache(current_task_filter) do -%> + <%= render(:partial => "search_filter", :locals => { :redirect_params => { :tag => params[:tag] }}) %> <div id="task_list"> @@ -19,9 +21,12 @@ </tr> </thead> <tbody> - <%= render :partial => "task_row_v2", :collection => @tasks %> + <%= render :partial => "task_row_v2", :collection => current_task_filter.tasks %> </tbody> </table> </div> <%= sortable_table("#list", session[:filter_sort]) -%> +<%= javascript_tag "jQuery('.date_to_words').dateToWords()" %> + +<% end -%> app/views/tasks/_task_list_v2.html.erb @@ -1,4 +1,6 @@ <% task = task_row_v2 -%> + +<% cache([ task, current_user.id ]) do -%> <% customer = (task.customers.first || task.project.customer) -%> <%= task_row_tr_tag(task) %> @@ -45,7 +47,7 @@ <td class="tooltip" title="<%= task_tooltip([ [ "Due Date", formatted_date_for_current_user(task.due_date) ] ]) %>"> <span class="sort_hint"><%= task.due_date %></span> - <%= "#{ due_in_words(task) }".gsub("\[", "").gsub("\]", "") %> + <span class="date_to_words"><%= task.due_at.to_date if task.due_at %></span> </td> <td> @@ -57,3 +59,5 @@ </td> </tr> + +<% end -%> app/views/tasks/_task_row_v2.html.erb @@ -1,4 +1,8 @@ -<% form_tag({ :action => 'update', :id => @task}, { :multipart => "true", :id => "taskform" }) do %> - <%= render :partial => "form" %> -<% end %> +<% cache([ "edit_form", @task, current_user.id ]) do -%> + + <% form_tag({ :action => 'update', :id => @task}, { :multipart => "true", :id => "taskform" }) do %> + <%= render :partial => "form" %> + <% end %> + +<% end -%> app/views/tasks/edit.html.erb @@ -11,7 +11,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 = false # Don't care if the mailer can't send config/environments/development.rb @@ -194,20 +194,70 @@ jQuery(document).ready(function() { ui.element.css("width", ""); } }); + + }); +jQuery.fn.dateToWords = function() { + return this.each(function() { + dateToWords(jQuery(this)) + }); +} + +function dateToWords(elem) { + var date = elem.text(); + var text = date; + var className = null; + + date = jQuery.datepicker.parseDate("yy-mm-dd", date) + + if (date != null) { + var diff = (((new Date()).getTime() - date.getTime()) / 1000); + var dayDiff = Math.floor(diff / 86400); + + if (isNaN(dayDiff)) { + text = date; + } + else if (dayDiff == -1) { + text = "Tomorrow"; + className = "due_tomorrow"; + } + else if (dayDiff == 0) { + text = "Today"; + className = "due"; + } + else if (dayDiff == 1) { + text = "Yesterday" + className = "due_overdue"; + } + else if (dayDiff < 0) { + dayDiff = Math.abs(dayDiff); + text = dayDiff + " days" + className = dayDiff >= 7 ? "due_distant" : "due_soon"; + } + else if (dayDiff > 0) { + text = dayDiff + " days ago" + className = "due_overdue"; + } + } + + elem.addClass(className); + elem.text(text); +} + + /* Loads the task information for the task taskNum and displays it in the current page. */ function showTaskInPage(taskNum) { jQuery("#task_list tr.selected").removeClass("selected"); - jQuery("#task_list #task_row_" + taskNum).addClass("selected"); + jQuery("#task_list #task_row_" + taskNum).addClass("selected"); - jQuery("#task").fadeOut(); + jQuery("#task").fadeOut(); jQuery.get("/tasks/edit/" + taskNum, {}, function(data) { - jQuery("#task").html(data); - jQuery("#task").fadeIn('slow'); + jQuery("#task").html(data); + jQuery("#task").fadeIn('slow'); }); } @@ -860,4 +910,5 @@ function setPageTarget(evt, selected) { jQuery("#page_notable_id").val(id); jQuery("#page_notable_type").val(type); -} \ No newline at end of file +} + public/javascripts/application.js @@ -33,42 +33,6 @@ class TasksControllerTest < ActionController::TestCase assert_response :success end - test "/list_old should render :success" do - company = companies("cit") - - # need to create a task to ensure the task partials get rendered - task = Task.new(:name => "Test", :project_id => company.projects.last.id) - task.company = company - task.save! - - get :list_old - assert_response :success - - # ensure at least 1 task was rendered - group = assigns["groups"].first - assert group.length > 0 - end - - test "/list_old should works with tags" do - company = companies("cit") - user = company.users.first - @request.session[:filter_user] = [ user.id.to_s ] - - # need to create a task to ensure the task partials get rendered - task = Task.new(:name => "Test", :project_id => company.projects.last.id) - task.company = company - task.set_tags = "tag1" - task.task_owners.build(:user => user) - task.save! - - get :list_old, :tag => "tag1" - assert_response :success - - # ensure at least 1 task was rendered - group = assigns["groups"].first - assert group.length > 0 - end - test "/list should render :success" do company = companies("cit") @@ -79,8 +43,8 @@ class TasksControllerTest < ActionController::TestCase get :list assert_response :success - - assert assigns["tasks"].include?(task) + assert TaskFilter.system_filter(@user).tasks.include?(task) +# assert assigns["tasks"].include?(task) end test "/update should render form ok when failing update" do test/functional/tasks_controller_test.rb @@ -25,7 +25,8 @@ class TaskFilterQualifierTest < ActiveSupport::TestCase should "set task from task_num if use can view task" do @qualifier.task_num = @task.task_num - @qualifier.save! +# @qualifier.save! + @qualifier.valid? assert_equal @task, @qualifier.qualifiable end test/unit/task_filter_qualifier_test.rb @@ -29,6 +29,8 @@ def self.config end def self.send(data,chan = ["default"]) + return if RAILS_ENV=="test" + begin @socket = TCPSocket.new(config["PUSH_HOST"], config["PUSH_PORT"]) fc = { :message => data, :secret => config["PUSH_SECRET"], :broadcast => 1, :channels => chan} vendor/plugins/juggernaut/lib/juggernaut.rb 6d55c48d89c6cbeead9765d9092fbc575ccc8764 393eb68bf1771265c9d4b1db84688e9379c48989 Ari Maniatis ari@ish.com.au http://github.com/ari/clockingit/commit/d04aeb29660e801536b1e6ef6efb7e73d8b8f11c d04aeb29660e801536b1e6ef6efb7e73d8b8f11c 2009-11-05T02:04:20-08:00 2009-11-05T02:04:20-08:00 Merge branch 'master' of git://github.com/bradx3/clockingit 097c8b61040d6cc866f3e9a2c013ec3624f0711c Ari Maniatis ari@ish.com.au