bike/bike-database
1
0
Fork 0
mirror of https://github.com/fspc/bike-database.git synced 2025-02-23 01:23:24 -05:00
Code Issues Projects Releases Wiki Activity

lk | shows bikes in client wait list

Browse Source
This commit is contained in:
Louis Knapp 2016-01-05 14:16:24 -06:00
parent 071734cac5
commit 3d5b437832
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/models/client.rb
View File

@ -6,10 +6,9 @@ class Client < ActiveRecord::Base
def self.waiting_list def self.waiting_list
clients = Client.all clients = Client.all
non_voided_clients = clients.select{|client| !client.application_voided} nonvoided_clients = clients.select{|client| !client.application_voided}
waiting_list_with_null_application_dates = non_voided_clients.select{|client| !client.pickup_date} active_nonvoided_clients = nonvoided_clients.select{|client| !client.pickup_date}
clients_with_bikes = Client.all.select{|c| !c.bike_id.nil?} waiting_list = active_nonvoided_clients.select{|client| !client.application_date.nil?}
waiting_list = waiting_list_with_null_application_dates.select{|client| !client.application_date.nil?} - clients_with_bikes
waiting_list.sort_by!{|client| client.application_date} waiting_list.sort_by!{|client| client.application_date}
end end

2
app/views/clients/index.html.haml
View File

@ -13,6 +13,7 @@
%th Height %th Height
%th Application Date %th Application Date
%th Agency %th Agency
%th Bike
%th %th
%tbody %tbody
- @waiting_list.each_with_index do |client, index| - @waiting_list.each_with_index do |client, index|
@ -23,6 +24,7 @@
%td= client.height %td= client.height
%td= client.application_date %td= client.application_date
%td= client.agency.agency_name if client.agency %td= client.agency.agency_name if client.agency
%td= client.bike_id ? Bike.find(client.bike_id).name : "None"
%td= link_to 'Edit', edit_client_path(client) %td= link_to 'Edit', edit_client_path(client)
%br %br