Allow editing of existing time entries

app/controllers/entries_controller.rb

@@ -32,6 +32,9 @@ def create
   end
 
   def edit
+    respond_to do |f|
+      f.js {}
+    end
   end
 
   def update
@@ -41,6 +44,7 @@ def update
         f.js {}
       else
         f.html{ flash.now[:info] = t('response.error'); render :action => :edit }
+        f.js {}
       end
     end
   end
@@ -61,6 +65,7 @@ def restart
   end
 
   def terminate
+    @entry.quick_update = true
     @entry.terminate
 
     respond_to do |f|
@@ -83,6 +88,9 @@ def destroy
   end
 
   def show
+    respond_to do |f|
+      f.js { render :action => :update }
+    end
   end
 
   def report

app/helpers/entries_helper.rb

@@ -6,6 +6,12 @@ def new_entry_form(project, client, service)
       :entry => Entry.new }
   end
 
+  def entry_form_for(entry)
+    remote_form_for entry,
+      :id => "entry_#{entry.id}_form",
+      &proc
+  end
+
   def entry_tag(type, value)
     "<div class=\"#{type}\">#{value.escape_html}</div>"
   end

app/models/entry.rb

@@ -4,9 +4,12 @@ class Entry < ActiveRecord::Base
   belongs_to :service
 
   before_create :check_entry
+  before_update :check_entry_update
 
   attr_accessible :content, :service_id, :project_id
 
+  attr_accessor :quick_update
+
   def start(started_at=nil)
     self.start_date = started_at || Time.now
     self.seconds = nil
@@ -20,9 +23,14 @@ def start(started_at=nil)
   TIMEVAL_UNIT_REGEXP = /[0-9]+[sSHhMm]/
   TAG_REGEXP = /[#\@][a-zA-Z0-9\-_]*/
 
-  def format_entry
+  def format_entry(origin_base=nil)
     found_service = nil
     found_project = nil
+    time_now = Time.now
+
+    if origin_base
+      time_now = origin_base
+    end
 
     gen = content.gsub(TAG_REGEXP) do |tag|
       is_project = tag[0...1] == '@' and found_project.nil?
@@ -79,16 +87,16 @@ def format_entry
       # Determine start
       if delta_inc
         # will be spending x time on it
-        found_start = Time.now
+        found_start = time_now
         found_done = in_progress ? nil : found_start + delta_s
       elsif delta_dec
         # spent x time on it already
-        last_ended = Time.now
+        last_ended = time_now
         found_done = in_progress ? nil : last_ended
         found_start = last_ended - delta_s
       else
         # expecting to spend x time on it [not confirmed]
-        found_start = Time.now
+        found_start = time_now
         found_done = nil
         found_limit = delta_s
       end
@@ -97,12 +105,17 @@ def format_entry
     end
 
     self.content_html = gen
-    {:service => found_service, :project => found_project, :start_date => found_start, :done_date => found_done, :limit => found_limit}
+    { :service => found_service, 
+      :project => found_project, 
+      :start_date => found_start, 
+      :done_date => found_done,
+      :limit => found_limit,
+      :origin_time => time_now }
   end
 
   def check_entry
     built = format_entry
-
+    self.original_start = built[:origin_time]
 
     self.service = built[:service] if built[:service]
     self.project = built[:project] if built[:project]
@@ -117,6 +130,28 @@ def check_entry
     self.start if self.start_date.nil?
   end
 
+  def check_entry_update
+    unless @quick_update
+      # Like check_entry, except we maintain start_date
+      # We also maintain done_date unless it was specified
+      # in the content
+      built = format_entry(self.original_start)
+
+      self.service = built[:service] if built[:service]
+      self.project = built[:project] if built[:project]
+      self.service ||= self.user.default_service
+      self.project ||= self.user.default_project
+
+      unless self.original_start.nil?
+        self.start_date = built[:start_date]
+        self.done_date ||= built[:done_date]
+        self.seconds_limit = built[:limit]
+      end
+    end
+
+    self.seconds = current_time unless self.done_date.nil?
+  end
+
   def terminate
     self.done_date = Time.now
     self.seconds = self.done_date - self.start_date

app/views/entries/_edit.haml

@@ -0,0 +1,9 @@
+.entry{:id => "entry_#{entry.id}"}
+  - entry_form_for entry do |f| 
+    = f.text_field :content
+    .formActions
+      = f.submit t('.submit')
+      = t('.or')
+      = link_to_remote t('.remove'), :url => entry_path(entry), :method => :delete
+      = t('.or')
+      = link_to_remote t('.cancel'), :url => entry_path(entry), :method => :get

app/views/entries/_entry.haml

@@ -1,5 +1,6 @@
 .entry{:id => "entry_#{entry.id}"}
-  .actions
+  .actions	
+    = link_to_remote t('actions.edit'), :url => edit_entry_path(entry), :method => :get
     - unless entry.terminated?
       = link_to_remote t('actions.finish'), :url => terminate_entry_path(entry), :method => :put
   .entryContent{:class => entry.is_overdue? ? 'overdue' : nil}= entry.content_html

app/views/entries/edit.js.rjs

@@ -0,0 +1,2 @@
+page.call "Timer.remove", @entry.id
+page.replace "entry_#{@entry.id}", :partial => 'edit', :locals => {:entry => @entry}

config/locales/en.yml

@@ -63,6 +63,11 @@ en:
     what_status: "What are you doing? (<a href=\"/taglist.html\" target=\"_blank\">Help?</a>)"
     more:
       display_x_more_entries: "Display {{num}} more entries"
+    edit:
+      submit: Update
+      or: or
+      remove: Delete
+      cancel: Cancel
   projects:
     create: Create
     update: Update

db/schema.rb

@@ -55,6 +55,7 @@
     t.integer  "service_id"
     t.integer  "project_id"
     t.integer  "user_id"
+    t.datetime "original_start",:default => nil # time which all deltas were calculated from
     t.datetime "start_date",    :default => nil
     t.datetime "done_date",     :default => nil
     t.integer  "seconds",       :default => 0

public/stylesheets/application.css

@@ -386,3 +386,7 @@ span.time {
 	padding-left: 2px;
 	padding-right: 2px;
 }
+
+form .formActions {
+	text-align: right;
+}

public/taglist.html

@@ -37,6 +37,13 @@
                     <div class='entryContent'><span class="project">@wdom</span> fleeing to next evil lair <span class="service">#run</span> <span class="time">-5M+</span></div>
                     <p class="desc">You have spent 5 minutes fleeing to your next evil lair, and are still in the process of doing so. When done, use "Finish" to mark as complete.</p>
                   </div>
+                  <h2>Note on editing</h2>
+                  <div class='entry'>
+                    <div class='entryContent'>Entries base their time calculations around the time the entry was first created. e.g. changing <span class="time">15M</span> to <span class="time">-15M+</span> will backdate the entry by 15 minutes.</div>
+                  </div>
+                  <div class='entry'>
+                    <div class='entryContent'>Entries which have finished will maintain their end date. e.g. changing <span class="time">-5M</span> to <span class="time">5M</span> results in 0S.</div>
+                  </div>
                 </div> 
               </div> 
             </div>