Browse Source

Louis | Adds client waiting list to client list

master
Loos 10 years ago
parent
commit
048d765c2e
  1. 1
      app/controllers/clients_controller.rb
  2. 8
      app/models/client.rb
  3. 33
      app/views/clients/index.html.haml
  4. 4
      app/views/static_pages/home.html.haml
  5. 2
      lib/tasks/dummydata.rake

1
app/controllers/clients_controller.rb

@ -3,6 +3,7 @@ class ClientsController < ApplicationController
before_action :authenticate_user! before_action :authenticate_user!
def index def index
@waiting_list = Client.waiting_list
@clients = Client.all @clients = Client.all
end end

8
app/models/client.rb

@ -1,4 +1,12 @@
class Client < ActiveRecord::Base class Client < ActiveRecord::Base
has_one :bike has_one :bike
belongs_to :agency belongs_to :agency
def self.waiting_list
clients = Client.all
non_voided_clients = clients.select{|client| !client.application_voided}
incomplete_clients = non_voided_clients.select{|client| !client.completion_date}
waiting_list = incomplete_clients.sort_by!{|client| client.application_date}
end
end end

33
app/views/clients/index.html.haml

@ -1,5 +1,35 @@
.container .container
%h1 Clients .row
= link_to ' + New Client', new_client_path, class: "btn btn-default"
.row
%h1 Client Waiting List
%table.table.table-striped.table-bordered.table-hover
%thead
%tr
%th Number
%th First Name
%th Last Name
%th Application Date
%th Agency
%th
%th
%th
%tbody
- @waiting_list.each_with_index do |client, index|
%tr
%td= index + 1
%td= client.first_name
%td= client.last_name
%td= client.application_date
%td= client.agency.agency_name if client.agency
%td= link_to 'Show', client
%td= link_to 'Edit', edit_client_path(client)
%td= link_to 'Destroy', client, method: :delete, data: { confirm: 'Are you sure?' }
%br
.row
%h1 All Clients
%table.table.table-striped.table-bordered.table-hover %table.table.table-striped.table-bordered.table-hover
%thead %thead
@ -21,4 +51,3 @@
%td= link_to 'Destroy', client, method: :delete, data: { confirm: 'Are you sure?' } %td= link_to 'Destroy', client, method: :delete, data: { confirm: 'Are you sure?' }
%br %br
= link_to ' + New Client', new_client_path, class: "btn btn-default"

4
app/views/static_pages/home.html.haml

@ -1,9 +1,5 @@
.container .container
%h1 Bike &amp; Client Tracker %h1 Bike &amp; Client Tracker
- if current_user
= link_to "Sign out", destroy_user_session_path, method: :delete
- else
= link_to "Sign in", new_user_session_path
%br %br
= link_to "View All Bikes", bikes_path = link_to "View All Bikes", bikes_path
%br %br

2
lib/tasks/dummydata.rake

@ -35,7 +35,7 @@ namespace :db do
weight: rand(100) + 100, weight: rand(100) + 100,
helmet: [true, false].sample, helmet: [true, false].sample,
lock: [true, false].sample, lock: [true, false].sample,
completion_date: rand(30.days).ago, completion_date: [rand(30.days).ago, nil].sample,
bike_type_requested: ["Cruiser", "Road", "Mountain"].sample, bike_type_requested: ["Cruiser", "Road", "Mountain"].sample,
will_pay: [true, false].sample, will_pay: [true, false].sample,
notes: "A great client!", notes: "A great client!",

Loading…
Cancel
Save