Removed trailing whitespace.

This commit is contained in:
Paul van Tilburg 2011-11-09 15:14:48 +01:00
parent e4e709bd72
commit 6aa19d1e08
1 changed files with 17 additions and 17 deletions

View File

@ -136,7 +136,7 @@ module StopTime::Models
class StopTimeTables < V 1.0 class StopTimeTables < V 1.0
def self.up def self.up
create_table Customer.table_name do |t| create_table Customer.table_name do |t|
t.string :name, :short_name, t.string :name, :short_name,
:address_street, :address_postal_code, :address_city, :address_street, :address_postal_code, :address_city,
:email, :phone :email, :phone
t.timestamps t.timestamps
@ -439,7 +439,7 @@ module StopTime::Controllers
if Time.now.year > last_year if Time.now.year > last_year
number = ("%d%02d" % [Time.now.year, 1]) number = ("%d%02d" % [Time.now.year, 1])
else else
number = last.number.succ number = last.number.succ
end end
else else
number = ("%d%02d" % [Time.now.year, 1]) number = ("%d%02d" % [Time.now.year, 1])
@ -696,7 +696,7 @@ module StopTime::Views
tr do tr do
td { _form_select("customer", @customer_list) } td { _form_select("customer", @customer_list) }
td { _form_select("task", @task_list) } td { _form_select("task", @task_list) }
td { input :type => :text, :name => "start", td { input :type => :text, :name => "start",
:value => DateTime.now.to_date.to_formatted_s + " " } :value => DateTime.now.to_date.to_formatted_s + " " }
td { input :type => :text, :name => "end", td { input :type => :text, :name => "end",
:value => DateTime.now.to_date.to_formatted_s + " " } :value => DateTime.now.to_date.to_formatted_s + " " }
@ -711,7 +711,7 @@ module StopTime::Views
end end
@time_entries.each do |entry| @time_entries.each do |entry|
tr do tr do
td { a entry.customer.short_name, td { a entry.customer.short_name,
:href => R(CustomersN, entry.customer.id) } :href => R(CustomersN, entry.customer.id) }
td { a entry.task.name, td { a entry.task.name,
:href => R(CustomersNTasksN, entry.customer.id, entry.task.id) } :href => R(CustomersNTasksN, entry.customer.id, entry.task.id) }
@ -720,7 +720,7 @@ module StopTime::Views
td { entry.end } td { entry.end }
td { entry.comment } td { entry.comment }
td { "%.2fh" % entry.hours_total } td { "%.2fh" % entry.hours_total }
td do td do
if entry.bill if entry.bill
input :type => "checkbox", :name => "bill_#{entry.id}", input :type => "checkbox", :name => "bill_#{entry.id}",
:checked => true, :disabled => true :checked => true, :disabled => true
@ -783,7 +783,7 @@ module StopTime::Views
customer.address_city].join(", ") unless customer.address_street.blank? } customer.address_city].join(", ") unless customer.address_street.blank? }
td { a customer.email, :href => "mailto:#{customer.email}" } td { a customer.email, :href => "mailto:#{customer.email}" }
td { customer.phone } td { customer.phone }
td do td do
form :action => R(CustomersN, customer.id), :method => :post do form :action => R(CustomersN, customer.id), :method => :post do
input :type => :submit, :name => "delete", :value => "Delete" input :type => :submit, :name => "delete", :value => "Delete"
end end
@ -795,10 +795,10 @@ module StopTime::Views
a "Add a new customer", :href=> R(CustomersNew) a "Add a new customer", :href=> R(CustomersNew)
end end
end end
def customer_form def customer_form
form :action => R(*@target), :method => :post do form :action => R(*@target), :method => :post do
ol do ol do
li { _form_input_with_label("Name", "name", :text) } li { _form_input_with_label("Name", "name", :text) }
li { _form_input_with_label("Short name", "short_name", :text) } li { _form_input_with_label("Short name", "short_name", :text) }
li { _form_input_with_label("Street address", "address_street", :text) } li { _form_input_with_label("Street address", "address_street", :text) }
@ -846,7 +846,7 @@ module StopTime::Views
invoices.each do |invoice| invoices.each do |invoice|
tr do tr do
td do td do
a invoice.number, a invoice.number,
:href => R(CustomersNInvoicesX, @customer.id, invoice.number) :href => R(CustomersNInvoicesX, @customer.id, invoice.number)
end end
td { invoice.updated_at } td { invoice.updated_at }
@ -869,11 +869,11 @@ module StopTime::Views
def task_form def task_form
form :action => R(*@target), :method => :post do form :action => R(*@target), :method => :post do
ul do ul do
li { _form_input_with_label("Name", "name", :text) } li { _form_input_with_label("Name", "name", :text) }
li do li do
ol.radio do ol.radio do
li do li do
_form_input_radio("type", "hourly_rate", default=true) _form_input_radio("type", "hourly_rate", default=true)
_form_input_with_label("Hourly rate", "hourly_rate", :text) _form_input_with_label("Hourly rate", "hourly_rate", :text)
end end
@ -882,7 +882,7 @@ module StopTime::Views
_form_input_with_label("Fixed cost", "fixed_cost", :text) _form_input_with_label("Fixed cost", "fixed_cost", :text)
end end
end end
end end
# FIXME: add link(s) to related invoice(s) # FIXME: add link(s) to related invoice(s)
end end
input :type => "submit", :name => @method, :value => @method.capitalize input :type => "submit", :name => @method, :value => @method.capitalize
@ -892,7 +892,7 @@ module StopTime::Views
def invoices def invoices
h2 "List of invoices" h2 "List of invoices"
p "N/A" p "N/A"
end end
@ -926,7 +926,7 @@ module StopTime::Views
end end
end end
end end
table do table do
tr do tr do
th { "Description" } th { "Description" }
@ -1046,7 +1046,7 @@ module StopTime::Views
end end
end end
form :action => R(Company), :method => :post do form :action => R(Company), :method => :post do
ol do ol do
li { _form_input_with_label("Name", "name", :text) } li { _form_input_with_label("Name", "name", :text) }
li { _form_input_with_label("Contact name", "contact_name", :text) } li { _form_input_with_label("Contact name", "contact_name", :text) }
li { _form_input_with_label("Street address", "address_street", :text) } li { _form_input_with_label("Street address", "address_street", :text) }
@ -1087,12 +1087,12 @@ module StopTime::Views
input :type => "checkbox", :id => "#{name}_#{value}", :name => name, input :type => "checkbox", :id => "#{name}_#{value}", :name => name,
:value => value, :checked => true :value => value, :checked => true
else else
input :type => "checkbox", :id => "#{name}_#{value}", :name => name, input :type => "checkbox", :id => "#{name}_#{value}", :name => name,
:value => value :value => value
end end
end end
def _form_select(name, opts_list) def _form_select(name, opts_list)
select :name => name, :id => name do select :name => name, :id => name do
opts_list.each do |opt_val, opt_str| opts_list.each do |opt_val, opt_str|
if @input[name] == opt_val if @input[name] == opt_val