From e494192ad28870c7a944efbd477d23f9cc06ef34 Mon Sep 17 00:00:00 2001 From: Gopesh Tulsyan Date: Sat, 14 Jun 2014 21:48:43 +0530 Subject: [PATCH] Adds lodgings controller and view --- app/controllers/admin/lodgings_controller.rb | 23 ++++++++ app/models/venue.rb | 2 +- .../admin/lodgings/_lodging_fields.html.erb | 10 ++++ app/views/admin/lodgings/index.html.haml | 5 ++ app/views/layouts/_admin_sidebar.html.haml | 2 + config/routes.rb | 2 + spec/features/lodgings_spec.rb | 55 +++++++++++++++++++ .../admin/lodgings/index.html.haml_spec.rb | 13 +++++ 8 files changed, 111 insertions(+), 1 deletion(-) create mode 100644 app/controllers/admin/lodgings_controller.rb create mode 100644 app/views/admin/lodgings/_lodging_fields.html.erb create mode 100644 app/views/admin/lodgings/index.html.haml create mode 100644 spec/features/lodgings_spec.rb create mode 100644 spec/views/admin/lodgings/index.html.haml_spec.rb diff --git a/app/controllers/admin/lodgings_controller.rb b/app/controllers/admin/lodgings_controller.rb new file mode 100644 index 00000000..554c8107 --- /dev/null +++ b/app/controllers/admin/lodgings_controller.rb @@ -0,0 +1,23 @@ +module Admin + class LodgingsController < ApplicationController + before_filter :verify_organizer + + def index + @venue = @conference.venue + end + + def show + end + + def update + @venue = @conference.venue + if @venue.update_attributes(params[:venue]) + redirect_to(admin_conference_lodgings_path(conference_id: @conference.short_title), + notice: 'Lodgings were successfully updated.') + else + redirect_to(admin_conference_lodgings_path(conference_id: @conference.short_title), + notice: 'Lodgings Updation Failed!') + end + end + end +end diff --git a/app/models/venue.rb b/app/models/venue.rb index c7cb2640..020a57ff 100644 --- a/app/models/venue.rb +++ b/app/models/venue.rb @@ -1,5 +1,5 @@ class Venue < ActiveRecord::Base - attr_accessible :name, :description, :website, :address,:photo, :lodgings_attributes + attr_accessible :name, :description, :website, :address, :photo, :lodgings_attributes has_many :conferences has_many :lodgings before_create :generate_guid diff --git a/app/views/admin/lodgings/_lodging_fields.html.erb b/app/views/admin/lodgings/_lodging_fields.html.erb new file mode 100644 index 00000000..7f9866d5 --- /dev/null +++ b/app/views/admin/lodgings/_lodging_fields.html.erb @@ -0,0 +1,10 @@ +
+ <%= f.inputs do %> + <%= f.input :name %> + <%= f.input :description, :input_html => {:rows => 2 }, hint: 'Write about the hotel/place, + of what they are offering, about types of rooms, prices and address' %> + <%= image_tag f.object.photo(:thumb) if !f.object.photo.blank? %> + <%= f.input :photo %> + <%= remove_association_link :lodging, f %> + <% end %> +
diff --git a/app/views/admin/lodgings/index.html.haml b/app/views/admin/lodgings/index.html.haml new file mode 100644 index 00000000..7dc8426a --- /dev/null +++ b/app/views/admin/lodgings/index.html.haml @@ -0,0 +1,5 @@ +.row + .col-md-8 + = semantic_form_for(@venue, :url => admin_conference_lodging_path(@conference.short_title, @conference.venue.lodgings), :html => {:multipart => true}) do |f| + = dynamic_association :lodgings, "Lodgings", f + = f.action :submit, :as => :button, :button_html => {:class => "btn btn-primary"} diff --git a/app/views/layouts/_admin_sidebar.html.haml b/app/views/layouts/_admin_sidebar.html.haml index 8a96f26b..ad19413c 100644 --- a/app/views/layouts/_admin_sidebar.html.haml +++ b/app/views/layouts/_admin_sidebar.html.haml @@ -45,6 +45,8 @@ %ul.nav.nav-stacked.nav-pills.small.collapse.subNav %li{:class=> active_nav_li(admin_conference_rooms_path(@conference.short_title))} = link_to 'Rooms', admin_conference_rooms_path(@conference.short_title) + %li{ class: active_nav_li(admin_conference_lodgings_path(@conference.short_title)) } + = link_to 'Lodgings', admin_conference_lodgings_path(@conference.short_title) %li{:class=> "#{active_nav_li(admin_conference_sponsorship_levels_path(@conference.short_title))} myAccordion" } = link_to(admin_conference_sponsorship_levels_path(@conference.short_title)) do %span.glyphicon.glyphicon-star diff --git a/config/routes.rb b/config/routes.rb index 20acc279..887e5a61 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -32,6 +32,8 @@ Osem::Application.routes.draw do resources :sponsors, only: [:show, :update, :index] + resources :lodgings, only: [:show, :update, :index] + resources :eventtypes, only: [:show, :index] do collection do patch :update diff --git a/spec/features/lodgings_spec.rb b/spec/features/lodgings_spec.rb new file mode 100644 index 00000000..5bb305a5 --- /dev/null +++ b/spec/features/lodgings_spec.rb @@ -0,0 +1,55 @@ +require 'spec_helper' + +feature Lodging do + # It is necessary to use bang version of let to build roles before user + let!(:organizer_role) { create(:organizer_role) } + let!(:participant_role) { create(:participant_role) } + let!(:admin_role) { create(:admin_role) } + + shared_examples 'lodgings' do |user| + scenario 'adds and updates lodgings', feature: true, js: true do + path = "#{Rails.root}/app/assets/images/rails.png" + conference = create(:conference) + conference.venue = create(:venue) + sign_in create(user) + visit admin_conference_lodgings_path( + conference_id: conference.short_title) + # Add lodging + click_link 'Add lodging' + expect(page.all('div.nested-fields').count == 1).to be true + page. + find('div.nested-fields:nth-of-type(1) div:nth-of-type(1) input'). + set('Example Hotel') + + page. + find('div.nested-fields:nth-of-type(1) div:nth-of-type(2) textarea'). + set('Lorem Ipsum Dolor') + attach_file 'Photo', path + + click_button 'Update Venue' + + # Validations + expect(flash).to eq('Lodgings were successfully updated.') + expect(find('div.nested-fields:nth-of-type(1) div:nth-of-type(1) input'). + value).to eq('Example Hotel') + expect(find('div.nested-fields:nth-of-type(1) div:nth-of-type(2) textarea'). + value).to eq('Lorem Ipsum Dolor') + expect(page).to have_selector("img[src*='rails.png']") + + # Remove room + click_link 'Remove lodging' + expect(page.all('div.nested-fields').count == 0).to be true + click_button 'Update Venue' + expect(flash).to eq('Lodgings were successfully updated.') + expect(page.all('div.nested-fields').count == 0).to be true + end + end + + describe 'admin' do + it_behaves_like 'lodgings', :admin + end + + describe 'organizer' do + it_behaves_like 'lodgings', :organizer + end +end diff --git a/spec/views/admin/lodgings/index.html.haml_spec.rb b/spec/views/admin/lodgings/index.html.haml_spec.rb new file mode 100644 index 00000000..982942bb --- /dev/null +++ b/spec/views/admin/lodgings/index.html.haml_spec.rb @@ -0,0 +1,13 @@ +require 'spec_helper' + +describe 'admin/lodgings/index' do + it 'renders lodgings list' do + @conference = create(:conference) + @conference.venue = create(:venue) + @conference.venue.lodgings << create(:lodging, venue: @conference.venue) + assign :venue, @conference.venue + render + expect(rendered).to include('Example Hotel') + expect(rendered).to include('Lorem Ipsum Dolor') + end +end