Skip to content

Instantly share code, notes, and snippets.

@skalnik
Created September 8, 2009 03:21
Show Gist options
  • Save skalnik/182697 to your computer and use it in GitHub Desktop.
Save skalnik/182697 to your computer and use it in GitHub Desktop.
Updating 3f9869b..8a27242
Fast forward
app/controllers/agents_controller.rb | 9 +-
app/controllers/application_controller.rb | 2 +-
app/controllers/buy_controller.rb | 112 ++++++----------
app/controllers/clients_controller.rb | 83 +++++++++++-
app/controllers/interviewees_controller.rb | 24 ++--
app/controllers/options_controller.rb | 6 +-
app/controllers/sessions_controller.rb | 4 +-
app/controllers/statistics_controller.rb | 21 +++
app/helpers/application_helper.rb | 70 ++++++++++
app/helpers/interviewees_helper.rb | 50 -------
app/helpers/statistics_helper.rb | 22 +++
app/models/agent.rb | 13 ++
app/models/bad_client_options.rb | 13 ++
app/models/client.rb | 99 +++++++++++++-
app/models/creditcard.rb | 8 +
app/models/good_client_options.rb | 13 ++
app/models/interviewee.rb | 39 +-----
app/models/office.rb | 5 +-
app/models/registrar.rb | 57 ++++++++
app/models/statistics.rb | 141 +++++++++++++++++++-
app/models/user.rb | 49 ++++++-
app/views/agents/index.html.erb | 2 +
app/views/buy/first_account.html.erb | 32 -----
app/views/buy/index.html.erb | 75 ++++++++---
app/views/buy/office.html.erb | 36 +++++
app/views/buy/pay.html.erb | 4 +-
app/views/buy/user.html.erb | 46 +++++++
app/views/clients/bad.html.erb | 32 +++++
app/views/clients/edit.html.erb | 39 ++++++
app/views/clients/good.html.erb | 20 +++
app/views/clients/index.html.erb | 45 ++++++
app/views/clients/new.html.erb | 4 +-
app/views/clients/reschedule.html.erb | 13 ++
app/views/interviewees/edit.html.erb | 7 +-
app/views/interviewees/index.html.erb | 39 ++----
app/views/layouts/buy.html.erb | 10 +-
app/views/layouts/hello.html.erb | 17 ++-
app/views/options/_sidebar.html.erb | 2 +
app/views/shared/_legend.html.erb | 16 +++
app/views/shared/_search.html.erb | 3 +
app/views/statistics/_input.html.erb | 75 ++++++-----
app/views/statistics/_sidebar.html.erb | 11 +-
app/views/statistics/agents.html.erb | 31 +++++
app/views/statistics/interviewees.html.erb | 4 +-
config/environment.rb | 7 +-
.../20090902201348_add_agency_id_to_clients.rb | 9 ++
.../20090903031004_add_agent_id_to_clients.rb | 9 ++
.../20090904210756_add_confirmed_to_clients.rb | 9 ++
db/migrate/20090904234813_add_status_to_clients.rb | 9 ++
.../20090905015205_create_good_client_options.rb | 17 +++
.../20090905030557_create_bad_client_options.rb | 20 +++
.../20090908011330_add_user_id_to_creditcards.rb | 9 ++
..._and_invalid_card_and_referral_code_to_users.rb | 13 ++
db/schema.rb | 33 +++++-
lib/client_interviewee_extensions.rb | 75 +++++++++--
public/javascripts/application.js | 13 ++
public/stylesheets/login.css | 2 +-
public/stylesheets/style.css | 5 +-
public/stylesheets/tables.css | 2 +-
test/fixtures/bad_client_options.yml | 21 +++
test/fixtures/good_client_options.yml | 15 ++
test/unit/bad_client_options_test.rb | 8 +
test/unit/good_client_options_test.rb | 8 +
.../awesome_nested_set/lib/awesome_nested_set.rb | 9 ++
64 files changed, 1341 insertions(+), 355 deletions(-)
create mode 100644 app/models/bad_client_options.rb
create mode 100644 app/models/good_client_options.rb
create mode 100644 app/models/registrar.rb
delete mode 100644 app/views/buy/first_account.html.erb
create mode 100644 app/views/buy/office.html.erb
create mode 100644 app/views/buy/user.html.erb
create mode 100644 app/views/clients/bad.html.erb
create mode 100644 app/views/clients/edit.html.erb
create mode 100644 app/views/clients/good.html.erb
create mode 100644 app/views/clients/reschedule.html.erb
create mode 100644 app/views/shared/_legend.html.erb
create mode 100644 app/views/shared/_search.html.erb
create mode 100644 app/views/statistics/agents.html.erb
create mode 100644 db/migrate/20090902201348_add_agency_id_to_clients.rb
create mode 100644 db/migrate/20090903031004_add_agent_id_to_clients.rb
create mode 100644 db/migrate/20090904210756_add_confirmed_to_clients.rb
create mode 100644 db/migrate/20090904234813_add_status_to_clients.rb
create mode 100644 db/migrate/20090905015205_create_good_client_options.rb
create mode 100644 db/migrate/20090905030557_create_bad_client_options.rb
create mode 100644 db/migrate/20090908011330_add_user_id_to_creditcards.rb
create mode 100644 db/migrate/20090908020407_add_banned_and_invalid_card_and_referral_code_to_users.rb
create mode 100644 test/fixtures/bad_client_options.yml
create mode 100644 test/fixtures/good_client_options.yml
create mode 100644 test/unit/bad_client_options_test.rb
create mode 100644 test/unit/good_client_options_test.rb
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment