app/views/times/_listed.html.erb app/views/times/create.js.rjs app/views/times/stop.js.rjs @@ -96,6 +96,8 @@ class TimesController < ApplicationController respond_to do |format| if @time.save + add_running_time(@time) + format.html { error_status(false, :success_added_time) redirect_back_or_default(@time) @@ -159,6 +161,8 @@ class TimesController < ApplicationController @time.updated_by = @logged_user @time.save + remove_running_time(@time) + respond_to do |format| format.html { error_status(false, :success_stopped_time) @@ -172,7 +176,9 @@ class TimesController < ApplicationController def destroy return error_status(true, :insufficient_permissions) unless (@time.can_be_deleted_by(@logged_user)) - + + remove_running_time(@time) + @time.updated_by = @logged_user @time.destroy @@ -209,4 +215,13 @@ private @sort_type = 'created_on' unless ['done_date', 'hours'].include?(params[:orderBy]) @sort_order = 'DESC' end + + def add_running_time(time) + @running_times.each { |chk| return if chk.id == time.id } + @running_times << time + end + + def remove_running_time(time) + @running_times.reject! { |chk| chk.id == time.id ? true : false } + end end app/controllers/times_controller.rb @@ -63,8 +63,8 @@ class ProjectTime < ActiveRecord::Base end # set name to task name - if self.name.empty? and !self.project_task.nil? - self.name = self.project_task.text + if (self.name.nil? or self.name.blank?) and !self.project_task.nil? + self.name = self.project_task.text[0, ProjectTime.columns_hash['name'].limit] end end @@ -108,7 +108,7 @@ class ProjectTime < ActiveRecord::Base end def open_task_id=(val) - # Set open_task accordingly + # Set open_task accordingly if (val.nil? || val == '0') self.open_task = nil return app/models/project_time.rb @@ -1,12 +1,12 @@ <div id="userbox"> -<% if user.is_anonymous? -%> +<% if user.is_anonymous? %> <%= :welcome_anonymous.l %> (<%= link_to(:login.l, logout_path) %>), -<% else -%> - <%= :welcome_back.l_with_args(:user => h(user.display_name)) %> (<%= link_to :logout.l, logout_path, :confirm => :are_you_sure_logout.l %>), -<% end -%> -<% unless running_times.blank? -%> - <%= :running_times.l_with_args(:count => running_times.size) %> <%= render_icon 'bullet_drop_down', '', :id => 'running_times', :class => 'PopupMenuWidgetAttachTo', :title => 'Enable javascript' %> -<% end -%> +<% else %> + <%= :welcome_back.l_with_args(:user => h(user.display_name)) %> (<%= link_to :logout.l, logout_path, :confirm => :are_you_sure_logout.l %>) +<% end %> + <div id="running_times_count" style="display:<%= @running_times.empty? ? 'none' : 'block' %>;"> + <span><%= :running_times.l_with_args(:count => @running_times.size) %></span> <%= render_icon 'bullet_drop_down', '', :id => 'running_times', :class => 'PopupMenuWidgetAttachTo', :title => 'Enable javascript' %> + </div> <ul> <% unless user.is_anonymous? %> <li><%= link_to :account.l, @logged_user %> <%= render_icon 'bullet_drop_down', '', :id => 'account_more', :class => 'PopupMenuWidgetAttachTo', :title => 'Enable javascript' %></li> @@ -58,18 +58,9 @@ </div> <% end %> -<% unless running_times.blank? %> - <div class="PopupMenuWidgetDiv" id="running_times_menu" style="display:none"> + <div class="PopupMenuWidgetDiv" id="running_times_menu" style="display:none"> <ul> -<% running_times.each do |time| -%> - <li> - <%= link_to h(time.name), time.object_url %> - <% form_tag stop_time_path(:active_project => time.project_id, :id => time.id), :method => :put do %> - <div><%= image_submit_tag 'icons/stop.gif', :alt => :stop_time.l, :class => 'image' %></div> - <% end %> - </li> -<% end %> + <%= render :partial => 'times/listed', :collection => @running_times %> </ul> </div> -<% end %> </div> app/views/layouts/_user_box.rhtml @@ -18,7 +18,7 @@ <%= javascript_include_tag 'application.js' %> <%= javascript_tag "var AUTH_TOKEN = #{form_authenticity_token.inspect};" if protect_against_forgery? %> - <%= javascript_tag "var PROJECT_ID = #{@active_project.id};" %> + <%= javascript_tag "var PROJECT_ID = #{@active_project.id}; var LOGGED_USER_ID=#{@logged_user.id};" %> <!-- head needs to go here? --> </head> <body id="body"> app/views/layouts/project_website.rhtml @@ -36,20 +36,9 @@ <% if !task_item.is_completed? && ProjectTime.can_be_created_by(@logged_user, task_item.project) %> <% running_time = running_time_for_task(task_item) unless running_time.nil? %> - -<% form_tag stop_time_path(:active_project => running_time.project_id, :id => running_time.id), :method => :put do %> - <div><%= image_submit_tag 'icons/stop.gif', :alt => :stop_time.l, :class => 'image' %></div> -<% end %> - +<%= link_to render_icon('stop', :stop_time.l), stop_time_path(:active_project => running_time.project_id, :id => running_time.id), :class => 'blank stopTime' %> <% else %> - <% form_tag times_path, :method => :post do %> - <div> - <%= hidden_field_tag 'time[name]', task_item.text[0, ProjectTime.columns_hash['name'].limit], :id => nil %> - <%= hidden_field_tag 'time[open_task_id]', task_item.id, :id => nil %> - <%= hidden_field_tag 'time[assigned_to_id]', @logged_user.id, :id => nil %> - <%= image_submit_tag 'icons/start.gif', :alt => :start_time.l, :class => 'image' %> - </div> - <% end %> +<%= link_to render_icon('start', :start_time.l), times_path, :class => 'blank startTime', :task_id => task_item.id %> <% end %> <% end %> </div> app/views/tasks/_show.html.erb @@ -124,7 +124,7 @@ welcome_back: "Willkommen zurück <strong>{{user}}</strong>" logout: Abmelden are_you_sure_logout: Sind sie sicher, daß Sie sich ausloggen wollen? - running_times: "you have {{count}} running times" + running_times: "You have {{count}} running times" # Permission names can_manage_messages: Manage messages config/locales/de.yml @@ -130,7 +130,7 @@ en-US: welcome_back: "Welcome back <strong>{{user}}</strong>" logout: Logout are_you_sure_logout: Are you sure you want to log out? - running_times: "you have {{count}} running times" + running_times: "You have {{count}} running times" # Permission names can_manage_messages: Manage messages config/locales/en-US.yml @@ -129,7 +129,7 @@ en: welcome_back: "Welcome back <strong>{{user}}</strong>" logout: Logout are_you_sure_logout: Are you sure you want to log out? - running_times: "you have {{count}} running times" + running_times: "You have {{count}} running times" # Permission names can_manage_messages: Manage messages config/locales/en.yml @@ -130,8 +130,8 @@ es: logout: Cerrar sesión are_you_sure_logout: ¿Estás seguro de que quieres cerrar sesión? running_times: - one: "tienes {{count}} tiempo en progreso" - other: "tienes {{count}} tiempos en progreso" + one: "Tienes {{count}} tiempo en progreso" + other: "Tienes {{count}} tiempos en progreso" # Permission names can_manage_messages: Gestionar mensajes config/locales/es.yml @@ -124,7 +124,7 @@ zh-CN: welcome_back: "欢迎你回来 <strong>{{user}}</strong>" logout: 退出 are_you_sure_logout: 你确定要退出? - running_times: "you have {{count}} running times" + running_times: "You have {{count}} running times" # Permission names can_manage_messages: 管理消息 config/locales/zh-CN.yml @@ -294,6 +294,28 @@ function bindDynamic() { return false; }); + + // Start & stop time + + $('.startTime').click(function(evt) { + var el = $(this); + $.post(Project.buildUrl('/times'), { + 'time[open_task_id]': el.attr('task_id'), + 'time[assigned_to_id]': LOGGED_USER_ID, + }, JustRebind, 'script'); + + return false; + }); + + $('.stopTime').click(function(evt) { + var el = $(this); + $.put(el.attr('href'), { + 'time[open_task_id]': el.attr('task_id'), + 'time[assigned_to_id]': LOGGED_USER_ID, + }, JustRebind, 'script'); + + return false; + }); } function JustReload(data) { @@ -326,13 +348,27 @@ function rebindDynamic() { $('#action_dialog a.cancel').unbind(); $('a.oaction').unbind(); + + $('.startTime').unbind(); + $('.stopTime').unbind(); bindDynamic(); } var Project = { buildUrl: function(resource) { - return ('/project' + PROJECT_ID + resource); + return ('/projects/' + PROJECT_ID + resource); + }, + + updateRunningTimes: function(size, locale) { + $('#running_times_count span').html(locale); + + if (size > 0) + $('#running_times_count').show(); + else { + $('#running_times_count').hide(); + $('#running_times_menu').hide(); + } } }; public/javascripts/application.js @@ -109,10 +109,6 @@ body { list-style: square; } -#userbox #running_times_menu form, #userbox #running_times_menu form div { - display: inline; -} - /** Tabs **/ #tabsWrapper { public/themes/default/stylesheets/general/construction.css 898bd06df57afe2eeddd25552a4475390549470d jamesu jamesu@gmail.com http://github.com/jamesu/railscollab/commit/eadf052075498bee22a26310c4bd46b19c466e9d eadf052075498bee22a26310c4bd46b19c466e9d 2009-11-04T12:26:32-08:00 2009-11-04T12:26:32-08:00 Ajaxified the time stop & start. No more reloads! 142432018a2c8d3e57203c2a279637a5cfdb8356 jamesu jamesu@gmail.com