Merge branch 'features/009/activity_pomodoros'

app/models/pomodoro.rb

@@ -3,6 +3,10 @@ class Pomodoro < ActiveRecord::Base
 
   validates :activity_id, presence: true
 
+  def completed?
+    !completed_at.nil?
+  end
+
   def complete!
     self.update_attribute :completed_at, Time.now
   end

app/views/activities/_pomodoro.html.slim

@@ -0,0 +1,4 @@
+- if pomodoro.completed?
+  'X
+- else
+  'R

app/views/activities/index.html.slim

@@ -3,8 +3,10 @@
 table id="activities"
   - @activities.each do |activity|
     = content_tag_for(:tr, activity) do
+      td = check_box('activity', 'completed', activity_id: activity.id, checked: activity.completed?)
       td = activity.title
       td = link_to t('navigation.start_pomodoro'), activity_pomodoros_path(activity_id: activity), :remote => true, :method => :post
       td = link_to t('navigation.edit_activity'), edit_activity_path(activity)
       td = link_to t('navigation.delete_activity'), activity, :method => :delete
-      td = check_box('activity', 'completed', activity_id: activity.id, checked: activity.completed?)
+      td id=dom_id(activity, :pomodoros)
+        == render partial: 'pomodoro', collection: activity.pomodoros

app/views/pomodoros/complete.js.coffee

@@ -1 +1,2 @@
+$("#<%= dom_id(@activity, :pomodoros) %>").html("<%= escape_javascript(render partial: 'activities/pomodoro', collection: @activity.pomodoros) %>")
 $("#reset_timer").html ""

app/views/pomodoros/create.js.coffee

@@ -1,2 +1,2 @@
-pomodoro_timer(<%= @activity.id %>, <%= @pomodoro.id %>, 1500)
+pomodoro_timer(<%= @activity.id %>, <%= @pomodoro.id %>, 3)
 $("#reset_timer").html "<%= escape_javascript(render partial: 'activities/reset_link', locals: { activity_id: @pomodoro.activity.id, pomodoro_id: @pomodoro.id }) %>"

app/views/pomodoros/reset.js.coffee

@@ -1 +1,2 @@
+$("#<%= dom_id(@activity, :pomodoros) %>").html("<%= escape_javascript(render partial: 'activities/pomodoro', collection: @activity.pomodoros) %>")
 reset_pomodoro_timer(1500)