Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

U

UNL Resource Scheduler
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

a6c34425

Commit a6c34425 authored 7 years ago by Tyler R Lemburg

Downloads
- Plain Diff

Merge branch 'resource-specific-hours' into 'master'

Resource specific hours

See merge request !5

parents 39cb3695 58142083

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

db/migrate/20170622101200_add_resource_hours.rb 13 additions, 0 deletions

db/migrate/20170622101200_add_resource_hours.rb
models/resource.rb 59 additions, 0 deletions

models/resource.rb
models/resource_hour.rb 5 additions, 0 deletions

models/resource_hour.rb
models/space_hour.rb 23 additions, 0 deletions

models/space_hour.rb
routes/admin/hours.rb 1 addition, 17 deletions

routes/admin/hours.rb
routes/admin/resources.rb 244 additions, 0 deletions

routes/admin/resources.rb
routes/resources.rb 16 additions, 78 deletions

routes/resources.rb
views/admin/edit_resource_hours.erb 99 additions, 0 deletions

views/admin/edit_resource_hours.erb
views/admin/new_resource_hours.erb 130 additions, 0 deletions

views/admin/new_resource_hours.erb
views/admin/resources.erb 1 addition, 0 deletions

views/admin/resources.erb
views/reserve.erb 1 addition, 1 deletion

views/reserve.erb

with 592 additions and 96 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment