The self tracking functionality allows the volunteers to check themselves in and out. To secure the system your personal account will be logged out.
+ +For <%= @project.name %> - <%= @workday.name %> - <%= @workday.workdate.strftime("%A, %B %-d, %Y") %>
+ +<%= link_to({ :action => "launch_self_tracking" }, :class => "btn btn-primary") do %> + Launch... +<% end %> diff --git a/config/database.yml b/config/database.yml index 0d0affd..bd2c8d4 100644 --- a/config/database.yml +++ b/config/database.yml @@ -16,7 +16,8 @@ development: username: hfh_rol_dev password: ^nHYebFYbsd9 timeout: 5000 - host: postgresql-common + host: localhost + # host: postgresql-common # Warning: The database defined as "test" will be erased and # re-generated from your development database when you run "rake". @@ -29,6 +30,7 @@ test: username: hfh_rol_test password: ^nHYebFYbsd9 timeout: 5000 + host: localhost # Production DB on WebFaction (Heroku handles through environment vars I think) diff --git a/config/environments/development.rb b/config/environments/development.rb index b55e214..347db45 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -19,6 +19,9 @@ # Print deprecation notices to the Rails logger. config.active_support.deprecation = :log + #config.assets.js_compressor = :uglifier + config.assets.css_compressor = :sass + # Raise an error on page load if there are pending migrations. config.active_record.migration_error = :page_load diff --git a/config/routes.rb b/config/routes.rb index 41866b0..5913d79 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -9,6 +9,7 @@ delete 'logout' => 'sessions#destroy' resources :pending_volunteers do + post :edit, :update member do get 'match' end @@ -51,6 +52,8 @@ end member do get 'add_participants' + get 'confirm_launch_self_tracking' + get 'launch_self_tracking' end end diff --git a/db/migrate/20170116001609_add_needs_review_to_volunteer.rb b/db/migrate/20170116001609_add_needs_review_to_volunteer.rb new file mode 100644 index 0000000..564a6b9 --- /dev/null +++ b/db/migrate/20170116001609_add_needs_review_to_volunteer.rb @@ -0,0 +1,5 @@ +class AddNeedsReviewToVolunteer < ActiveRecord::Migration + def change + add_column :volunteers, :needs_review, :boolean, :default => false + end +end diff --git a/db/schema.rb b/db/schema.rb index 86e5cd5..7567ab2 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20161108052146) do +ActiveRecord::Schema.define(version: 20170116001609) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -224,6 +224,7 @@ t.integer "pending_volunteer_id" t.datetime "deleted_at" t.string "deleted_reason" + t.boolean "needs_review", default: false end add_index "volunteers", ["church_id"], name: "index_volunteers_on_church_id", using: :btree diff --git a/doc/models_complete.png b/doc/models_complete.png new file mode 100644 index 0000000..d3abd40 Binary files /dev/null and b/doc/models_complete.png differ diff --git a/docker-sync.yml b/docker-sync.yml index cf42c79..b0695c8 100644 --- a/docker-sync.yml +++ b/docker-sync.yml @@ -79,7 +79,7 @@ syncs: # this does not user groupmap but rather configures the server to map # sync_groupid: '6000' - watch_excludes: ['.*/.git', '.*/node_modules', '.*/bower_components', '.*/sass-cache', '.*/.sass-cache', '.*/.sass-cache', '.coffee', '.scss', '.sass', '.gitignore'] + watch_excludes: ['.*/.git', './tmp', '.*/node_modules', '.*/bower_components', '.*/sass-cache', '.*/.sass-cache', '.*/.sass-cache', '.coffee', '.scss', '.sass', '.gitignore'] # optional: use this to switch to fswatch verbose mode watch_args: '-v' diff --git a/farhan_notes.txt b/farhan_notes.txt new file mode 100644 index 0000000..386ccf4 --- /dev/null +++ b/farhan_notes.txt @@ -0,0 +1,17 @@ + +---------------- + +* Continue working on the PendingVolunteer merge. Test the Volunteer--Volunteer merge as well. +* Launch point on the "Add Participant" page on workday. +* Migration for converting the existing pending volunteers. +* Add waiver date to the grid. + + +TODO for later + * How to lookup the password min length from db for User class? See user model. + * Will new volunteers have a different set of interests? + * Is it OK to assume that all pending volunteers will be resolved when the upgrade is done? This way we don't have to worry about conversions. + * Delete Volunteer.pending_volunteer_id + + +* See if there is a different way to label the "use" fields on the merge screens (see resolve_fields_table). diff --git a/test/controllers/pending_volunteers_controller_test.rb b/test/controllers/pending_volunteers_controller_test.rb index 9731119..83e22fa 100644 --- a/test/controllers/pending_volunteers_controller_test.rb +++ b/test/controllers/pending_volunteers_controller_test.rb @@ -4,9 +4,9 @@ class PendingVolunteersControllerTest < ActionController::TestCase def setup @user = users(:one) - @pending_volunteer = pending_volunteers(:one) - @pending_volunteer2 = pending_volunteers(:two) - @pending_volunteer3 = pending_volunteers(:three) + @pending_volunteer = volunteers(:pending_one) + @pending_volunteer2 = volunteers(:pending_two) + @pending_volunteer3 = volunteers(:pending_three) @volunteer = Volunteer.new() @volunteer.first_name = @pending_volunteer.first_name + 'a' @volunteer.last_name = @pending_volunteer.last_name @@ -39,7 +39,7 @@ def teardown log_in_as(@user) get :index assert_template 'shared/simple_index' - pending_volunteers = PendingVolunteer.where(resolved: false) + pending_volunteers = Volunteer.pending.all pending_volunteers.each do |pending_volunteer| assert_select 'div[href=?]', match_pending_volunteer_path(pending_volunteer) end @@ -47,11 +47,11 @@ def teardown test "index display with nobody" do log_in_as(@user) - @pending_volunteer.resolved = true + @pending_volunteer.needs_review = false @pending_volunteer.save! - @pending_volunteer2.resolved = true + @pending_volunteer2.needs_review = false @pending_volunteer2.save! - @pending_volunteer3.resolved = true + @pending_volunteer3.needs_review = false @pending_volunteer3.save! get :index assert_template 'shared/simple_index' diff --git a/test/fixtures/pending_volunteers.yml b/test/fixtures/pending_volunteers.yml deleted file mode 100644 index 8f79e3a..0000000 --- a/test/fixtures/pending_volunteers.yml +++ /dev/null @@ -1,13 +0,0 @@ -# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html - -one: - first_name: Tim - last_name: Smith - -two: - first_name: Tom - last_name: Jones - -three: - first_name: Jane - last_name: Smith \ No newline at end of file diff --git a/test/fixtures/volunteers.yml b/test/fixtures/volunteers.yml index 284e769..13d82f4 100644 --- a/test/fixtures/volunteers.yml +++ b/test/fixtures/volunteers.yml @@ -81,3 +81,18 @@ master: work_phone: mobile_phone: notes: A bunch of notes + +pending_one: + first_name: Tim + last_name: Smith + needs_review: true + +pending_two: + first_name: Tom + last_name: Jones + needs_review: true + +pending_three: + first_name: Jane + last_name: Smith + needs_review: true diff --git a/test/integration/volunteers_edit_test.rb b/test/integration/volunteers_edit_test.rb index 44080c2..247cfd6 100644 --- a/test/integration/volunteers_edit_test.rb +++ b/test/integration/volunteers_edit_test.rb @@ -212,7 +212,7 @@ def teardown test "New volunteer from pending volunteer" do log_in_as(@user) - @pending_volunteer = pending_volunteers(:one) + @pending_volunteer = volunteers(:pending_one) get new_volunteer_path(pending_volunteer_id: @pending_volunteer) assert_template 'new' assert_select "[name*=first_name]" do @@ -222,7 +222,9 @@ def teardown post volunteers_path(@volunteer), volunteer: {first_name: @pending_volunteer.first_name, last_name: @pending_volunteer.last_name, pending_volunteer_id: @pending_volunteer.id} @pending_volunteer.reload - assert_equal(@pending_volunteer.resolved, true) + # TODO: I need to understand and fix this logic - Farhan + assert_equal(@pending_volunteer.needs_review, true) + assert_not_equal(@pending_volunteer.deleted_at, nil) end @@ -473,4 +475,4 @@ def teardown end -end \ No newline at end of file +end diff --git a/test/models/pending_volunteer_test.rb b/test/models/pending_volunteer_test.rb index ab4af53..419cc99 100644 --- a/test/models/pending_volunteer_test.rb +++ b/test/models/pending_volunteer_test.rb @@ -6,7 +6,7 @@ def setup end test "first and last name present" do - @pending_volunteer = PendingVolunteer.new + @pending_volunteer = Volunteer.pending.new @pending_volunteer.first_name = " " assert_not @pending_volunteer.valid? @pending_volunteer.first_name = "Example" @@ -14,6 +14,4 @@ def setup assert_not @pending_volunteer.valid? end - - -end \ No newline at end of file +end