Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion app/controllers/log_entries_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ class LogEntriesController < ApplicationController
def create
@log_entry = current_user.log_entries.build(params[:log_entry])
if @success = @log_entry.save
@log_entries = current_user.log_entries.most_recent.pending
@log_entries = current_user.log_entries.most_recent.pending.common
end
end

Expand All @@ -17,5 +17,15 @@ def complete
@log_entry = current_user.log_entries.find(params[:id])
@log_entry.complete!
end

def favorite
@log_entry = current_user.log_entries.find(params[:id])
@log_entry.favorite!
end

def clean_favorite
@log_entry = current_user.log_entries.find(params[:id])
@log_entry.clean_favorite!
end
end

12 changes: 12 additions & 0 deletions app/models/log_entry.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,22 @@ class LogEntry < ActiveRecord::Base

scope :most_recent, :order => 'created_at DESC'
scope :pending, where(:completed => false)
scope :common, where(:starred => false)

def complete!
self.completed = true
save!
end

def favorite!
self.starred = true
save!
end

def clean_favorite!
self.starred = false
save!
end

end

10 changes: 9 additions & 1 deletion app/views/log_entries/_log_entry.erb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<% unless log_entry.new_record? -%>
<li id="item-<%= log_entry.id %>" class="item row">
<li id="item-<%= log_entry.id %>" class="item row <%= log_entry.starred ? 'highlight' : nil %>">
<div class="three columns">
<%= log_entry.created_at.strftime("%B %d, %Y") %>
</div>
Expand All @@ -9,6 +9,14 @@
<div class="four columns">
<%= link_to 'Complete', [:complete, log_entry], :method => :put,
:confirm => "Are you sure?", :remote => true %>
<span class="divider"> | </span>
<% if log_entry.starred %>
<%= link_to 'Unfavorite', [:clean_favorite, log_entry], :method => :put,
:remote => true %>
<% else %>
<%= link_to 'Favorite', [:favorite, log_entry], :method => :put,
:remote => true %>
<% end %>
<span class="divider"> | </span>
<%= link_to 'Remove', log_entry, :method => :delete,
:confirm => "Are you sure?", :remote => true %>
Expand Down
1 change: 1 addition & 0 deletions app/views/log_entries/clean_favorite.js.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
$("#item-<%= @log_entry.id %>").replaceWith("<%= escape_javascript(render(:partial => 'log_entry', :object => @log_entry)) %>");
1 change: 1 addition & 0 deletions app/views/log_entries/favorite.js.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
$("#item-<%= @log_entry.id %>").replaceWith("<%= escape_javascript(render(:partial => 'log_entry', :object => @log_entry)) %>");
2 changes: 2 additions & 0 deletions config/routes.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
resources :log_entries do
member do
put :complete
put :favorite
put :clean_favorite
end
end

Expand Down
1 change: 1 addition & 0 deletions db/migrate/20101101194339_create_log_entries.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ def self.up
t.text :description
t.boolean :obsolete
t.boolean :completed
t.boolean :starred, :default => false

t.timestamps
end
Expand Down
8 changes: 8 additions & 0 deletions public/stylesheets/base.css
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,14 @@ body {
.session { text-align: right; }
.footer { color: #666666; margin-top: 20px; }

.highlight { background-color: #f3e03f; }
.blank { background-color: #ffffff; }

.item { margin-left: 0px; }
.columns { width: 290px; text-align: center; }

.span-1 { width:30px; }

a { color: #666666; }
a:hover { color: #7AB1F8; }

Expand Down