Skip to content

Commit

Permalink
Merge pull request rubycentral#80 from HaughtCodeworks/114-enhance-se…
Browse files Browse the repository at this point in the history
…ed-data

rubycentral#114 - Increase seed data
  • Loading branch information
gitcow authored Aug 9, 2016
2 parents 81865b4 + 24030bc commit 4e73b9a
Show file tree
Hide file tree
Showing 5 changed files with 219 additions and 38 deletions.
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ gem 'simple_form', '3.1.1'
gem 'zeroclipboard-rails'
gem 'responders', '~> 2.0'
gem 'pundit'
gem 'faker'

group :production do
gem 'rails_12factor'
Expand Down
3 changes: 3 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,8 @@ GEM
factory_girl_rails (4.5.0)
factory_girl (~> 4.5.0)
railties (>= 3.0.0)
faker (1.6.1)
i18n (~> 0.5)
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
ffi (1.9.10)
Expand Down Expand Up @@ -364,6 +366,7 @@ DEPENDENCIES
dotenv-rails
draper
factory_girl_rails
faker
foreman
groupdate
growl
Expand Down
34 changes: 17 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,21 +58,21 @@ This will boot up using Foreman and allow the .env file to be read / set for use

### User roles

There are five user roles in CFP App. To log in as a user type in development mode, locate the email for each user in `seeds.rb`. The password is the same for each user, and is assigned to the variable `pwd` in the seed file.
There are five user roles in CFP App. To log in as a user type in development mode, locate the email for each user in `seeds.rb`. The password is the same for each user, and is assigned to the variable `pwd` in the seed file.

- **Admin:**
- **Admin:**
- Edit/delete users
- Add/archive events
- Automatically an **Organizer** for created events
- **Organizer:**
- Add/archive events
- Automatically an **Organizer** for created events
- **Organizer:**
- Edit/view event pages: event dashboard, program, schedule
- View event proposals
- View event proposals
- **Track Director:**
- TBD
- **Reviewer:**
- **Reviewer:**
- View/rate anonymous event proposals for an event
- Cannot rate own proposals
- **Speaker:**
- **Speaker:**
- View/edit/delete own proposals

## Deployment on Heroku
Expand Down Expand Up @@ -167,15 +167,15 @@ As a reviewer or organizer, you will use the 'Review' dropdown to get to the pro

The list of proposals can be filtered and sorted as you see fit. This is very important so that you can either focus on a certain tag or look at the oldest proposals that you have not rated. The list shows the following fields:

Score: the average score across all ratings
Your Score: how you rated the proposal
Ratings: how many ratings total a talk has received
Title: which is also the link to view the proposal
Proposal Tags: the tags the speaker(s) associated with the proposal
Reviewer Tags: the tags the reviewers have added
Comments: a total count of public comments including reviewers and speakers
Submitted On: the original submission date and time
Updated At: The last time the speaker updated the proposal
- Score: the average score across all ratings
- Your Score: how you rated the proposal
- Ratings: how many ratings total a talk has received
- Title: which is also the link to view the proposal
- Proposal Tags: the tags the speaker(s) associated with the proposal
- Reviewer Tags: the tags the reviewers have added
- Comments: a total count of public comments including reviewers and speakers
- Submitted On: the original submission date and time
- Updated At: The last time the speaker updated the proposal

The sort order is sticky and you can use the shift key to sort by more than one column. Use the 'Reset Sort Order' button to clear this out.

Expand Down
2 changes: 1 addition & 1 deletion app/views/staff/events/_reviewer_tags.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
- else
%p= event.valid_review_tags
= link_to "Edit", event_staff_reviewer_tags_path(event),
remote: true, class: "btn btn-primary btn-sm pull-right edit-reviewer-tags" unless !current_user.organizer_for_event?(event)
remote: true, class: "btn btn-primary btn-sm pull-right edit-reviewer-tags" unless !current_user.organizer_for_event?(event)
Loading

0 comments on commit 4e73b9a

Please sign in to comment.