From caf01518beb52e38d4fb6c33a50bdfd84410c157 Mon Sep 17 00:00:00 2001 From: Louis Knapp Date: Sat, 30 Jul 2016 21:57:17 -0500 Subject: [PATCH] removes references to agency_name --- app/assets/stylesheets/client_receipt.scss | 1 - app/controllers/clients_controller.rb | 1 - app/models/client.rb | 2 -- app/views/clients/_fields.html.haml | 5 ----- app/views/freecyclery/receipt.html.haml | 4 ++-- notes.md | 3 +++ 6 files changed, 5 insertions(+), 11 deletions(-) diff --git a/app/assets/stylesheets/client_receipt.scss b/app/assets/stylesheets/client_receipt.scss index 44fcc71..f2f9c01 100644 --- a/app/assets/stylesheets/client_receipt.scss +++ b/app/assets/stylesheets/client_receipt.scss @@ -12,5 +12,4 @@ border: 5px solid black; height: 400px; } - } diff --git a/app/controllers/clients_controller.rb b/app/controllers/clients_controller.rb index 93fbeb4..8bd2448 100644 --- a/app/controllers/clients_controller.rb +++ b/app/controllers/clients_controller.rb @@ -67,7 +67,6 @@ class ClientsController < ApplicationController :agency_id, :notes, :bike_fixed, - :number_of_calls, :application_voided, :pickup_date, :volunteer_at_pickup) diff --git a/app/models/client.rb b/app/models/client.rb index be867bd..5ca6535 100644 --- a/app/models/client.rb +++ b/app/models/client.rb @@ -1,6 +1,4 @@ class Client < ActiveRecord::Base - # TODO: figure out why application_date validation is fubar - # validates :application_date, presence: true belongs_to :bike belongs_to :agency diff --git a/app/views/clients/_fields.html.haml b/app/views/clients/_fields.html.haml index 930efd4..a9f9cb9 100644 --- a/app/views/clients/_fields.html.haml +++ b/app/views/clients/_fields.html.haml @@ -78,11 +78,6 @@ .col-sm-10 = f.check_box :bike_fixed, disabled: disabled - .form-group - = f.label "Number of Calls Made:", class: "col-sm-2 control-label" - .col-sm-10 - = f.text_field :number_of_calls, class: "form-control", disabled: disabled - .form-group = f.label "Application Voided:", class: "col-sm-2 control-label" .col-sm-10 diff --git a/app/views/freecyclery/receipt.html.haml b/app/views/freecyclery/receipt.html.haml index 6be1055..0458f4b 100644 --- a/app/views/freecyclery/receipt.html.haml +++ b/app/views/freecyclery/receipt.html.haml @@ -8,7 +8,7 @@ .client-information = @client.name %br - = @client.agency.agency_name if @client.agency + = @client.agency.name if @client.agency .horizontal-line %br Includes: @@ -41,7 +41,7 @@ .client-information = @client.name %br - = @client.agency.agency_name if @client.agency + = @client.agency.name if @client.agency .horizontal-line .row .col-xs-6 diff --git a/notes.md b/notes.md index a1857be..4035559 100644 --- a/notes.md +++ b/notes.md @@ -2,12 +2,15 @@ - search bikes via brand, make, or serial number. - add mechanics table and change text input to a dropdown - freecyclery receipts should fit into sleeve and not squish data + currently, when you print a single receipt it fits better - why is that? - assign a bike from the available freecyclery bikes page - there should be nice feedback indicating that the bike was sold - order agencies by name - restyle agencies page to not have show or destroy links # Tech +- clients should require a name +- eliminate duplication between client receipts and freecyclery receipts - use log number in bike url instead of id - paginate 'all clients' page - convert to bootstrap-less