testing

README.md

@@ -1,24 +1,3 @@
-# About
-A web application for bicycle collectives to track bicycles, bicycle work history, volunteer hours, volunteer work history, and volunteers currently in the shop.
-
-See an overview video of what it looks like and how it works here: https://www.youtube.com/watch?v=0-JjM6d9nK4.
-
-## Instructions/Guides
-
-### Adding a User
-To add a user, a user must sign themselves up from the initial login screen.  An admin can later log in to grant that user admin privileges afterward, if desired.
-
-### Adding a Bike
-How to add a bike to the database: https://www.youtube.com/watch?v=1IchWUdMQ90.
-
-## Views
-The app has two different views.  One for "core" volunteers which I consider admins, and another for "customer" volunteers which I consider users.  Because of the Netzke/ExtJS framework I used, the current UI is non-intuitive and I feel like is only adequate for admins who can take the time to learn the system.  I'm in the process of designing a simpler mobile friendly UI with the essential functionality that's intended for users.
-
-## Deployment
-Currently, at the Velocipede collective we have it running on a computer in the shop on the local network.  The reason for this, is so that it's only accessible from within the shop.  I'm weighing out different methods for ensuring that users can only log in from within the shop (and not from home), such as a shop password that only admins can see and would make visible from within the physical bike shop.  I also don't have to worry about security issues while the app is in development.  In the future, I'd like to see the app hosted much like http://freehub.bikekitchen.org/.
-
-## Ideas
-At Velocipede, with a mobile friendly UI for users, I'm hoping we can get donations of old, unused smart phones, connected via local wifi, that can be used as stations to log a volunteer's work and hours.  They can be secured by gluing cables into the earphone jacks to deter theft if necessary.  This might be another way that the collective can promote reuse of materials.
 
 # Developer Setup
 
@@ -27,8 +6,6 @@ At Velocipede, with a mobile friendly UI for users, I'm hoping we can get donati
 1. `gem install bundler`
 1. `bundle`
 1. Install Postgres (Mac OSX instructions below)
-1. Copy over DB config:  `cp config/database.yml.example config/database.yml`
-1. Update config with your database (velocipede), user (velocipede), and password.
 1. `rake db:create db:migrate`
 1. `rake db:seed`
 1. Download extJS 4.1 (A version of 4.1 is hosted here: http://my.jasondenney.com/extjs-4.1.1.zip) Latest versions at http://www.sencha.com/products/extjs. Unzip and place where ever you like.
@@ -43,6 +20,8 @@ At Velocipede, with a mobile friendly UI for users, I'm hoping we can get donati
 1. Start Postgres `pg_ctl -D /usr/local/var/postgres -l /usr/local/var/postgres/server.log start`
 1. Create your PG user `createuser -d -P velocipede`
 1. Create your database `createdb -U velocipede --owner=velocipede velocipede`
+1. Copy over DB config:  `cp config/database.yml.example config/database.yml`
+1. Update config with your database (velocipede), user (velocipede), and password.
 
 # Optional
  Add icons
@@ -54,3 +33,6 @@ At Velocipede, with a mobile friendly UI for users, I'm hoping we can get donati
 Velocipede is released under the MIT license (http://opensource.org/licenses/MIT)
 
 <a href="http://madewithloveinbaltimore.org">Made with &hearts; in Baltimore</a>
+
+
+Testing

app/models/user.rb

@@ -47,8 +47,7 @@ class User < ActiveRecord::Base
 ### TODO methods below probably belong somewhere else
 
   def completed_build_bikes
-    #default BUILDBIKE/CLASS ID is 5
+    purpose_id = BikePurpose.find_by_purpose("BUILDBIKE").id
-    purpose_id = 5
     Bike.find_by_sql("
       SELECT * 
       FROM bikes

db/schema.rb

@@ -47,8 +47,8 @@ ActiveRecord::Schema.define(:version => 20131019170248) do
   end
 
   create_table "bike_wheel_sizes", :force => true do |t|
-    t.integer "twmm"
+    t.string "twmm"
-    t.integer "rdmm"
+    t.string "rdmm"
     t.string "twin"
     t.string "rdin"
     t.string "twfr"