Przeglądaj źródła

Added payment URLs to CSV downloads

pull/3/head
Adrian Short 14 lat temu
rodzic
commit
9fa0759c5e
2 zmienionych plików z 10 dodań i 5 usunięć
  1. +4
    -5
      app.rb
  2. +6
    -0
      lib/models.rb

+ 4
- 5
app.rb Wyświetl plik

@@ -4,7 +4,6 @@ require 'sinatra-helpers/haml/partials'
require 'haml'
require 'lib/models'


get '/' do
@directorates = Directorate.all( :order => ['name'] )
haml :home
@@ -22,10 +21,10 @@ get '/suppliers/:slug.csv' do
headers "Content-Disposition" => "attachment;filename=supplier-#{@supplier.slug}.csv",
"Content-Type" => "application/octet-stream"

result = "Date,Ref.,Trans No,Directorate,Service,Amount ex. VAT\n"
result = "Date,Ref.,URL,Trans No,Directorate,Service,Amount ex. VAT\n"

for payment in @supplier.payments
result += "#{payment.d.strftime("%d %b %Y")},#{payment.id},#{payment.trans_no},\"#{payment.directorate.name}\",#{payment.service.name},#{sprintf("%0.2f", payment.amount)}\n"
result += "#{payment.d.strftime("%d %b %Y")},#{payment.id},#{payment.url},#{payment.trans_no},\"#{payment.directorate.name}\",#{payment.service.name},#{sprintf("%0.2f", payment.amount)}\n"
end

result
@@ -49,10 +48,10 @@ get '/services/:slug.csv' do
headers "Content-Disposition" => "attachment;filename=service-#{@service.slug}.csv",
"Content-Type" => "application/octet-stream"

result = "Date,Ref.,Trans No,Directorate,Supplier,Amount ex. VAT\n"
result = "Date,Ref.,URL,Trans No,Directorate,Supplier,Amount ex. VAT\n"

for payment in @service.payments
result += "#{payment.d.strftime("%d %b %Y")},#{payment.id},#{payment.trans_no},\"#{payment.directorate.name}\",#{payment.supplier.name},#{sprintf("%0.2f", payment.amount)}\n"
result += "#{payment.d.strftime("%d %b %Y")},#{payment.id},#{payment.url},#{payment.trans_no},\"#{payment.directorate.name}\",#{payment.supplier.name},#{sprintf("%0.2f", payment.amount)}\n"
end

result


+ 6
- 0
lib/models.rb Wyświetl plik

@@ -4,6 +4,8 @@ require 'dm-validations'
require 'dm-timestamps'
require 'dm-aggregates'

SITE_URL = 'http://armchairauditor.heroku.com/'

class Payment
include DataMapper::Resource
@@ -20,6 +22,10 @@ class Payment
belongs_to :directorate
belongs_to :service
belongs_to :supplier
def url
SITE_URL + "payments/" + @id.to_s
end
end




Ładowanie…
Anuluj
Zapisz